diff options
| author | daryll <daryll> | 1999-12-14 02:39:38 +0000 |
|---|---|---|
| committer | daryll <daryll> | 1999-12-14 02:39:38 +0000 |
| commit | 5a7c08a8c796a40d4cb04375ae198ea8325a9633 (patch) | |
| tree | 726c36b6a094a755014fc7632d67d8c181b290ff | |
| parent | af51f10342876a5da08d550d7786ea310ceb40ab (diff) | |
Upgrade to the latest Mesa 3.2 code.
Fixed several driver texture management bugs in the tdfx driver.
Fix a problem with unbinding a context (performer).
Included the Mesa header files in the X tree instead of making copies.
179 files changed, 876 insertions, 557 deletions
diff --git a/xc/lib/GL/mesa/include/GL/gl.h b/xc/extras/Mesa/include/GL/gl.h index f500bd20a..3e11b4a9b 100644 --- a/xc/lib/GL/mesa/include/GL/gl.h +++ b/xc/extras/Mesa/include/GL/gl.h @@ -1,4 +1,4 @@ -/* $Id: gl.h,v 1.2 1999/12/05 23:10:28 daryll Exp $ */ +/* $Id: gl.h,v 1.1 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -50,17 +50,26 @@ #endif #if !defined(OPENSTEP) && (defined(__WIN32__) || defined(__CYGWIN32__)) -# pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */ -# pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */ -# pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */ -# pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */ -# pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */ +# pragma warning( disable : 4068 ) /* unknown pragma */ +# pragma warning( disable : 4710 ) /* function 'foo' not inlined */ +# pragma warning( disable : 4711 ) /* function 'foo' selected for automatic inline expansion */ +# pragma warning( disable : 4127 ) /* conditional expression is constant */ +# if defined(MESA_MINWARN) +# pragma warning( disable : 4244 ) /* '=' : conversion from 'const double ' to 'float ', possible loss of data */ +# pragma warning( disable : 4018 ) /* '<' : signed/unsigned mismatch */ +# pragma warning( disable : 4305 ) /* '=' : truncation from 'const double ' to 'float ' */ +# pragma warning( disable : 4550 ) /* 'function' undefined; assuming extern returning int */ +# pragma warning( disable : 4761 ) /* integral size mismatch in argument; conversion supplied */ +# endif # if defined(_MSC_VER) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ # define GLAPI __declspec(dllexport) +# define WGLAPI __declspec(dllexport) # elif defined(_MSC_VER) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ # define GLAPI __declspec(dllimport) +# define WGLAPI __declspec(dllimport) # else /* for use with static link lib build of Win32 edition only */ # define GLAPI extern +# define WGLAPI __declspec(dllimport) # endif /* _STATIC_MESA support */ # define GLAPIENTRY __stdcall # define GLCALLBACK __stdcall @@ -78,11 +87,6 @@ /* compatability guard so we don't need to change client code */ #if defined(_WIN32) && !defined(_WINDEF_) && !defined(OPENSTEP) -# if !defined(MESA_MINWARN) -# pragma message( "note: WINDOWS.H not included, providing Mesa definition of CALLBACK macro" ) -# pragma message( "----: and PROC typedef. If you receive compiler warnings about either ") -# pragma message( "----: being multiply defined you should include WINDOWS.H priot to gl/gl.h" ) -# endif # define CALLBACK GLCALLBACK typedef int (GLAPIENTRY *PROC)(); typedef void *HGLRC; @@ -91,11 +95,6 @@ typedef unsigned long COLORREF; #endif #if defined(_WIN32) && !defined(_WINGDI_) && !defined(OPENSTEP) -# if !defined(MESA_MINWARN) -# pragma message( "note: WINDOWS.H not included, providing Mesa definition of wgl functions" ) -# pragma message( "----: and macros. If you receive compiler warnings about any being multiply ") -# pragma message( "----: defined you should include WINDOWS.H priot to gl/gl.h" ) -# endif # define WGL_FONT_LINES 0 # define WGL_FONT_POLYGONS 1 # ifdef UNICODE @@ -107,28 +106,10 @@ typedef unsigned long COLORREF; # endif /* !UNICODE */ typedef struct tagLAYERPLANEDESCRIPTOR LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, *LPLAYERPLANEDESCRIPTOR; typedef struct _GLYPHMETRICSFLOAT GLYPHMETRICSFLOAT, *PGLYPHMETRICSFLOAT, *LPGLYPHMETRICSFLOAT; -GLAPI int GLAPIENTRY wglCopyContext(HGLRC, HGLRC, unsigned int); -GLAPI HGLRC GLAPIENTRY wglCreateContext(HDC); -GLAPI HGLRC GLAPIENTRY wglCreateLayerContext(HDC, int); -GLAPI int GLAPIENTRY wglDeleteContext(HGLRC); -GLAPI HGLRC GLAPIENTRY wglGetCurrentContext(void); -GLAPI HDC GLAPIENTRY wglGetCurrentDC(void); -GLAPI PROC GLAPIENTRY wglGetProcAddress(char*); -GLAPI int GLAPIENTRY wglMakeCurrent(HDC, HGLRC); -GLAPI int GLAPIENTRY wglShareLists(HGLRC, HGLRC); -GLAPI int GLAPIENTRY wglUseFontBitmapsA(HDC, unsigned long, unsigned long, unsigned long); -GLAPI int GLAPIENTRY wglUseFontBitmapsW(HDC, unsigned long, unsigned long, unsigned long); -GLAPI int GLAPIENTRY wglUseFontOutlinesA(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT); -GLAPI int GLAPIENTRY wglUseFontOutlinesW(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT); -GLAPI int GLAPIENTRY wglDescribeLayerPlane(HDC, int, int, unsigned int,LPLAYERPLANEDESCRIPTOR); -GLAPI int GLAPIENTRY wglSetLayerPaletteEntries(HDC, int, int, int,const COLORREF *); -GLAPI int GLAPIENTRY wglGetLayerPaletteEntries(HDC, int, int, int,COLORREF *); -GLAPI int GLAPIENTRY wglRealizeLayerPalette(HDC, int, int); -GLAPI int GLAPIENTRY wglSwapLayerBuffers(HDC, unsigned int); -GLAPI int GLAPIENTRY SwapBuffers(HDC); +typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR; +#include <gl/mesa_wgl.h> #endif - #ifdef __cplusplus extern "C" { #endif @@ -858,16 +839,6 @@ typedef enum { /* GL_EXT_abgr */ GL_ABGR_EXT = 0x8000, - /* GL_SGIS_multitexture */ - GL_SELECTED_TEXTURE_SGIS = 0x835C, - GL_SELECTED_TEXTURE_COORD_SET_SGIS = 0x835D, - GL_MAX_TEXTURES_SGIS = 0x835E, - GL_TEXTURE0_SGIS = 0x835F, - GL_TEXTURE1_SGIS = 0x8360, - GL_TEXTURE2_SGIS = 0x8361, - GL_TEXTURE3_SGIS = 0x8362, - GL_TEXTURE_COORD_SET_SOURCE_SGIS = 0x8363, - /* GL_EXT_stencil_wrap */ GL_INCR_WRAP_EXT = 0x8507, GL_DECR_WRAP_EXT = 0x8508, @@ -884,8 +855,8 @@ typedef enum { /* OpenGL 1.2 */ GL_RESCALE_NORMAL = 0x803A, GL_CLAMP_TO_EDGE = 0x812F, - GL_MAX_ELEMENTS_VERTICES = 0xF0E8, - GL_MAX_ELEMENTS_INDICES = 0xF0E9, + GL_MAX_ELEMENTS_VERTICES = 0x80E8, + GL_MAX_ELEMENTS_INDICES = 0x80E9, GL_BGR = 0x80E0, GL_BGRA = 0x80E1, GL_UNSIGNED_BYTE_3_3_2 = 0x8032, @@ -965,7 +936,6 @@ typedef enum { GL_COLOR_TABLE_ALPHA_SIZE = 0x80DD, GL_COLOR_TABLE_LUMINANCE_SIZE = 0x80DE, GL_COLOR_TABLE_INTENSITY_SIZE = 0x80DF, - /* GL_EXT_convolution and GL_HP_convolution_border_modes */ GL_CONVOLUTION_1D = 0x8010, GL_CONVOLUTION_2D = 0x8011, @@ -990,7 +960,6 @@ typedef enum { GL_CONSTANT_BORDER = 0x8151, GL_REPLICATE_BORDER = 0x8153, GL_CONVOLUTION_BORDER_COLOR = 0x8154, - /* GL_SGI_color_matrix */ GL_COLOR_MATRIX = 0x80B1, GL_COLOR_MATRIX_STACK_DEPTH = 0x80B2, @@ -1003,7 +972,6 @@ typedef enum { GL_POST_COLOR_MATRIX_GREEN_BIAS = 0x80B9, GL_POST_COLOR_MATRIX_BLUE_BIAS = 0x80BA, GL_POST_COLOR_MATRIX_ALPHA_BIAS = 0x80BB, - /* GL_EXT_histogram */ GL_HISTOGRAM = 0x8024, GL_PROXY_HISTOGRAM = 0x8025, @@ -1019,6 +987,14 @@ typedef enum { GL_MINMAX_FORMAT = 0x802F, GL_MINMAX_SINK = 0x8030, GL_TABLE_TOO_LARGE = 0x8031, + /* GL_EXT_blend_color, GL_EXT_blend_minmax */ + GL_BLEND_EQUATION = 0x8009, + GL_MIN = 0x8007, + GL_MAX = 0x8008, + GL_FUNC_ADD = 0x8006, + GL_FUNC_SUBTRACT = 0x800A, + GL_FUNC_REVERSE_SUBTRACT = 0x800B, + GL_BLEND_COLOR = 0x8005, /* GL_NV_texgen_reflection (nVidia) */ GL_NORMAL_MAP_NV = 0x8511, @@ -1869,7 +1845,7 @@ GLAPI void GLAPIENTRY glPopName( void ); /* - * 1.0 Extensions + * Extensions */ /* GL_EXT_blend_minmax */ @@ -1987,48 +1963,6 @@ GLAPI void GLAPIENTRY glGetColorTableParameterivEXT( GLenum target, GLint *params ); -/* GL_SGIS_multitexture */ - -GLAPI void GLAPIENTRY glMultiTexCoord1dSGIS(GLenum target, GLdouble s); -GLAPI void GLAPIENTRY glMultiTexCoord1dvSGIS(GLenum target, const GLdouble *v); -GLAPI void GLAPIENTRY glMultiTexCoord1fSGIS(GLenum target, GLfloat s); -GLAPI void GLAPIENTRY glMultiTexCoord1fvSGIS(GLenum target, const GLfloat *v); -GLAPI void GLAPIENTRY glMultiTexCoord1iSGIS(GLenum target, GLint s); -GLAPI void GLAPIENTRY glMultiTexCoord1ivSGIS(GLenum target, const GLint *v); -GLAPI void GLAPIENTRY glMultiTexCoord1sSGIS(GLenum target, GLshort s); -GLAPI void GLAPIENTRY glMultiTexCoord1svSGIS(GLenum target, const GLshort *v); -GLAPI void GLAPIENTRY glMultiTexCoord2dSGIS(GLenum target, GLdouble s, GLdouble t); -GLAPI void GLAPIENTRY glMultiTexCoord2dvSGIS(GLenum target, const GLdouble *v); -GLAPI void GLAPIENTRY glMultiTexCoord2fSGIS(GLenum target, GLfloat s, GLfloat t); -GLAPI void GLAPIENTRY glMultiTexCoord2fvSGIS(GLenum target, const GLfloat *v); -GLAPI void GLAPIENTRY glMultiTexCoord2iSGIS(GLenum target, GLint s, GLint t); -GLAPI void GLAPIENTRY glMultiTexCoord2ivSGIS(GLenum target, const GLint *v); -GLAPI void GLAPIENTRY glMultiTexCoord2sSGIS(GLenum target, GLshort s, GLshort t); -GLAPI void GLAPIENTRY glMultiTexCoord2svSGIS(GLenum target, const GLshort *v); -GLAPI void GLAPIENTRY glMultiTexCoord3dSGIS(GLenum target, GLdouble s, GLdouble t, GLdouble r); -GLAPI void GLAPIENTRY glMultiTexCoord3dvSGIS(GLenum target, const GLdouble *v); -GLAPI void GLAPIENTRY glMultiTexCoord3fSGIS(GLenum target, GLfloat s, GLfloat t, GLfloat r); -GLAPI void GLAPIENTRY glMultiTexCoord3fvSGIS(GLenum target, const GLfloat *v); -GLAPI void GLAPIENTRY glMultiTexCoord3iSGIS(GLenum target, GLint s, GLint t, GLint r); -GLAPI void GLAPIENTRY glMultiTexCoord3ivSGIS(GLenum target, const GLint *v); -GLAPI void GLAPIENTRY glMultiTexCoord3sSGIS(GLenum target, GLshort s, GLshort t, GLshort r); -GLAPI void GLAPIENTRY glMultiTexCoord3svSGIS(GLenum target, const GLshort *v); -GLAPI void GLAPIENTRY glMultiTexCoord4dSGIS(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -GLAPI void GLAPIENTRY glMultiTexCoord4dvSGIS(GLenum target, const GLdouble *v); -GLAPI void GLAPIENTRY glMultiTexCoord4fSGIS(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -GLAPI void GLAPIENTRY glMultiTexCoord4fvSGIS(GLenum target, const GLfloat *v); -GLAPI void GLAPIENTRY glMultiTexCoord4iSGIS(GLenum target, GLint s, GLint t, GLint r, GLint q); -GLAPI void GLAPIENTRY glMultiTexCoord4ivSGIS(GLenum target, const GLint *v); -GLAPI void GLAPIENTRY glMultiTexCoord4sSGIS(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -GLAPI void GLAPIENTRY glMultiTexCoord4svSGIS(GLenum target, const GLshort *v); - -GLAPI void GLAPIENTRY glMultiTexCoordPointerSGIS(GLenum target, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); - -GLAPI void GLAPIENTRY glSelectTextureSGIS(GLenum target); - -GLAPI void GLAPIENTRY glSelectTextureCoordSetSGIS(GLenum target); - - /* GL_ARB_multitexture */ GLAPI void GLAPIENTRY glActiveTextureARB(GLenum texture); @@ -2148,6 +2082,36 @@ GLAPI void GLAPIENTRY glCopyTexSubImage3D( GLenum target, GLint level, /* 1.2 imaging extension functions */ +GLAPI void GLAPIENTRY glColorTable( GLenum target, GLenum internalformat, + GLsizei width, GLenum format, + GLenum type, const GLvoid *table ); + +GLAPI void GLAPIENTRY glColorSubTable( GLenum target, + GLsizei start, GLsizei count, + GLenum format, GLenum type, + const GLvoid *data ); + +GLAPI void GLAPIENTRY glColorTableParameteriv(GLenum target, GLenum pname, + const GLint *params); + +GLAPI void GLAPIENTRY glColorTableParameterfv(GLenum target, GLenum pname, + const GLfloat *params); + +GLAPI void GLAPIENTRY glCopyColorSubTable( GLenum target, GLsizei start, + GLint x, GLint y, GLsizei width ); + +GLAPI void GLAPIENTRY glCopyColorTable( GLenum target, GLenum internalformat, + GLint x, GLint y, GLsizei width ); + +GLAPI void GLAPIENTRY glGetColorTable( GLenum target, GLenum format, + GLenum type, GLvoid *table ); + +GLAPI void GLAPIENTRY glGetColorTableParameterfv( GLenum target, GLenum pname, + GLfloat *params ); + +GLAPI void GLAPIENTRY glGetColorTableParameteriv( GLenum target, GLenum pname, + GLint *params ); + GLAPI void GLAPIENTRY glBlendEquation( GLenum mode ); GLAPI void GLAPIENTRY glBlendColor( GLclampf red, GLclampf green, @@ -2173,7 +2137,7 @@ GLAPI void GLAPIENTRY glMinmax( GLenum target, GLenum internalformat, GLAPI void GLAPIENTRY glResetMinmax( GLenum target ); -GLAPI void GLAPIENTRY glGetMinMax( GLenum target, GLboolean reset, +GLAPI void GLAPIENTRY glGetMinmax( GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values ); @@ -2226,12 +2190,6 @@ GLAPI void GLAPIENTRY glSeparableFilter2D( GLenum target, GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span ); -GLAPI void GLAPIENTRY glCopyColorSubTable( GLenum target, GLsizei start, - GLint x, GLint y, GLsizei width ); - -GLAPI void GLAPIENTRY glCopyColorTable( GLenum target, GLenum internalformat, - GLint x, GLint y, GLsizei width ); - /* GL_EXT_compiled_vertex_array */ @@ -2239,6 +2197,7 @@ GLAPI void GLAPIENTRY glLockArraysEXT( GLint first, GLsizei count ); GLAPI void GLAPIENTRY glUnlockArraysEXT( void ); + #if defined(__BEOS__) || defined(__QUICKDRAW__) #pragma export off #endif @@ -2263,7 +2222,6 @@ GLAPI void GLAPIENTRY glUnlockArraysEXT( void ); #define GL_EXT_stencil_wrap 1 #define GL_MESA_window_pos 1 #define GL_MESA_resize_buffers 1 -#define GL_SGIS_multitexture 1 #define GL_SGIS_texture_edge_clamp 1 #define GL_INGR_blend_func_separate 1 #define GL_ARB_multitexture 1 diff --git a/xc/lib/GL/mesa/include/GL/glx.h b/xc/extras/Mesa/include/GL/glx.h index 7e0089e1c..fdbdf3db9 100644 --- a/xc/lib/GL/mesa/include/GL/glx.h +++ b/xc/extras/Mesa/include/GL/glx.h @@ -1,4 +1,4 @@ -/* Id: glx.h,v 1.2 1999/02/26 08:52:29 martin Exp $ */ +/* $Id: glx.h,v 1.1 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -25,48 +25,11 @@ */ -/* - * Log: glx.h,v $ - * Revision 1.2 1999/02/26 08:52:29 martin - * Updated Mesa to the official version checked into the Mesa cvs archive - * Cleaned up the XMesa interface - * Fixed support for standalone Mesa - * Removed several unused files in the lib/GL/mesa/src subdirectory - * Moved glcore.h back to include/GL/internal/glcore.h - * - * Revision 3.3 1999/02/14 03:39:09 brianp - * new copyright - * - * Revision 3.2 1998/06/18 03:44:00 brianp - * replaced "uint" with "unsigned int" - * - * Revision 3.1 1998/06/01 00:00:17 brianp - * added GLX_SGI_video_sync extension - * - * Revision 3.0 1998/02/20 05:06:01 brianp - * initial rev - * - */ - #ifndef GLX_H #define GLX_H -/* - * A pseudo-GLX implementation to allow GLX-based OpenGL programs to - * work with Mesa. - * - * Notes: - * 1. If the visual passed to glXGetConfig was not one returned by - * glXChooseVisual then the GLX_RGBA and GLX_DOUBLEBUFFER queries - * will always return True and the GLX_DEPTH_SIZE query will always - * return non-zero. - * 2. The glXIsDirect() function always returns True. - */ - - - #include <X11/Xlib.h> #include <X11/Xutil.h> #include "GL/gl.h" @@ -158,13 +121,13 @@ enum _GLX_CONFIGS { /* * Compile-time extension tests */ -#ifdef MESA #define GLX_EXT_visual_info 1 #define GLX_MESA_pixmap_colormap 1 #define GLX_MESA_release_buffers 1 #define GLX_MESA_copy_sub_buffer 1 +#define GLX_MESA_set_3dfx_mode 1 #define GLX_SGI_video_sync 1 -#endif +#define GLX_ARB_get_proc_address 1 @@ -232,29 +195,32 @@ extern const char *glXGetClientString( Display *dpy, int name ); -/* - * Mesa GLX Extensions - */ - -#ifdef GLX_MESA_pixmap_colormap +/* GLX_MESA_pixmap_colormap */ extern GLXPixmap glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap ); -#endif -#ifdef GLX_MESA_release_buffers + +/* GLX_MESA_release_buffers */ extern Bool glXReleaseBuffersMESA( Display *dpy, GLXDrawable d ); -#endif -#ifdef GLX_MESA_copy_sub_buffer + +/* GLX_MESA_copy_sub_buffer */ extern void glXCopySubBufferMESA( Display *dpy, GLXDrawable drawable, int x, int y, int width, int height ); -#endif -#ifdef GLX_SGI_video_sync + +/* GLX_MESA_set_3dfx_mode */ +extern GLboolean glXSet3DfxModeMESA( GLint mode ); + + +/* GLX_SGI_video_sync */ extern int glXGetVideoSyncSGI(unsigned int *count); extern int glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count); -#endif + + +/* GLX_ARB_get_proc_address */ +extern void (*glXGetProcAddressARB(const GLubyte *procName))(); diff --git a/xc/lib/GL/mesa/include/GL/xmesa.h b/xc/extras/Mesa/include/GL/xmesa.h index e290272ca..d90d43e65 100644 --- a/xc/lib/GL/mesa/include/GL/xmesa.h +++ b/xc/extras/Mesa/include/GL/xmesa.h @@ -1,4 +1,4 @@ -/* Id: xmesa.h,v 1.3 1999/02/26 08:52:29 martin Exp $ */ +/* $Id: xmesa.h,v 1.1 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -23,17 +23,22 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/GL/mesa/include/GL/xmesa.h,v 1.4 1999/06/27 14:07:25 dawes Exp $ */ /* - * Log: xmesa.h,v $ - * Revision 1.3 1999/02/26 08:52:29 martin - * Updated Mesa to the official version checked into the Mesa cvs archive - * Cleaned up the XMesa interface - * Fixed support for standalone Mesa - * Removed several unused files in the lib/GL/mesa/src subdirectory - * Moved glcore.h back to include/GL/internal/glcore.h + * $Log: xmesa.h,v $ + * Revision 1.1 1999/12/14 02:39:38 daryll + * + * Upgrade to the latest Mesa 3.2 code. + * Fixed several driver texture management bugs in the tdfx driver. + * Fix a problem with unbinding a context (performer). + * Included the Mesa header files in the X tree instead of making copies. + * + * Revision 1.1.1.1.2.1 1999/11/24 18:41:37 brianp + * bumped version to 3.1 + * + * Revision 1.1.1.1 1999/08/19 00:55:40 jtg + * Imported sources * * Revision 1.3 1999/02/24 22:43:27 jens * Name changes to get XMesa to compile standalone inside XFree86 @@ -114,7 +119,7 @@ extern struct Library *XLibBase; #define XMESA_MAJOR_VERSION 3 -#define XMESA_MINOR_VERSION 0 +#define XMESA_MINOR_VERSION 1 @@ -139,9 +144,6 @@ typedef struct xmesa_visual *XMesaVisual; typedef struct xmesa_buffer *XMesaBuffer; - - - #if defined(GLX_DIRECT_RENDERING) && !defined(XFree86Server) /* * Initialize the XMesa driver. @@ -154,6 +156,7 @@ extern GLboolean XMesaInitDriver( __DRIscreenPrivate *driScrnPriv ); extern void XMesaResetDriver( __DRIscreenPrivate *driScrnPriv ); #endif + /* * Create a new X/Mesa visual. * Input: display - X11 display @@ -205,6 +208,7 @@ extern XMesaContext XMesaCreateContext( XMesaVisual v, #endif ); + /* * Destroy a rendering context as returned by XMesaCreateContext() */ @@ -222,6 +226,7 @@ extern XMesaBuffer XMesaCreateWindowBuffer( XMesaVisual v, ); + /* * Create an XMesaBuffer from an X pixmap. */ @@ -234,6 +239,7 @@ extern XMesaBuffer XMesaCreatePixmapBuffer( XMesaVisual v, ); + /* * Destroy an XMesaBuffer, but not the corresponding window or pixmap. */ diff --git a/xc/lib/GL/mesa/include/GL/xmesa_x.h b/xc/extras/Mesa/include/GL/xmesa_x.h index 5b9a484ff..ee9951855 100644 --- a/xc/lib/GL/mesa/include/GL/xmesa_x.h +++ b/xc/extras/Mesa/include/GL/xmesa_x.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/include/GL/xmesa_x.h,v 1.2 1999/06/14 07:23:42 dawes Exp $ */ + /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -30,7 +30,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Authors: * Kevin E. Martin <kevin@precisioninsight.com> * - * $PI: xc/lib/GL/mesa/include/GL/xmesa_x.h,v 1.3 1999/03/16 07:18:20 martin Exp $ + * $Header: /home/ajax/dri-backup/xc/xc/extras/Mesa/include/GL/Attic/xmesa_x.h,v 1.1 1999/12/14 02:39:38 daryll Exp $ */ #ifndef _XMESA_X_H_ diff --git a/xc/lib/GL/mesa/include/GL/xmesa_xf86.h b/xc/extras/Mesa/include/GL/xmesa_xf86.h index 0f0cdce39..5b4a5f299 100644 --- a/xc/lib/GL/mesa/include/GL/xmesa_xf86.h +++ b/xc/extras/Mesa/include/GL/xmesa_xf86.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/mesa/include/GL/xmesa_xf86.h,v 1.2 1999/06/14 07:23:43 dawes Exp $ */ + /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -30,7 +30,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Authors: * Kevin E. Martin <kevin@precisioninsight.com> * - * $PI: xc/lib/GL/mesa/include/GL/xmesa_xf86.h,v 1.5 1999/05/10 07:39:32 martin Exp $ + * $Header: /home/ajax/dri-backup/xc/xc/extras/Mesa/include/GL/Attic/xmesa_xf86.h,v 1.1 1999/12/14 02:39:38 daryll Exp $ */ #ifndef _XMESA_XF86_H_ @@ -71,7 +71,7 @@ do { \ do { \ (void) __d; \ SetDashes(__gc, __do, __n, (unsigned char *)__dl); \ -} while(0) +} while (0) #define XMesaSetLineAttributes(__d,__gc,__lw,__ls,__cs,__js) \ do { \ @@ -84,7 +84,7 @@ do { \ dixChangeGC(NullClient, __gc, \ GCLineWidth|GCLineStyle|GCCapStyle|GCJoinStyle, \ __v, NULL); \ -} while(0) +} while (0) #define XMesaSetForeground(d,gc,v) XMesaSetGeneric(d,gc,v,GCForeground) #define XMesaSetBackground(d,gc,v) XMesaSetGeneric(d,gc,v,GCBackground) @@ -103,14 +103,14 @@ do { \ __p[0].y = __y; \ ValidateGC(__b, __gc); \ (*gc->ops->PolyPoint)(__b, __gc, CoordModeOrigin, 1, __p); \ -} while(0) +} while (0) #define XMesaDrawPoints(__d,__b,__gc,__p,__n,__m) \ do { \ (void) __d; \ ValidateGC(__b, __gc); \ (*gc->ops->PolyPoint)(__b, __gc, __m, __n, __p); \ -} while(0) +} while (0) #define XMesaDrawLine(__d,__b,__gc,__x0,__y0,__x1,__y1) \ do { \ @@ -122,7 +122,7 @@ do { \ __p[1].x = __x1; \ __p[1].y = __y1; \ (*__gc->ops->Polylines)(__b, __gc, CoordModeOrigin, 2, __p); \ -} while(0) +} while (0) #define XMesaFillRectangle(__d,__b,__gc,__x,__y,__w,__h) \ do { \ @@ -134,19 +134,19 @@ do { \ __r[0].width = __w; \ __r[0].height = __h; \ (*__gc->ops->PolyFillRect)(__b, __gc, 1, __r); \ -} while(0) +} while (0) #define XMesaPutImage(__d,__b,__gc,__i,__sx,__sy,__x,__y,__w,__h) \ do { \ /* Assumes: Images are always in ZPixmap format */ \ (void) __d; \ - if (!__sx || !__sy) /* The non-trivial case */ \ + if (__sx || __sy) /* The non-trivial case */ \ XMesaPutImageHelper(__d,__b,__gc,__i,__sx,__sy,__x,__y,__w,__h); \ ValidateGC(__b, __gc); \ (*__gc->ops->PutImage)(__b, __gc, ((XMesaDrawable)(__b))->depth, \ __x, __y, __w, __h, 0, ZPixmap, \ ((XMesaImage *)(__i))->data); \ -} while(0) +} while (0) #define XMesaCopyArea(__d,__sb,__db,__gc,__sx,__sy,__w,__h,__x,__y) \ do { \ @@ -154,14 +154,14 @@ do { \ ValidateGC(__db, __gc); \ (*__gc->ops->CopyArea)((DrawablePtr)__sb, __db, __gc, \ __sx, __sy, __w, __h, __x, __y); \ -} while(0) +} while (0) #define XMesaFillPolygon(__d,__b,__gc,__p,__n,__s,__m) \ do { \ (void) __d; \ ValidateGC(__b, __gc); \ (*__gc->ops->FillPolygon)(__b, __gc, __s, __m, __n, __p); \ -} while(0) +} while (0) /* CreatePixmap returns a PixmapPtr; so, it cannot be inside braces */ #define XMesaCreatePixmap(__d,__b,__w,__h,__depth) \ @@ -173,7 +173,7 @@ do { \ do { \ (void) __d; \ FreeScratchGC(__gc); \ -} while(0) +} while (0) #define GET_COLORMAP_SIZE(__v) __v->visinfo->ColormapEntries #define GET_REDMASK(__v) __v->visinfo->redMask @@ -181,7 +181,7 @@ do { \ #define GET_BLUEMASK(__v) __v->visinfo->blueMask #define GET_BITS_PER_PIXEL(__v) __v->visinfo->bitsPerRGBValue #define GET_VISUAL_CLASS(__v) __v->visinfo->class -#define GET_VISUAL_DEPTH(__v) __v->screen_depth +#define GET_VISUAL_DEPTH(__v) __v->visinfo->nplanes #define GET_BLACK_PIXEL(__v) __v->display->blackPixel #define CHECK_BYTE_ORDER(__v) GL_TRUE #define CHECK_FOR_HPCR(__v) GL_FALSE diff --git a/xc/extras/Mesa/src/FX/fxddtex.c b/xc/extras/Mesa/src/FX/fxddtex.c index 38dbf6f1a..db0120a03 100644 --- a/xc/extras/Mesa/src/FX/fxddtex.c +++ b/xc/extras/Mesa/src/FX/fxddtex.c @@ -124,13 +124,8 @@ static tfxTexInfo *fxAllocTexObjData(fxMesaContext fxMesa) ti->sClamp=GR_TEXTURECLAMP_WRAP; ti->tClamp=GR_TEXTURECLAMP_WRAP; - if(fxMesa->haveTwoTMUs) { - ti->mmMode=GR_MIPMAP_NEAREST; - ti->LODblend=FXTRUE; - } else { - ti->mmMode=GR_MIPMAP_NEAREST_DITHER; - ti->LODblend=FXFALSE; - } + ti->mmMode=GR_MIPMAP_NEAREST; + ti->LODblend=FXFALSE; for(i=0;i<MAX_TEXTURE_LEVELS;i++) { ti->mipmapLevel[i].used=GL_FALSE; @@ -921,10 +916,10 @@ static void fxTexBuildImageMap(const struct gl_texture_image *image, if(wscale==hscale==1) { int i=0; - int lenght=h*w; + int length=h*w; unsigned short a,l; - while(i++<lenght) { + while(i++<length) { l=*data++; a=*data++; @@ -965,10 +960,10 @@ static void fxTexBuildImageMap(const struct gl_texture_image *image, if(wscale==hscale==1) { int i=0; - int lenght=h*w; + int length=h*w; unsigned short r,g,b; - while(i++<lenght) { + while(i++<length) { r=*data++; g=*data++; b=*data++; @@ -1015,10 +1010,10 @@ static void fxTexBuildImageMap(const struct gl_texture_image *image, if(wscale==hscale==1) { int i=0; - int lenght=h*w; + int length=h*w; unsigned short r,g,b,a; - while(i++<lenght) { + while(i++<length) { r=*data++; g=*data++; b=*data++; diff --git a/xc/extras/Mesa/src/FX/fxdrv.h b/xc/extras/Mesa/src/FX/fxdrv.h index 8cef3340b..08bd52043 100644 --- a/xc/extras/Mesa/src/FX/fxdrv.h +++ b/xc/extras/Mesa/src/FX/fxdrv.h @@ -469,7 +469,6 @@ struct tfxMesaContext { GLuint texBindNumber; GLint tmuSrc; GLuint lastUnitsMode; - GLuint texStart[FX_NUM_TMU]; GLuint freeTexMem[FX_NUM_TMU]; MemRange *tmPool; MemRange *tmFree[FX_NUM_TMU]; diff --git a/xc/extras/Mesa/src/FX/fxsetup.c b/xc/extras/Mesa/src/FX/fxsetup.c index b27d5c983..29e6533a4 100644 --- a/xc/extras/Mesa/src/FX/fxsetup.c +++ b/xc/extras/Mesa/src/FX/fxsetup.c @@ -70,6 +70,7 @@ static void fxSetupFog(GLcontext *ctx, GLboolean forceTableRebuild); static void fxSetupScissor(GLcontext *ctx); static void fxSetupCull(GLcontext *ctx); static void gl_print_fx_state_flags( const char *msg, GLuint flags); +static GLboolean fxMultipassBlend(struct vertex_buffer *, GLuint); static GLboolean fxMultipassTexture( struct vertex_buffer *, GLuint ); static void fxTexValidate(GLcontext *ctx, struct gl_texture_object *tObj) @@ -310,12 +311,22 @@ static void fxSetupSingleTMU_NoLock(fxMesaContext fxMesa, struct gl_texture_obje fxTMMoveInTM_NoLock(fxMesa,tObj,FX_TMU_SPLIT); else { if (fxMesa->haveTwoTMUs) { +#if 0 + /* This path is disabled because we're not correctly setting up + the second TMU as the only texture unit. It is arguable if this + fallback is ever really a win, because when we use the second + TMU we have to do setup for both TMU0 and TMU1 which is extra + work. We could just flush a texture from TMU0 instead. */ if (fxMesa->freeTexMem[FX_TMU0] > FX_grTexTextureMemRequired_NoLock(GR_MIPMAPLEVELMASK_BOTH, - &(ti->info))) - fxTMMoveInTM_NoLock(fxMesa,tObj,FX_TMU0); - else - fxTMMoveInTM_NoLock(fxMesa,tObj,FX_TMU1); + &(ti->info))) { + fxTMMoveInTM_NoLock(fxMesa,tObj, FX_TMU0); + } else { + fxTMMoveInTM_NoLock(fxMesa,tObj, FX_TMU1); + } +#else + fxTMMoveInTM_NoLock(fxMesa, tObj, FX_TMU0); +#endif } else fxTMMoveInTM_NoLock(fxMesa,tObj,FX_TMU0); } @@ -372,7 +383,8 @@ static void fxSetupSingleTMU(fxMesaContext fxMesa, struct gl_texture_object *tOb END_BOARD_LOCK(); } -static void fxSelectSingleTMUSrc_NoLock(fxMesaContext fxMesa, GLint tmu, FxBool LODblend) +static void fxSelectSingleTMUSrc_NoLock(fxMesaContext fxMesa, GLint tmu, + FxBool LODblend) { if (MESA_VERBOSE&VERBOSE_DRIVER) { fprintf(stderr,"fxmesa: fxSelectSingleTMUSrc(%d,%d)\n",tmu,LODblend); @@ -390,7 +402,6 @@ static void fxSelectSingleTMUSrc_NoLock(fxMesaContext fxMesa, GLint tmu, FxBool GR_COMBINE_FUNCTION_LOCAL,GR_COMBINE_FACTOR_NONE, GR_COMBINE_FUNCTION_LOCAL,GR_COMBINE_FACTOR_NONE, FXFALSE,FXFALSE); - fxMesa->tmuSrc=FX_TMU_SPLIT; } else { if(tmu==FX_TMU0) { @@ -398,7 +409,6 @@ static void fxSelectSingleTMUSrc_NoLock(fxMesaContext fxMesa, GLint tmu, FxBool GR_COMBINE_FUNCTION_LOCAL,GR_COMBINE_FACTOR_NONE, GR_COMBINE_FUNCTION_LOCAL,GR_COMBINE_FACTOR_NONE, FXFALSE,FXFALSE); - fxMesa->tmuSrc=FX_TMU0; } else { FX_grTexCombine_NoLock(GR_TMU1, @@ -409,8 +419,10 @@ static void fxSelectSingleTMUSrc_NoLock(fxMesaContext fxMesa, GLint tmu, FxBool /* GR_COMBINE_FUNCTION_SCALE_OTHER doesn't work ?!? */ FX_grTexCombine_NoLock(GR_TMU0, - GR_COMBINE_FUNCTION_BLEND,GR_COMBINE_FACTOR_ONE, - GR_COMBINE_FUNCTION_BLEND,GR_COMBINE_FACTOR_ONE, + GR_COMBINE_FUNCTION_BLEND, + GR_COMBINE_FACTOR_ONE, + GR_COMBINE_FUNCTION_BLEND, + GR_COMBINE_FACTOR_ONE, FXFALSE,FXFALSE); fxMesa->tmuSrc=FX_TMU1; @@ -504,10 +516,24 @@ static void fxSetupTextureSingleTMU_NoLock(GLcontext *ctx, GLuint textureset) FXFALSE); break; case GL_BLEND: -#ifndef FX_SILENT - fprintf(stderr,"fx Driver: GL_BLEND not yet supported\n"); -#endif - /* TO DO (I think that the Voodoo Graphics isn't able to support GL_BLEND) */ + FX_grAlphaCombine_NoLock(GR_COMBINE_FUNCTION_SCALE_OTHER, + GR_COMBINE_FACTOR_LOCAL, + locala, + GR_COMBINE_OTHER_TEXTURE, + FXFALSE); + if (ifmt==GL_ALPHA) + FX_grColorCombine_NoLock(GR_COMBINE_FUNCTION_LOCAL, + GR_COMBINE_FACTOR_NONE, + localc, + GR_COMBINE_OTHER_NONE, + FXFALSE); + else + FX_grColorCombine_NoLock(GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL, + GR_COMBINE_FACTOR_LOCAL, + localc, + GR_COMBINE_OTHER_TEXTURE, + FXTRUE); + ctx->Driver.MultipassFunc = fxMultipassBlend; break; case GL_REPLACE: if((ifmt==GL_RGB) || (ifmt==GL_LUMINANCE)) @@ -1584,6 +1610,57 @@ void fxDDEnable(GLcontext *ctx, GLenum cap, GLboolean state) } } +#if 0 +/* + Multipass to do GL_BLEND texture functions + Cf*(1-Ct) has already been written to the buffer during the first pass + Cc*Ct gets written during the second pass (in this function) + Everything gets reset in the third call (in this function) +*/ +static GLboolean fxMultipassBlend(struct vertex_buffer *VB, GLuint pass) +{ + GLcontext *ctx = VB->ctx; + fxMesaContext fxMesa = FX_CONTEXT(ctx); + + switch (pass) { + case 1: + /* Add Cc*Ct */ + fxMesa->restoreUnitsState=fxMesa->unitsState; + if (ctx->Depth.Mask) { + /* We don't want to check or change the depth buffers */ + switch (ctx->Depth.Func) { + case GL_NEVER: + case GL_ALWAYS: + break; + default: + fxDDDepthFunc(ctx, GL_EQUAL); + break; + } + fxDDDepthMask(ctx, FALSE); + } + /* Enable Cc*Ct mode */ + /* ??? Set the Constant Color ??? */ + fxDDEnable(ctx, GL_BLEND, GL_TRUE); + fxDDBlendFunc(ctx, ???, ???); + fxSetupTextureSingleTMU(ctx, ???); + fxSetupBlend(ctx); + fxSetupDepthTest(ctx); + break; + + case 2: + /* Reset everything back to normal */ + fxMesa->unitsState = fxMesa->restoreUnitsState; + fxMesa->setupdone &= ???; + fxSetupTextureSingleTMU(ctx, ???); + fxSetupBlend(ctx); + fxSetupDepthTest(ctx); + break; + } + + return pass==1; +} +#endif + /************************************************************************/ /******************** Fake Multitexture Support *************************/ /************************************************************************/ @@ -1693,7 +1770,7 @@ void fxSetupFXUnits( GLcontext *ctx ) fxMesaContext fxMesa=(fxMesaContext)ctx->DriverCtx; GLuint newstate = fxMesa->new_state; - if (MESA_VERBOSE&VERBOSE_DRIVER) + if (MESA_VERBOSE&VERBOSE_DRIVER) gl_print_fx_state_flags("fxmesa: fxSetupFXUnits", newstate); if (newstate) { diff --git a/xc/extras/Mesa/src/FX/fxtexman.c b/xc/extras/Mesa/src/FX/fxtexman.c index 770f095ab..285045de3 100644 --- a/xc/extras/Mesa/src/FX/fxtexman.c +++ b/xc/extras/Mesa/src/FX/fxtexman.c @@ -60,24 +60,38 @@ static struct gl_texture_object *fxTMFindOldestObject(fxMesaContext fxMesa, int tmu); -#if 0 +#ifdef TEXSANITY static void fubar() { } /* Sanity Check */ -static void sanity(fxMesaContext fxMesa, int tmu) +static void sanity(fxMesaContext fxMesa) { - MemRange *tmp, *prev; - int i; + MemRange *tmp, *prev, *pos; prev=0; - tmp = fxMesa->tmFree[tmu]; - i=0; + tmp = fxMesa->tmFree[0]; + while (tmp) { + if (!tmp->startAddr && !tmp->endAddr) { + fprintf(stderr, "Textures fubar\n"); + fubar(); + } + if (tmp->startAddr>=tmp->endAddr) { + fprintf(stderr, "Node fubar\n"); + fubar(); + } + if (prev && (prev->startAddr>=tmp->startAddr || + prev->endAddr>tmp->startAddr)) { + fprintf(stderr, "Sorting fubar\n"); + fubar(); + } + prev=tmp; + tmp=tmp->next; + } + prev=0; + tmp = fxMesa->tmFree[1]; while (tmp) { - fprintf(stderr, "TMU %d Sanity %d %d-%d\n", tmu, i, - tmp->startAddr, tmp->endAddr); - i++; if (!tmp->startAddr && !tmp->endAddr) { fprintf(stderr, "Textures fubar\n"); fubar(); @@ -87,7 +101,7 @@ static void sanity(fxMesaContext fxMesa, int tmu) fubar(); } if (prev && (prev->startAddr>=tmp->startAddr || - prev->endAddr>=tmp->startAddr)) { + prev->endAddr>tmp->startAddr)) { fprintf(stderr, "Sorting fubar\n"); fubar(); } @@ -128,13 +142,12 @@ static void fxTMUInit(fxMesaContext fxMesa, int tmu) start=FX_grTexMinAddress(tmu); end=FX_grTexMaxAddress(tmu); - fxMesa->texStart[tmu]=start; if(fxMesa->verbose) { fprintf(stderr,"%s configuration:",(tmu==FX_TMU0) ? "TMU0" : "TMU1"); fprintf(stderr," Lower texture memory address (%u)\n",(unsigned int)start); fprintf(stderr," Higher texture memory address (%u)\n",(unsigned int)end); - fprintf(stderr," Splitting Texture memory in 2Mb blocks:\n"); + fprintf(stderr," Splitting Texture memory in 2b blocks:\n"); } fxMesa->freeTexMem[tmu]=end-start; @@ -182,6 +195,7 @@ static int fxTMFindStartAddr(fxMesaContext fxMesa, GLint tmu, int size) } fxTMDeleteRangeNode(fxMesa, tmp); } + fxMesa->freeTexMem[tmu]-=size; return result; } prev=tmp; @@ -199,12 +213,13 @@ static int fxTMFindStartAddr(fxMesaContext fxMesa, GLint tmu, int size) static void fxTMRemoveRange(fxMesaContext fxMesa, GLint tmu, MemRange *range) { - MemRange *tmp, *prev, *next; + MemRange *tmp, *prev; if (range->startAddr==range->endAddr) { fxTMDeleteRangeNode(fxMesa, range); return; } + fxMesa->freeTexMem[tmu]+=range->endAddr-range->startAddr; prev=0; tmp=fxMesa->tmFree[tmu]; while (tmp) { @@ -554,6 +569,7 @@ void fxTMFreeTexture(fxMesaContext fxMesa, struct gl_texture_object *tObj) } switch (ti->whichTMU) { case FX_TMU0: + case FX_TMU1: fxTMDeleteRangeNode(fxMesa, ti->tm[ti->whichTMU]); break; case FX_TMU_SPLIT: @@ -566,12 +582,13 @@ void fxTMFreeTexture(fxMesaContext fxMesa, struct gl_texture_object *tObj) void fxTMInit(fxMesaContext fxMesa) { + fxMesa->texBindNumber=0; + fxMesa->tmPool=0; + fxTMUInit(fxMesa,FX_TMU0); if(fxMesa->haveTwoTMUs) fxTMUInit(fxMesa,FX_TMU1); - - fxMesa->texBindNumber=0; } void fxTMClose(fxMesaContext fxMesa) @@ -641,7 +658,7 @@ void fxTMRestore_NoLock(fxMesaContext fxMesa, struct gl_texture_object *tObj) for (i=FX_largeLodValue_NoLock(ti->info),l=ti->minLevel; i<=FX_smallLodValue_NoLock(ti->info); i++,l++) { - if (ti->mipmapLevel[l].data) + if (ti->mipmapLevel[l].data) { FX_grTexDownloadMipMapLevel_NoLock(GR_TMU0, ti->tm[FX_TMU0]->startAddr, FX_valueToLod(i), @@ -650,7 +667,6 @@ void fxTMRestore_NoLock(fxMesaContext fxMesa, struct gl_texture_object *tObj) ti->info.format, GR_MIPMAPLEVELMASK_ODD, ti->mipmapLevel[l].data); - if (ti->mipmapLevel[l].data) FX_grTexDownloadMipMapLevel_NoLock(GR_TMU1, ti->tm[FX_TMU1]->startAddr, FX_valueToLod(i), @@ -659,6 +675,7 @@ void fxTMRestore_NoLock(fxMesaContext fxMesa, struct gl_texture_object *tObj) ti->info.format, GR_MIPMAPLEVELMASK_EVEN, ti->mipmapLevel[l].data); + } } break; default: diff --git a/xc/extras/Mesa/src/accum.c b/xc/extras/Mesa/src/accum.c index 4393a12bc..ccd89423f 100644 --- a/xc/extras/Mesa/src/accum.c +++ b/xc/extras/Mesa/src/accum.c @@ -1,4 +1,4 @@ -/* $Id: accum.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: accum.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/accum.h b/xc/extras/Mesa/src/accum.h index 26b59be81..5f5755326 100644 --- a/xc/extras/Mesa/src/accum.h +++ b/xc/extras/Mesa/src/accum.h @@ -1,4 +1,4 @@ -/* $Id: accum.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: accum.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/all.h b/xc/extras/Mesa/src/all.h index 1e9d6f3c3..f0d5dc95b 100644 --- a/xc/extras/Mesa/src/all.h +++ b/xc/extras/Mesa/src/all.h @@ -1,4 +1,4 @@ -/* $Id: all.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: all.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/alpha.c b/xc/extras/Mesa/src/alpha.c index 123879b8f..e96900ca4 100644 --- a/xc/extras/Mesa/src/alpha.c +++ b/xc/extras/Mesa/src/alpha.c @@ -1,4 +1,4 @@ -/* $Id: alpha.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: alpha.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/alpha.h b/xc/extras/Mesa/src/alpha.h index 8528c2f90..100411ef9 100644 --- a/xc/extras/Mesa/src/alpha.h +++ b/xc/extras/Mesa/src/alpha.h @@ -1,4 +1,4 @@ -/* $Id: alpha.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: alpha.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/alphabuf.c b/xc/extras/Mesa/src/alphabuf.c index 2f3956029..969df6fe7 100644 --- a/xc/extras/Mesa/src/alphabuf.c +++ b/xc/extras/Mesa/src/alphabuf.c @@ -1,4 +1,4 @@ -/* $Id: alphabuf.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: alphabuf.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/alphabuf.h b/xc/extras/Mesa/src/alphabuf.h index 550519efd..a6d646078 100644 --- a/xc/extras/Mesa/src/alphabuf.h +++ b/xc/extras/Mesa/src/alphabuf.h @@ -1,4 +1,4 @@ -/* $Id: alphabuf.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: alphabuf.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api.h b/xc/extras/Mesa/src/api.h index 9148baa82..8aab05e6e 100644 --- a/xc/extras/Mesa/src/api.h +++ b/xc/extras/Mesa/src/api.h @@ -1,4 +1,4 @@ -/* $Id: api.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: api.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api1.c b/xc/extras/Mesa/src/api1.c index f3addc636..0f418de4d 100644 --- a/xc/extras/Mesa/src/api1.c +++ b/xc/extras/Mesa/src/api1.c @@ -1,4 +1,4 @@ -/* $Id: api1.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: api1.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/api2.c b/xc/extras/Mesa/src/api2.c index 673adf633..5df01ed74 100644 --- a/xc/extras/Mesa/src/api2.c +++ b/xc/extras/Mesa/src/api2.c @@ -1,4 +1,4 @@ -/* $Id: api2.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: api2.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/apiext.c b/xc/extras/Mesa/src/apiext.c index 10e88a302..286261146 100644 --- a/xc/extras/Mesa/src/apiext.c +++ b/xc/extras/Mesa/src/apiext.c @@ -1,4 +1,4 @@ -/* $Id: apiext.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: apiext.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/attrib.c b/xc/extras/Mesa/src/attrib.c index ce9a813d7..878f9f3ec 100644 --- a/xc/extras/Mesa/src/attrib.c +++ b/xc/extras/Mesa/src/attrib.c @@ -1,4 +1,4 @@ -/* $Id: attrib.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: attrib.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -428,6 +428,7 @@ void gl_PopAttrib( GLcontext* ctx ) GLubyte oldAlphaRef = ctx->Color.AlphaRef; GLenum oldBlendSrc = ctx->Color.BlendSrcRGB; GLenum oldBlendDst = ctx->Color.BlendDstRGB; + GLenum oldLogicOp = ctx->Color.LogicOp; MEMCPY( &ctx->Color, attr->data, sizeof(struct gl_colorbuffer_attrib) ); if (ctx->Color.DrawBuffer != oldDrawBuffer) { @@ -443,6 +444,9 @@ void gl_PopAttrib( GLcontext* ctx ) ctx->Driver.BlendFunc) (*ctx->Driver.BlendFunc)( ctx, ctx->Color.BlendSrcRGB, ctx->Color.BlendDstRGB); + if (ctx->Color.LogicOp != oldLogicOp && + ctx->Driver.LogicOpcode) + ctx->Driver.LogicOpcode( ctx, ctx->Color.LogicOp ); } break; case GL_CURRENT_BIT: diff --git a/xc/extras/Mesa/src/attrib.h b/xc/extras/Mesa/src/attrib.h index 7ba62e405..2dbb604d2 100644 --- a/xc/extras/Mesa/src/attrib.h +++ b/xc/extras/Mesa/src/attrib.h @@ -1,4 +1,4 @@ -/* $Id: attrib.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: attrib.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/bbox.c b/xc/extras/Mesa/src/bbox.c index c1c01a98c..e78ce26cd 100644 --- a/xc/extras/Mesa/src/bbox.c +++ b/xc/extras/Mesa/src/bbox.c @@ -1,4 +1,4 @@ -/* $Id: bbox.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: bbox.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/bbox.h b/xc/extras/Mesa/src/bbox.h index 53fe32e04..ed6ca802c 100644 --- a/xc/extras/Mesa/src/bbox.h +++ b/xc/extras/Mesa/src/bbox.h @@ -1,4 +1,4 @@ -/* $Id: bbox.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: bbox.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/bitmap.c b/xc/extras/Mesa/src/bitmap.c index df2b9d573..ea9a90e88 100644 --- a/xc/extras/Mesa/src/bitmap.c +++ b/xc/extras/Mesa/src/bitmap.c @@ -1,4 +1,4 @@ -/* $Id: bitmap.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: bitmap.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/bitmap.h b/xc/extras/Mesa/src/bitmap.h index 8d8c85088..234125704 100644 --- a/xc/extras/Mesa/src/bitmap.h +++ b/xc/extras/Mesa/src/bitmap.h @@ -1,4 +1,4 @@ -/* $Id: bitmap.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: bitmap.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/blend.c b/xc/extras/Mesa/src/blend.c index 0d0883591..e9bf7b434 100644 --- a/xc/extras/Mesa/src/blend.c +++ b/xc/extras/Mesa/src/blend.c @@ -1,4 +1,4 @@ -/* $Id: blend.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: blend.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/blend.h b/xc/extras/Mesa/src/blend.h index 3cd3bb918..90e869bb8 100644 --- a/xc/extras/Mesa/src/blend.h +++ b/xc/extras/Mesa/src/blend.h @@ -1,4 +1,4 @@ -/* $Id: blend.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: blend.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/clip.c b/xc/extras/Mesa/src/clip.c index 00ea37227..60aece17b 100644 --- a/xc/extras/Mesa/src/clip.c +++ b/xc/extras/Mesa/src/clip.c @@ -1,4 +1,4 @@ -/* $Id: clip.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: clip.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/clip.h b/xc/extras/Mesa/src/clip.h index 0f3bafaaf..4ee1c7dfd 100644 --- a/xc/extras/Mesa/src/clip.h +++ b/xc/extras/Mesa/src/clip.h @@ -1,4 +1,4 @@ -/* $Id: clip.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: clip.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/clip_funcs.h b/xc/extras/Mesa/src/clip_funcs.h index ccdc014c5..acd24f893 100644 --- a/xc/extras/Mesa/src/clip_funcs.h +++ b/xc/extras/Mesa/src/clip_funcs.h @@ -1,4 +1,4 @@ -/* $Id: clip_funcs.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: clip_funcs.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/clip_tmp.h b/xc/extras/Mesa/src/clip_tmp.h index 1c39e3f29..9dfe8e8ad 100644 --- a/xc/extras/Mesa/src/clip_tmp.h +++ b/xc/extras/Mesa/src/clip_tmp.h @@ -1,4 +1,4 @@ -/* $Id: clip_tmp.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: clip_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/colortab.c b/xc/extras/Mesa/src/colortab.c index d0e72d46b..ce69fea0b 100644 --- a/xc/extras/Mesa/src/colortab.c +++ b/xc/extras/Mesa/src/colortab.c @@ -1,4 +1,4 @@ -/* $Id: colortab.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: colortab.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/colortab.h b/xc/extras/Mesa/src/colortab.h index b792b5ae3..c5e4e0f17 100644 --- a/xc/extras/Mesa/src/colortab.h +++ b/xc/extras/Mesa/src/colortab.h @@ -1,4 +1,4 @@ -/* $Id: colortab.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: colortab.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/config.c b/xc/extras/Mesa/src/config.c index cb1dab9cd..cdda182da 100644 --- a/xc/extras/Mesa/src/config.c +++ b/xc/extras/Mesa/src/config.c @@ -1,4 +1,4 @@ -/* $Id: config.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: config.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/config.h b/xc/extras/Mesa/src/config.h index 9cae80135..a80ac5922 100644 --- a/xc/extras/Mesa/src/config.h +++ b/xc/extras/Mesa/src/config.h @@ -1,4 +1,4 @@ -/* $Id: config.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: config.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/context.c b/xc/extras/Mesa/src/context.c index 7a4cc0d0c..8de6040aa 100644 --- a/xc/extras/Mesa/src/context.c +++ b/xc/extras/Mesa/src/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: context.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/context.h b/xc/extras/Mesa/src/context.h index 1651acbfb..382e2a4bc 100644 --- a/xc/extras/Mesa/src/context.h +++ b/xc/extras/Mesa/src/context.h @@ -1,4 +1,4 @@ -/* $Id: context.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: context.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/copy_tmp.h b/xc/extras/Mesa/src/copy_tmp.h index bd9dfb941..c9088505c 100644 --- a/xc/extras/Mesa/src/copy_tmp.h +++ b/xc/extras/Mesa/src/copy_tmp.h @@ -1,4 +1,4 @@ -/* $Id: copy_tmp.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: copy_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/copypix.c b/xc/extras/Mesa/src/copypix.c index d0768b768..912fb6a4b 100644 --- a/xc/extras/Mesa/src/copypix.c +++ b/xc/extras/Mesa/src/copypix.c @@ -1,4 +1,4 @@ -/* $Id: copypix.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: copypix.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/copypix.h b/xc/extras/Mesa/src/copypix.h index bc106a0bf..783e252dd 100644 --- a/xc/extras/Mesa/src/copypix.h +++ b/xc/extras/Mesa/src/copypix.h @@ -1,4 +1,4 @@ -/* $Id: copypix.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: copypix.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/cull_tmp.h b/xc/extras/Mesa/src/cull_tmp.h index f292253c5..00a09a43b 100644 --- a/xc/extras/Mesa/src/cull_tmp.h +++ b/xc/extras/Mesa/src/cull_tmp.h @@ -1,4 +1,4 @@ -/* $Id: cull_tmp.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: cull_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/cva.c b/xc/extras/Mesa/src/cva.c index ffd1e024b..8e700c3e0 100644 --- a/xc/extras/Mesa/src/cva.c +++ b/xc/extras/Mesa/src/cva.c @@ -1,4 +1,4 @@ -/* $Id: cva.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: cva.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/cva.h b/xc/extras/Mesa/src/cva.h index fc4a00925..071e4339b 100644 --- a/xc/extras/Mesa/src/cva.h +++ b/xc/extras/Mesa/src/cva.h @@ -1,4 +1,4 @@ -/* $Id: cva.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: cva.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/dd.h b/xc/extras/Mesa/src/dd.h index 2f7b92f98..92027595b 100644 --- a/xc/extras/Mesa/src/dd.h +++ b/xc/extras/Mesa/src/dd.h @@ -1,4 +1,4 @@ -/* $Id: dd.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: dd.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -659,6 +659,7 @@ struct dd_function_table { void (*Lightfv)(GLcontext *ctx, GLenum light, GLenum pname, const GLfloat *params, GLint nparams ); void (*LightModelfv)(GLcontext *ctx, GLenum pname, const GLfloat *params); + void (*LogicOpcode)(GLcontext *ctx, GLenum opcode); void (*PolygonMode)(GLcontext *ctx, GLenum face, GLenum mode); void (*Scissor)(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h); void (*ShadeModel)(GLcontext *ctx, GLenum mode); diff --git a/xc/extras/Mesa/src/ddsample.c b/xc/extras/Mesa/src/ddsample.c index 06db5f1f4..f4af736f6 100644 --- a/xc/extras/Mesa/src/ddsample.c +++ b/xc/extras/Mesa/src/ddsample.c @@ -1,4 +1,4 @@ -/* $Id: ddsample.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: ddsample.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/debug_xform.c b/xc/extras/Mesa/src/debug_xform.c index 53dcad634..0792f7a88 100644 --- a/xc/extras/Mesa/src/debug_xform.c +++ b/xc/extras/Mesa/src/debug_xform.c @@ -1,4 +1,4 @@ -/* $Id: debug_xform.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: debug_xform.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/debug_xform.h b/xc/extras/Mesa/src/debug_xform.h index 42a79807b..f0bf4dba6 100644 --- a/xc/extras/Mesa/src/debug_xform.h +++ b/xc/extras/Mesa/src/debug_xform.h @@ -1,4 +1,4 @@ -/* $Id: debug_xform.h,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: debug_xform.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/depth.c b/xc/extras/Mesa/src/depth.c index 4b467e074..71de246b1 100644 --- a/xc/extras/Mesa/src/depth.c +++ b/xc/extras/Mesa/src/depth.c @@ -1,4 +1,4 @@ -/* $Id: depth.c,v 1.2 1999/12/07 03:37:14 daryll Exp $ */ +/* $Id: depth.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/depth.h b/xc/extras/Mesa/src/depth.h index bca5f3535..e23d7d99d 100644 --- a/xc/extras/Mesa/src/depth.h +++ b/xc/extras/Mesa/src/depth.h @@ -1,5 +1,5 @@ -/* $Id: depth.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: depth.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/dlist.c b/xc/extras/Mesa/src/dlist.c index 33a3dc11e..c5849ddc1 100644 --- a/xc/extras/Mesa/src/dlist.c +++ b/xc/extras/Mesa/src/dlist.c @@ -1,4 +1,4 @@ -/* $Id: dlist.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: dlist.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/dlist.h b/xc/extras/Mesa/src/dlist.h index a9856d6fb..6d7445285 100644 --- a/xc/extras/Mesa/src/dlist.h +++ b/xc/extras/Mesa/src/dlist.h @@ -1,4 +1,4 @@ -/* $Id: dlist.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: dlist.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/dotprod_tmp.h b/xc/extras/Mesa/src/dotprod_tmp.h index 4c7c3f225..581de51c7 100644 --- a/xc/extras/Mesa/src/dotprod_tmp.h +++ b/xc/extras/Mesa/src/dotprod_tmp.h @@ -1,4 +1,4 @@ -/* $Id: dotprod_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: dotprod_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/drawpix.c b/xc/extras/Mesa/src/drawpix.c index 5959d76a2..7f76d1f17 100644 --- a/xc/extras/Mesa/src/drawpix.c +++ b/xc/extras/Mesa/src/drawpix.c @@ -1,4 +1,4 @@ -/* $Id: drawpix.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: drawpix.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/drawpix.h b/xc/extras/Mesa/src/drawpix.h index 1d080ffbf..4d4c74c83 100644 --- a/xc/extras/Mesa/src/drawpix.h +++ b/xc/extras/Mesa/src/drawpix.h @@ -1,4 +1,4 @@ -/* $Id: drawpix.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: drawpix.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/enable.c b/xc/extras/Mesa/src/enable.c index 8ae55aa3b..84065cb5c 100644 --- a/xc/extras/Mesa/src/enable.c +++ b/xc/extras/Mesa/src/enable.c @@ -1,4 +1,4 @@ -/* $Id: enable.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: enable.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/enable.h b/xc/extras/Mesa/src/enable.h index 16330369c..cd3875436 100644 --- a/xc/extras/Mesa/src/enable.h +++ b/xc/extras/Mesa/src/enable.h @@ -1,4 +1,4 @@ -/* $Id: enable.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: enable.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/enums.c b/xc/extras/Mesa/src/enums.c index 7059d72da..7a3466ec3 100644 --- a/xc/extras/Mesa/src/enums.c +++ b/xc/extras/Mesa/src/enums.c @@ -1,4 +1,4 @@ -/* $Id: enums.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: enums.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/enums.h b/xc/extras/Mesa/src/enums.h index 2c07cdf83..41017d7be 100644 --- a/xc/extras/Mesa/src/enums.h +++ b/xc/extras/Mesa/src/enums.h @@ -1,4 +1,4 @@ -/* $Id: enums.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: enums.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/eval.c b/xc/extras/Mesa/src/eval.c index 5e8220d6c..b4a83045b 100644 --- a/xc/extras/Mesa/src/eval.c +++ b/xc/extras/Mesa/src/eval.c @@ -1,4 +1,4 @@ -/* $Id: eval.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: eval.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/eval.h b/xc/extras/Mesa/src/eval.h index 893e3fd96..d7b0e6c3a 100644 --- a/xc/extras/Mesa/src/eval.h +++ b/xc/extras/Mesa/src/eval.h @@ -1,4 +1,4 @@ -/* $Id: eval.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: eval.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/extensions.c b/xc/extras/Mesa/src/extensions.c index 4a0d5db40..812b0b225 100644 --- a/xc/extras/Mesa/src/extensions.c +++ b/xc/extras/Mesa/src/extensions.c @@ -1,4 +1,4 @@ -/* $Id: extensions.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: extensions.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -61,7 +61,7 @@ static struct { int enabled; const char *name; } default_extensions[] = { { DEFAULT_ON, "GL_EXT_texture3D" }, { ALWAYS_ENABLED, "GL_MESA_window_pos" }, { ALWAYS_ENABLED, "GL_MESA_resize_buffers" }, - { ALWAYS_ENABLED, "GL_EXT_shared_texture_palette" }, + { DEFAULT_ON, "GL_EXT_shared_texture_palette" }, { ALWAYS_ENABLED, "GL_EXT_rescale_normal" }, { ALWAYS_ENABLED, "GL_EXT_abgr" }, { ALWAYS_ENABLED, "GL_SGIS_texture_edge_clamp" }, @@ -71,8 +71,13 @@ static struct { int enabled; const char *name; } default_extensions[] = { { ALWAYS_ENABLED, "GL_NV_texgen_reflection" }, { DEFAULT_ON, "GL_PGI_misc_hints" }, { DEFAULT_ON, "GL_EXT_compiled_vertex_array" }, - { DEFAULT_OFF, "GL_EXT_vertex_array_set" }, { DEFAULT_ON, "GL_EXT_clip_volume_hint" }, + + /* These obviously won't make it before 3.3: + */ + { DEFAULT_OFF, "GL_EXT_vertex_array_set" }, + { DEFAULT_OFF, "GL_EXT_texture_env" }, + { DEFAULT_OFF, "GL_EXT_fog_coord" }, }; @@ -235,43 +240,409 @@ void (*gl_get_proc_address( const GLubyte *procName ))() gl_function address; }; static struct proc procTable[] = { + /* OpenGL 1.0 functions */ + { "glAccum", (gl_function) glAccum }, + { "glAlphaFunc", (gl_function) glAlphaFunc }, + { "glBegin", (gl_function) glBegin }, + { "glBitmap", (gl_function) glBitmap }, + { "glAccum", (gl_function) glAccum }, + { "glAlphaFunc", (gl_function) glAlphaFunc }, + { "glBegin", (gl_function) glBegin }, + { "glBitmap", (gl_function) glBitmap }, + { "glBlendFunc", (gl_function) glBlendFunc }, + { "glCallList", (gl_function) glCallList }, + { "glCallLists", (gl_function) glCallLists }, + { "glClear", (gl_function) glClear }, + { "glClearAccum", (gl_function) glClearAccum }, + { "glClearColor", (gl_function) glClearColor }, + { "glClearDepth", (gl_function) glClearDepth }, + { "glClearIndex", (gl_function) glClearIndex }, + { "glClearStencil", (gl_function) glClearStencil }, + { "glClipPlane", (gl_function) glClipPlane }, + { "glColor3b", (gl_function) glColor3b }, + { "glColor3bv", (gl_function) glColor3bv }, + { "glColor3d", (gl_function) glColor3d }, + { "glColor3dv", (gl_function) glColor3dv }, + { "glColor3f", (gl_function) glColor3f }, + { "glColor3fv", (gl_function) glColor3fv }, + { "glColor3i", (gl_function) glColor3i }, + { "glColor3iv", (gl_function) glColor3iv }, + { "glColor3s", (gl_function) glColor3s }, + { "glColor3sv", (gl_function) glColor3sv }, + { "glColor3ub", (gl_function) glColor3ub }, + { "glColor3ubv", (gl_function) glColor3ubv }, + { "glColor3ui", (gl_function) glColor3ui }, + { "glColor3uiv", (gl_function) glColor3uiv }, + { "glColor3us", (gl_function) glColor3us }, + { "glColor3usv", (gl_function) glColor3usv }, + { "glColor4b", (gl_function) glColor4b }, + { "glColor4bv", (gl_function) glColor4bv }, + { "glColor4d", (gl_function) glColor4d }, + { "glColor4dv", (gl_function) glColor4dv }, + { "glColor4f", (gl_function) glColor4f }, + { "glColor4fv", (gl_function) glColor4fv }, + { "glColor4i", (gl_function) glColor4i }, + { "glColor4iv", (gl_function) glColor4iv }, + { "glColor4s", (gl_function) glColor4s }, + { "glColor4sv", (gl_function) glColor4sv }, + { "glColor4ub", (gl_function) glColor4ub }, + { "glColor4ubv", (gl_function) glColor4ubv }, + { "glColor4ui", (gl_function) glColor4ui }, + { "glColor4uiv", (gl_function) glColor4uiv }, + { "glColor4us", (gl_function) glColor4us }, + { "glColor4usv", (gl_function) glColor4usv }, + { "glColorMask", (gl_function) glColorMask }, + { "glColorMaterial", (gl_function) glColorMaterial }, + { "glCopyPixels", (gl_function) glCopyPixels }, + { "glCullFace", (gl_function) glCullFace }, + { "glDeleteLists", (gl_function) glDeleteLists }, + { "glDepthFunc", (gl_function) glDepthFunc }, + { "glDepthMask", (gl_function) glDepthMask }, + { "glDepthRange", (gl_function) glDepthRange }, + { "glDisable", (gl_function) glDisable }, + { "glDrawBuffer", (gl_function) glDrawBuffer }, + { "glDrawPixels", (gl_function) glDrawPixels }, + { "glEdgeFlag", (gl_function) glEdgeFlag }, + { "glEdgeFlagv", (gl_function) glEdgeFlagv }, + { "glEnable", (gl_function) glEnable }, + { "glEnd", (gl_function) glEnd }, + { "glEndList", (gl_function) glEndList }, + { "glEvalCoord1d", (gl_function) glEvalCoord1d }, + { "glEvalCoord1dv", (gl_function) glEvalCoord1dv }, + { "glEvalCoord1f", (gl_function) glEvalCoord1f }, + { "glEvalCoord1fv", (gl_function) glEvalCoord1fv }, + { "glEvalCoord2d", (gl_function) glEvalCoord2d }, + { "glEvalCoord2dv", (gl_function) glEvalCoord2dv }, + { "glEvalCoord2f", (gl_function) glEvalCoord2f }, + { "glEvalCoord2fv", (gl_function) glEvalCoord2fv }, + { "glEvalMesh1", (gl_function) glEvalMesh1 }, + { "glEvalMesh2", (gl_function) glEvalMesh2 }, + { "glEvalPoint1", (gl_function) glEvalPoint1 }, + { "glEvalPoint2", (gl_function) glEvalPoint2 }, + { "glFeedbackBuffer", (gl_function) glFeedbackBuffer }, + { "glFinish", (gl_function) glFinish }, + { "glFlush", (gl_function) glFlush }, + { "glFogf", (gl_function) glFogf }, + { "glFogfv", (gl_function) glFogfv }, + { "glFogi", (gl_function) glFogi }, + { "glFogiv", (gl_function) glFogiv }, + { "glFrontFace", (gl_function) glFrontFace }, + { "glFrustum", (gl_function) glFrustum }, + { "glGenLists", (gl_function) glGenLists }, + { "glGetBooleanv", (gl_function) glGetBooleanv }, + { "glGetClipPlane", (gl_function) glGetClipPlane }, + { "glGetDoublev", (gl_function) glGetDoublev }, + { "glGetError", (gl_function) glGetError }, + { "glGetFloatv", (gl_function) glGetFloatv }, + { "glGetIntegerv", (gl_function) glGetIntegerv }, + { "glGetLightfv", (gl_function) glGetLightfv }, + { "glGetLightiv", (gl_function) glGetLightiv }, + { "glGetMapdv", (gl_function) glGetMapdv }, + { "glGetMapfv", (gl_function) glGetMapfv }, + { "glGetMapiv", (gl_function) glGetMapiv }, + { "glGetMaterialfv", (gl_function) glGetMaterialfv }, + { "glGetMaterialiv", (gl_function) glGetMaterialiv }, + { "glGetPixelMapfv", (gl_function) glGetPixelMapfv }, + { "glGetPixelMapuiv", (gl_function) glGetPixelMapuiv }, + { "glGetPixelMapusv", (gl_function) glGetPixelMapusv }, + { "glGetPolygonStipple", (gl_function) glGetPolygonStipple }, + { "glGetString", (gl_function) glGetString }, + { "glGetTexEnvfv", (gl_function) glGetTexEnvfv }, + { "glGetTexEnviv", (gl_function) glGetTexEnviv }, + { "glGetTexGendv", (gl_function) glGetTexGendv }, + { "glGetTexGenfv", (gl_function) glGetTexGenfv }, + { "glGetTexGeniv", (gl_function) glGetTexGeniv }, + { "glGetTexImage", (gl_function) glGetTexImage }, + { "glGetTexLevelParameterfv", (gl_function) glGetTexLevelParameterfv }, + { "glGetTexLevelParameteriv", (gl_function) glGetTexLevelParameteriv }, + { "glGetTexParameterfv", (gl_function) glGetTexParameterfv }, + { "glGetTexParameteriv", (gl_function) glGetTexParameteriv }, + { "glHint", (gl_function) glHint }, + { "glIndexMask", (gl_function) glIndexMask }, + { "glIndexd", (gl_function) glIndexd }, + { "glIndexdv", (gl_function) glIndexdv }, + { "glIndexf", (gl_function) glIndexf }, + { "glIndexfv", (gl_function) glIndexfv }, + { "glIndexi", (gl_function) glIndexi }, + { "glIndexiv", (gl_function) glIndexiv }, + { "glIndexs", (gl_function) glIndexs }, + { "glIndexsv", (gl_function) glIndexsv }, + { "glInitNames", (gl_function) glInitNames }, + { "glIsEnabled", (gl_function) glIsEnabled }, + { "glIsList", (gl_function) glIsList }, + { "glLightModelf", (gl_function) glLightModelf }, + { "glLightModelfv", (gl_function) glLightModelfv }, + { "glLightModeli", (gl_function) glLightModeli }, + { "glLightModeliv", (gl_function) glLightModeliv }, + { "glLightf", (gl_function) glLightf }, + { "glLightfv", (gl_function) glLightfv }, + { "glLighti", (gl_function) glLighti }, + { "glLightiv", (gl_function) glLightiv }, + { "glLineStipple", (gl_function) glLineStipple }, + { "glLineWidth", (gl_function) glLineWidth }, + { "glListBase", (gl_function) glListBase }, + { "glLoadIdentity", (gl_function) glLoadIdentity }, + { "glLoadMatrixd", (gl_function) glLoadMatrixd }, + { "glLoadMatrixf", (gl_function) glLoadMatrixf }, + { "glLoadName", (gl_function) glLoadName }, + { "glLogicOp", (gl_function) glLogicOp }, + { "glMap1d", (gl_function) glMap1d }, + { "glMap1f", (gl_function) glMap1f }, + { "glMap2d", (gl_function) glMap2d }, + { "glMap2f", (gl_function) glMap2f }, + { "glMapGrid1d", (gl_function) glMapGrid1d }, + { "glMapGrid1f", (gl_function) glMapGrid1f }, + { "glMapGrid2d", (gl_function) glMapGrid2d }, + { "glMapGrid2f", (gl_function) glMapGrid2f }, + { "glMaterialf", (gl_function) glMaterialf }, + { "glMaterialfv", (gl_function) glMaterialfv }, + { "glMateriali", (gl_function) glMateriali }, + { "glMaterialiv", (gl_function) glMaterialiv }, + { "glMatrixMode", (gl_function) glMatrixMode }, + { "glMultMatrixd", (gl_function) glMultMatrixd }, + { "glMultMatrixf", (gl_function) glMultMatrixf }, + { "glNewList", (gl_function) glNewList }, + { "glNormal3b", (gl_function) glNormal3b }, + { "glNormal3bv", (gl_function) glNormal3bv }, + { "glNormal3d", (gl_function) glNormal3d }, + { "glNormal3dv", (gl_function) glNormal3dv }, + { "glNormal3f", (gl_function) glNormal3f }, + { "glNormal3fv", (gl_function) glNormal3fv }, + { "glNormal3i", (gl_function) glNormal3i }, + { "glNormal3iv", (gl_function) glNormal3iv }, + { "glNormal3s", (gl_function) glNormal3s }, + { "glNormal3sv", (gl_function) glNormal3sv }, + { "glOrtho", (gl_function) glOrtho }, + { "glPassThrough", (gl_function) glPassThrough }, + { "glPixelMapfv", (gl_function) glPixelMapfv }, + { "glPixelMapuiv", (gl_function) glPixelMapuiv }, + { "glPixelMapusv", (gl_function) glPixelMapusv }, + { "glPixelStoref", (gl_function) glPixelStoref }, + { "glPixelStorei", (gl_function) glPixelStorei }, + { "glPixelTransferf", (gl_function) glPixelTransferf }, + { "glPixelTransferi", (gl_function) glPixelTransferi }, + { "glPixelZoom", (gl_function) glPixelZoom }, + { "glPointSize", (gl_function) glPointSize }, + { "glPolygonMode", (gl_function) glPolygonMode }, + { "glPolygonOffset", (gl_function) glPolygonOffset }, + { "glPolygonStipple", (gl_function) glPolygonStipple }, + { "glPopAttrib", (gl_function) glPopAttrib }, + { "glPopMatrix", (gl_function) glPopMatrix }, + { "glPopName", (gl_function) glPopName }, + { "glPushAttrib", (gl_function) glPushAttrib }, + { "glPushMatrix", (gl_function) glPushMatrix }, + { "glPushName", (gl_function) glPushName }, + { "glRasterPos2d", (gl_function) glRasterPos2d }, + { "glRasterPos2dv", (gl_function) glRasterPos2dv }, + { "glRasterPos2f", (gl_function) glRasterPos2f }, + { "glRasterPos2fv", (gl_function) glRasterPos2fv }, + { "glRasterPos2i", (gl_function) glRasterPos2i }, + { "glRasterPos2iv", (gl_function) glRasterPos2iv }, + { "glRasterPos2s", (gl_function) glRasterPos2s }, + { "glRasterPos2sv", (gl_function) glRasterPos2sv }, + { "glRasterPos3d", (gl_function) glRasterPos3d }, + { "glRasterPos3dv", (gl_function) glRasterPos3dv }, + { "glRasterPos3f", (gl_function) glRasterPos3f }, + { "glRasterPos3fv", (gl_function) glRasterPos3fv }, + { "glRasterPos3i", (gl_function) glRasterPos3i }, + { "glRasterPos3iv", (gl_function) glRasterPos3iv }, + { "glRasterPos3s", (gl_function) glRasterPos3s }, + { "glRasterPos3sv", (gl_function) glRasterPos3sv }, + { "glRasterPos4d", (gl_function) glRasterPos4d }, + { "glRasterPos4dv", (gl_function) glRasterPos4dv }, + { "glRasterPos4f", (gl_function) glRasterPos4f }, + { "glRasterPos4fv", (gl_function) glRasterPos4fv }, + { "glRasterPos4i", (gl_function) glRasterPos4i }, + { "glRasterPos4iv", (gl_function) glRasterPos4iv }, + { "glRasterPos4s", (gl_function) glRasterPos4s }, + { "glRasterPos4sv", (gl_function) glRasterPos4sv }, + { "glReadBuffer", (gl_function) glReadBuffer }, + { "glReadPixels", (gl_function) glReadPixels }, + { "glRectd", (gl_function) glRectd }, + { "glRectdv", (gl_function) glRectdv }, + { "glRectf", (gl_function) glRectf }, + { "glRectfv", (gl_function) glRectfv }, + { "glRecti", (gl_function) glRecti }, + { "glRectiv", (gl_function) glRectiv }, + { "glRects", (gl_function) glRects }, + { "glRectsv", (gl_function) glRectsv }, + { "glRenderMode", (gl_function) glRenderMode }, + { "glRotated", (gl_function) glRotated }, + { "glRotatef", (gl_function) glRotatef }, + { "glScaled", (gl_function) glScaled }, + { "glScalef", (gl_function) glScalef }, + { "glScissor", (gl_function) glScissor }, + { "glSelectBuffer", (gl_function) glSelectBuffer }, + { "glShadeModel", (gl_function) glShadeModel }, + { "glStencilFunc", (gl_function) glStencilFunc }, + { "glStencilMask", (gl_function) glStencilMask }, + { "glStencilOp", (gl_function) glStencilOp }, + { "glTexCoord1d", (gl_function) glTexCoord1d }, + { "glTexCoord1dv", (gl_function) glTexCoord1dv }, + { "glTexCoord1f", (gl_function) glTexCoord1f }, + { "glTexCoord1fv", (gl_function) glTexCoord1fv }, + { "glTexCoord1i", (gl_function) glTexCoord1i }, + { "glTexCoord1iv", (gl_function) glTexCoord1iv }, + { "glTexCoord1s", (gl_function) glTexCoord1s }, + { "glTexCoord1sv", (gl_function) glTexCoord1sv }, + { "glTexCoord2d", (gl_function) glTexCoord2d }, + { "glTexCoord2dv", (gl_function) glTexCoord2dv }, + { "glTexCoord2f", (gl_function) glTexCoord2f }, + { "glTexCoord2fv", (gl_function) glTexCoord2fv }, + { "glTexCoord2i", (gl_function) glTexCoord2i }, + { "glTexCoord2iv", (gl_function) glTexCoord2iv }, + { "glTexCoord2s", (gl_function) glTexCoord2s }, + { "glTexCoord2sv", (gl_function) glTexCoord2sv }, + { "glTexCoord3d", (gl_function) glTexCoord3d }, + { "glTexCoord3dv", (gl_function) glTexCoord3dv }, + { "glTexCoord3f", (gl_function) glTexCoord3f }, + { "glTexCoord3fv", (gl_function) glTexCoord3fv }, + { "glTexCoord3i", (gl_function) glTexCoord3i }, + { "glTexCoord3iv", (gl_function) glTexCoord3iv }, + { "glTexCoord3s", (gl_function) glTexCoord3s }, + { "glTexCoord3sv", (gl_function) glTexCoord3sv }, + { "glTexCoord4d", (gl_function) glTexCoord4d }, + { "glTexCoord4dv", (gl_function) glTexCoord4dv }, + { "glTexCoord4f", (gl_function) glTexCoord4f }, + { "glTexCoord4fv", (gl_function) glTexCoord4fv }, + { "glTexCoord4i", (gl_function) glTexCoord4i }, + { "glTexCoord4iv", (gl_function) glTexCoord4iv }, + { "glTexCoord4s", (gl_function) glTexCoord4s }, + { "glTexCoord4sv", (gl_function) glTexCoord4sv }, + { "glTexEnvf", (gl_function) glTexEnvf }, + { "glTexEnvfv", (gl_function) glTexEnvfv }, + { "glTexEnvi", (gl_function) glTexEnvi }, + { "glTexEnviv", (gl_function) glTexEnviv }, + { "glTexGend", (gl_function) glTexGend }, + { "glTexGendv", (gl_function) glTexGendv }, + { "glTexGenf", (gl_function) glTexGenf }, + { "glTexGenfv", (gl_function) glTexGenfv }, + { "glTexGeni", (gl_function) glTexGeni }, + { "glTexGeniv", (gl_function) glTexGeniv }, + { "glTexImage1D", (gl_function) glTexImage1D }, + { "glTexImage2D", (gl_function) glTexImage2D }, + { "glTexParameterf", (gl_function) glTexParameterf }, + { "glTexParameterfv", (gl_function) glTexParameterfv }, + { "glTexParameteri", (gl_function) glTexParameteri }, + { "glTexParameteriv", (gl_function) glTexParameteriv }, + { "glTranslated", (gl_function) glTranslated }, + { "glTranslatef", (gl_function) glTranslatef }, + { "glVertex2d", (gl_function) glVertex2d }, + { "glVertex2dv", (gl_function) glVertex2dv }, + { "glVertex2f", (gl_function) glVertex2f }, + { "glVertex2fv", (gl_function) glVertex2fv }, + { "glVertex2i", (gl_function) glVertex2i }, + { "glVertex2iv", (gl_function) glVertex2iv }, + { "glVertex2s", (gl_function) glVertex2s }, + { "glVertex2sv", (gl_function) glVertex2sv }, + { "glVertex3d", (gl_function) glVertex3d }, + { "glVertex3dv", (gl_function) glVertex3dv }, + { "glVertex3f", (gl_function) glVertex3f }, + { "glVertex3fv", (gl_function) glVertex3fv }, + { "glVertex3i", (gl_function) glVertex3i }, + { "glVertex3iv", (gl_function) glVertex3iv }, + { "glVertex3s", (gl_function) glVertex3s }, + { "glVertex3sv", (gl_function) glVertex3sv }, + { "glVertex4d", (gl_function) glVertex4d }, + { "glVertex4dv", (gl_function) glVertex4dv }, + { "glVertex4f", (gl_function) glVertex4f }, + { "glVertex4fv", (gl_function) glVertex4fv }, + { "glVertex4i", (gl_function) glVertex4i }, + { "glVertex4iv", (gl_function) glVertex4iv }, + { "glVertex4s", (gl_function) glVertex4s }, + { "glVertex4sv", (gl_function) glVertex4sv }, + { "glViewport", (gl_function) glViewport }, + /* OpenGL 1.1 functions */ - { "glEnableClientState", (gl_function) glEnableClientState }, - { "glDisableClientState", (gl_function) glDisableClientState }, - { "glPushClientAttrib", (gl_function) glPushClientAttrib }, - { "glPopClientAttrib", (gl_function) glPopClientAttrib }, - { "glIndexub", (gl_function) glIndexub }, - { "glIndexubv", (gl_function) glIndexubv }, - { "glVertexPointer", (gl_function) glVertexPointer }, - { "glNormalPointer", (gl_function) glNormalPointer }, - { "glColorPointer", (gl_function) glColorPointer }, - { "glIndexPointer", (gl_function) glIndexPointer }, - { "glTexCoordPointer", (gl_function) glTexCoordPointer }, - { "glEdgeFlagPointer", (gl_function) glEdgeFlagPointer }, - { "glGetPointerv", (gl_function) glGetPointerv }, + { "glAreTexturesResident", (gl_function) glAreTexturesResident }, { "glArrayElement", (gl_function) glArrayElement }, + { "glBindTexture", (gl_function) glBindTexture }, + { "glColorPointer", (gl_function) glColorPointer }, + { "glCopyTexImage1D", (gl_function) glCopyTexImage1D }, + { "glCopyTexImage2D", (gl_function) glCopyTexImage2D }, + { "glCopyTexSubImage1D", (gl_function) glCopyTexSubImage1D }, + { "glCopyTexSubImage2D", (gl_function) glCopyTexSubImage2D }, + { "glDeleteTextures", (gl_function) glDeleteTextures }, + { "glDisableClientState", (gl_function) glDisableClientState }, { "glDrawArrays", (gl_function) glDrawArrays }, { "glDrawElements", (gl_function) glDrawElements }, - { "glInterleavedArrays", (gl_function) glInterleavedArrays }, + { "glEdgeFlagPointer", (gl_function) glEdgeFlagPointer }, + { "glEnableClientState", (gl_function) glEnableClientState }, { "glGenTextures", (gl_function) glGenTextures }, - { "glDeleteTextures", (gl_function) glDeleteTextures }, - { "glBindTexture", (gl_function) glBindTexture }, - { "glPrioritizeTextures", (gl_function) glPrioritizeTextures }, - { "glAreTexturesResident", (gl_function) glAreTexturesResident }, + { "glGetPointerv", (gl_function) glGetPointerv }, + { "glIndexPointer", (gl_function) glIndexPointer }, + { "glIndexub", (gl_function) glIndexub }, + { "glIndexubv", (gl_function) glIndexubv }, + { "glInterleavedArrays", (gl_function) glInterleavedArrays }, { "glIsTexture", (gl_function) glIsTexture }, + { "glNormalPointer", (gl_function) glNormalPointer }, + { "glPopClientAttrib", (gl_function) glPopClientAttrib }, + { "glPrioritizeTextures", (gl_function) glPrioritizeTextures }, + { "glPushClientAttrib", (gl_function) glPushClientAttrib }, + { "glTexCoordPointer", (gl_function) glTexCoordPointer }, { "glTexSubImage1D", (gl_function) glTexSubImage1D }, { "glTexSubImage2D", (gl_function) glTexSubImage2D }, - { "glCopyTexImage1D", (gl_function) glCopyTexImage1D }, - { "glCopyTexImage2D", (gl_function) glCopyTexImage2D }, - { "glCopyTexSubImage1D", (gl_function) glCopyTexSubImage1D }, - { "glCopyTexSubImage2D", (gl_function) glCopyTexSubImage2D }, + { "glVertexPointer", (gl_function) glVertexPointer }, /* OpenGL 1.2 functions */ + { "glCopyTexSubImage3D", (gl_function) glCopyTexSubImage3D }, { "glDrawRangeElements", (gl_function) glDrawRangeElements }, { "glTexImage3D", (gl_function) glTexImage3D }, { "glTexSubImage3D", (gl_function) glTexSubImage3D }, - { "glCopyTexSubImage3D", (gl_function) glCopyTexSubImage3D }, - /* NOTE: 1.2 imaging subset functions not implemented in Mesa */ + + /* ARB_imaging functions */ + { "glBlendColor", (gl_function) glBlendColor }, + { "glBlendEquation", (gl_function) glBlendEquation }, + { "glColorSubTable", (gl_function) glColorSubTable }, + { "glColorTable", (gl_function) glColorTable }, + { "glColorTableParameterfv", (gl_function) glColorTableParameterfv }, + { "glColorTableParameteriv", (gl_function) glColorTableParameteriv }, + { "glConvolutionFilter1D", (gl_function) glConvolutionFilter1D }, + { "glConvolutionFilter2D", (gl_function) glConvolutionFilter2D }, + { "glConvolutionParameterf", (gl_function) glConvolutionParameterf }, + { "glConvolutionParameterfv", (gl_function) glConvolutionParameterfv }, + { "glConvolutionParameteri", (gl_function) glConvolutionParameteri }, + { "glConvolutionParameteriv", (gl_function) glConvolutionParameteriv }, + { "glCopyColorSubTable", (gl_function) glCopyColorSubTable }, + { "glCopyColorTable", (gl_function) glCopyColorTable }, + { "glCopyConvolutionFilter1D", (gl_function) glCopyConvolutionFilter1D }, + { "glCopyConvolutionFilter2D", (gl_function) glCopyConvolutionFilter2D }, + { "glGetColorTable", (gl_function) glGetColorTable }, + { "glGetColorTableParameterfv", (gl_function) glGetColorTableParameterfv }, + { "glGetColorTableParameteriv", (gl_function) glGetColorTableParameteriv }, + { "glGetConvolutionFilter", (gl_function) glGetConvolutionFilter }, + { "glGetConvolutionParameterfv", (gl_function) glGetConvolutionParameterfv }, + { "glGetConvolutionParameteriv", (gl_function) glGetConvolutionParameteriv }, + { "glGetHistogram", (gl_function) glGetHistogram }, + { "glGetHistogramParameterfv", (gl_function) glGetHistogramParameterfv }, + { "glGetHistogramParameteriv", (gl_function) glGetHistogramParameteriv }, + { "glGetMinmax", (gl_function) glGetMinmax }, + { "glGetMinmaxParameterfv", (gl_function) glGetMinmaxParameterfv }, + { "glGetMinmaxParameteriv", (gl_function) glGetMinmaxParameteriv }, + { "glGetSeparableFilter", (gl_function) glGetSeparableFilter }, + { "glHistogram", (gl_function) glHistogram }, + { "glMinmax", (gl_function) glMinmax }, + { "glResetHistogram", (gl_function) glResetHistogram }, + { "glResetMinmax", (gl_function) glResetMinmax }, + { "glSeparableFilter2D", (gl_function) glSeparableFilter2D }, + + /* GL_EXT_paletted_texture */ + { "glColorTableEXT", (gl_function) glColorTableEXT }, + { "glColorSubTableEXT", (gl_function) glColorSubTableEXT }, + { "glGetColorTableEXT", (gl_function) glGetColorTableEXT }, + { "glGetColorTableParameterfvEXT", (gl_function) glGetColorTableParameterfvEXT }, + { "glGetColorTableParameterivEXT", (gl_function) glGetColorTableParameterivEXT }, + + /* GL_EXT_compiled_vertex_array */ + { "glLockArraysEXT", (gl_function) glLockArraysEXT }, + { "glUnlockArraysEXT", (gl_function) glUnlockArraysEXT }, + + /* GL_EXT_point_parameters */ + { "glPointParameterfEXT", (gl_function) glPointParameterfEXT }, + { "glPointParameterfvEXT", (gl_function) glPointParameterfvEXT }, + + /* GL_EXT_polygon_offset */ + { "glPolygonOffsetEXT", (gl_function) glPolygonOffsetEXT }, /* GL_EXT_blend_minmax */ { "glBlendEquationEXT", (gl_function) glBlendEquationEXT }, @@ -279,9 +650,6 @@ void (*gl_get_proc_address( const GLubyte *procName ))() /* GL_EXT_blend_color */ { "glBlendColorEXT", (gl_function) glBlendColorEXT }, - /* GL_EXT_polygon_offset */ - { "glPolygonOffsetEXT", (gl_function) glPolygonOffsetEXT }, - /* GL_EXT_vertex_arrays */ { "glVertexPointerEXT", (gl_function) glVertexPointerEXT }, { "glNormalPointerEXT", (gl_function) glNormalPointerEXT }, @@ -306,13 +674,6 @@ void (*gl_get_proc_address( const GLubyte *procName ))() { "glTexSubImage3DEXT", (gl_function) glTexSubImage3DEXT }, { "glCopyTexSubImage3DEXT", (gl_function) glCopyTexSubImage3DEXT }, - /* GL_EXT_paletted_texture */ - { "glColorTableEXT", (gl_function) glColorTableEXT }, - { "glColorSubTableEXT", (gl_function) glColorSubTableEXT }, - { "glGetColorTableEXT", (gl_function) glGetColorTableEXT }, - { "glGetColorTableParameterfvEXT", (gl_function) glGetColorTableParameterfvEXT }, - { "glGetColorTableParameterivEXT", (gl_function) glGetColorTableParameterivEXT }, - /* GL_ARB_multitexture */ { "glActiveTextureARB", (gl_function) glActiveTextureARB }, { "glClientActiveTextureARB", (gl_function) glClientActiveTextureARB }, @@ -349,10 +710,6 @@ void (*gl_get_proc_address( const GLubyte *procName ))() { "glMultiTexCoord4sARB", (gl_function) glMultiTexCoord4sARB }, { "glMultiTexCoord4svARB", (gl_function) glMultiTexCoord4svARB }, - /* GL_EXT_point_parameters */ - { "glPointParameterfEXT", (gl_function) glPointParameterfEXT }, - { "glPointParameterfvEXT", (gl_function) glPointParameterfvEXT }, - /* GL_INGR_blend_func_separate */ { "glBlendFuncSeparateINGR", (gl_function) glBlendFuncSeparateINGR }, diff --git a/xc/extras/Mesa/src/extensions.h b/xc/extras/Mesa/src/extensions.h index a25156c0a..cea505c1a 100644 --- a/xc/extras/Mesa/src/extensions.h +++ b/xc/extras/Mesa/src/extensions.h @@ -1,4 +1,4 @@ -/* $Id: extensions.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: extensions.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/feedback.c b/xc/extras/Mesa/src/feedback.c index abf19b5b7..ff39a4be0 100644 --- a/xc/extras/Mesa/src/feedback.c +++ b/xc/extras/Mesa/src/feedback.c @@ -1,4 +1,4 @@ -/* $Id: feedback.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: feedback.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/feedback.h b/xc/extras/Mesa/src/feedback.h index 6369e5cf8..70929dc9f 100644 --- a/xc/extras/Mesa/src/feedback.h +++ b/xc/extras/Mesa/src/feedback.h @@ -1,4 +1,4 @@ -/* $Id: feedback.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: feedback.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/fixed.h b/xc/extras/Mesa/src/fixed.h index 385493b4c..d23183c2a 100644 --- a/xc/extras/Mesa/src/fixed.h +++ b/xc/extras/Mesa/src/fixed.h @@ -1,4 +1,4 @@ -/* $Id: fixed.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: fixed.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/fog.c b/xc/extras/Mesa/src/fog.c index cce3fbeed..85cdb8134 100644 --- a/xc/extras/Mesa/src/fog.c +++ b/xc/extras/Mesa/src/fog.c @@ -1,4 +1,4 @@ -/* $Id: fog.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: fog.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/fog.h b/xc/extras/Mesa/src/fog.h index b7fd91777..24dbf57c0 100644 --- a/xc/extras/Mesa/src/fog.h +++ b/xc/extras/Mesa/src/fog.h @@ -1,4 +1,4 @@ -/* $Id: fog.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: fog.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/fog_tmp.h b/xc/extras/Mesa/src/fog_tmp.h index 0d5c5db62..9fbb0e106 100644 --- a/xc/extras/Mesa/src/fog_tmp.h +++ b/xc/extras/Mesa/src/fog_tmp.h @@ -1,4 +1,4 @@ -/* $Id: fog_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: fog_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/general_clip.h b/xc/extras/Mesa/src/general_clip.h index 349abf2de..995842608 100644 --- a/xc/extras/Mesa/src/general_clip.h +++ b/xc/extras/Mesa/src/general_clip.h @@ -1,4 +1,4 @@ -/* $Id: general_clip.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: general_clip.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/get.c b/xc/extras/Mesa/src/get.c index 153e32a87..2d1c55598 100644 --- a/xc/extras/Mesa/src/get.c +++ b/xc/extras/Mesa/src/get.c @@ -1,4 +1,4 @@ -/* $Id: get.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: get.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/get.h b/xc/extras/Mesa/src/get.h index e87955334..7738a2183 100644 --- a/xc/extras/Mesa/src/get.h +++ b/xc/extras/Mesa/src/get.h @@ -1,4 +1,4 @@ -/* $Id: get.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: get.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/glmisc.c b/xc/extras/Mesa/src/glmisc.c index 5c2517ef7..0e0e81e2b 100644 --- a/xc/extras/Mesa/src/glmisc.c +++ b/xc/extras/Mesa/src/glmisc.c @@ -1,4 +1,4 @@ -/* $Id: glmisc.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: glmisc.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/glmisc.h b/xc/extras/Mesa/src/glmisc.h index fa3f2d213..ef57f3c20 100644 --- a/xc/extras/Mesa/src/glmisc.h +++ b/xc/extras/Mesa/src/glmisc.h @@ -1,4 +1,4 @@ -/* $Id: glmisc.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: glmisc.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/hash.c b/xc/extras/Mesa/src/hash.c index 90373b5c2..99f52dbc6 100644 --- a/xc/extras/Mesa/src/hash.c +++ b/xc/extras/Mesa/src/hash.c @@ -1,4 +1,4 @@ -/* $Id: hash.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: hash.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/hash.h b/xc/extras/Mesa/src/hash.h index 164f3cadc..de1ad408d 100644 --- a/xc/extras/Mesa/src/hash.h +++ b/xc/extras/Mesa/src/hash.h @@ -1,4 +1,4 @@ -/* $Id: hash.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: hash.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/highpc.c b/xc/extras/Mesa/src/highpc.c index b3fb4ca1d..e856847dc 100644 --- a/xc/extras/Mesa/src/highpc.c +++ b/xc/extras/Mesa/src/highpc.c @@ -1,4 +1,4 @@ -/* $Id: highpc.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: highpc.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/image.c b/xc/extras/Mesa/src/image.c index d95c881df..b6e3198c8 100644 --- a/xc/extras/Mesa/src/image.c +++ b/xc/extras/Mesa/src/image.c @@ -1,4 +1,4 @@ -/* $Id: image.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: image.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/image.h b/xc/extras/Mesa/src/image.h index e5efd04fa..a47bab970 100644 --- a/xc/extras/Mesa/src/image.h +++ b/xc/extras/Mesa/src/image.h @@ -1,4 +1,4 @@ -/* $Id: image.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: image.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/indirect_tmp.h b/xc/extras/Mesa/src/indirect_tmp.h index 066986ced..89c085cb6 100644 --- a/xc/extras/Mesa/src/indirect_tmp.h +++ b/xc/extras/Mesa/src/indirect_tmp.h @@ -1,4 +1,4 @@ -/* $Id: indirect_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: indirect_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/interp_tmp.h b/xc/extras/Mesa/src/interp_tmp.h index ee4137efa..d8321950d 100644 --- a/xc/extras/Mesa/src/interp_tmp.h +++ b/xc/extras/Mesa/src/interp_tmp.h @@ -1,4 +1,4 @@ -/* $Id: interp_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: interp_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/light.c b/xc/extras/Mesa/src/light.c index a23291df0..0e7631968 100644 --- a/xc/extras/Mesa/src/light.c +++ b/xc/extras/Mesa/src/light.c @@ -1,4 +1,4 @@ -/* $Id: light.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: light.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/light.h b/xc/extras/Mesa/src/light.h index 9725da290..ef2999670 100644 --- a/xc/extras/Mesa/src/light.h +++ b/xc/extras/Mesa/src/light.h @@ -1,4 +1,4 @@ -/* $Id: light.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: light.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/lines.c b/xc/extras/Mesa/src/lines.c index e34164d0e..4abeede62 100644 --- a/xc/extras/Mesa/src/lines.c +++ b/xc/extras/Mesa/src/lines.c @@ -1,4 +1,4 @@ -/* $Id: lines.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: lines.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/lines.h b/xc/extras/Mesa/src/lines.h index 42cb513ea..570e5ff0c 100644 --- a/xc/extras/Mesa/src/lines.h +++ b/xc/extras/Mesa/src/lines.h @@ -1,4 +1,4 @@ -/* $Id: lines.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: lines.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/linetemp.h b/xc/extras/Mesa/src/linetemp.h index c0a53f9a8..83d6b1615 100644 --- a/xc/extras/Mesa/src/linetemp.h +++ b/xc/extras/Mesa/src/linetemp.h @@ -1,4 +1,4 @@ -/* $Id: linetemp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: linetemp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/lnaatemp.h b/xc/extras/Mesa/src/lnaatemp.h index 251a240d2..1fab71128 100644 --- a/xc/extras/Mesa/src/lnaatemp.h +++ b/xc/extras/Mesa/src/lnaatemp.h @@ -1,4 +1,4 @@ -/* $Id: lnaatemp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: lnaatemp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/logic.c b/xc/extras/Mesa/src/logic.c index 20f524fe9..dcf4e73fd 100644 --- a/xc/extras/Mesa/src/logic.c +++ b/xc/extras/Mesa/src/logic.c @@ -1,4 +1,4 @@ -/* $Id: logic.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: logic.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -74,6 +74,9 @@ void gl_LogicOp( GLcontext *ctx, GLenum opcode ) gl_error( ctx, GL_INVALID_ENUM, "glLogicOp" ); return; } + + if (ctx->Driver.LogicOpcode) + ctx->Driver.LogicOpcode( ctx, opcode ); } diff --git a/xc/extras/Mesa/src/logic.h b/xc/extras/Mesa/src/logic.h index 425804d8b..415c127b0 100644 --- a/xc/extras/Mesa/src/logic.h +++ b/xc/extras/Mesa/src/logic.h @@ -1,4 +1,4 @@ -/* $Id: logic.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: logic.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/lowpc.c b/xc/extras/Mesa/src/lowpc.c index c333b9aeb..39d84a45e 100644 --- a/xc/extras/Mesa/src/lowpc.c +++ b/xc/extras/Mesa/src/lowpc.c @@ -1,4 +1,4 @@ -/* $Id: lowpc.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: lowpc.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/macros.h b/xc/extras/Mesa/src/macros.h index ddf1fca80..fa7ff081e 100644 --- a/xc/extras/Mesa/src/macros.h +++ b/xc/extras/Mesa/src/macros.h @@ -1,4 +1,4 @@ -/* $Id: macros.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: macros.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/masking.c b/xc/extras/Mesa/src/masking.c index e707c82b6..33bb282bd 100644 --- a/xc/extras/Mesa/src/masking.c +++ b/xc/extras/Mesa/src/masking.c @@ -1,4 +1,4 @@ -/* $Id: masking.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: masking.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/masking.h b/xc/extras/Mesa/src/masking.h index a0c455b46..a340c1ef4 100644 --- a/xc/extras/Mesa/src/masking.h +++ b/xc/extras/Mesa/src/masking.h @@ -1,4 +1,4 @@ -/* $Id: masking.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: masking.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/matrix.c b/xc/extras/Mesa/src/matrix.c index 837528764..3cf98c415 100644 --- a/xc/extras/Mesa/src/matrix.c +++ b/xc/extras/Mesa/src/matrix.c @@ -1,4 +1,4 @@ -/* $Id: matrix.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: matrix.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/matrix.h b/xc/extras/Mesa/src/matrix.h index 77dcd64e8..158ce53b0 100644 --- a/xc/extras/Mesa/src/matrix.h +++ b/xc/extras/Mesa/src/matrix.h @@ -1,4 +1,4 @@ -/* $Id: matrix.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: matrix.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/mmath.c b/xc/extras/Mesa/src/mmath.c index e47fc371d..537655494 100644 --- a/xc/extras/Mesa/src/mmath.c +++ b/xc/extras/Mesa/src/mmath.c @@ -1,4 +1,4 @@ -/* $Id: mmath.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: mmath.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/mmath.h b/xc/extras/Mesa/src/mmath.h index 5b27b0f3c..44037716b 100644 --- a/xc/extras/Mesa/src/mmath.h +++ b/xc/extras/Mesa/src/mmath.h @@ -1,4 +1,4 @@ -/* $Id: mmath.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: mmath.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/mthreads.c b/xc/extras/Mesa/src/mthreads.c index 8c101d707..f038e0599 100644 --- a/xc/extras/Mesa/src/mthreads.c +++ b/xc/extras/Mesa/src/mthreads.c @@ -1,4 +1,4 @@ -/* $Id: mthreads.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: mthreads.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/mthreads.h b/xc/extras/Mesa/src/mthreads.h index 3a5d997dd..aeddf2efa 100644 --- a/xc/extras/Mesa/src/mthreads.h +++ b/xc/extras/Mesa/src/mthreads.h @@ -1,4 +1,4 @@ -/* $Id: mthreads.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: mthreads.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/norm_tmp.h b/xc/extras/Mesa/src/norm_tmp.h index 3ac9926f0..48c926e4a 100644 --- a/xc/extras/Mesa/src/norm_tmp.h +++ b/xc/extras/Mesa/src/norm_tmp.h @@ -1,4 +1,4 @@ -/* $Id: norm_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: norm_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pb.c b/xc/extras/Mesa/src/pb.c index d956b8555..ae7736f3d 100644 --- a/xc/extras/Mesa/src/pb.c +++ b/xc/extras/Mesa/src/pb.c @@ -1,4 +1,4 @@ -/* $Id: pb.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pb.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pb.h b/xc/extras/Mesa/src/pb.h index 84ad6a969..4d2b65de0 100644 --- a/xc/extras/Mesa/src/pb.h +++ b/xc/extras/Mesa/src/pb.h @@ -1,4 +1,4 @@ -/* $Id: pb.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pb.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pipeline.c b/xc/extras/Mesa/src/pipeline.c index 46d389056..3d0d5ef1e 100644 --- a/xc/extras/Mesa/src/pipeline.c +++ b/xc/extras/Mesa/src/pipeline.c @@ -1,4 +1,4 @@ -/* $Id: pipeline.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pipeline.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -54,7 +54,7 @@ #ifndef MESA_VERBOSE int MESA_VERBOSE = 0 /* | VERBOSE_PIPELINE */ - | VERBOSE_IMMEDIATE +/* | VERBOSE_IMMEDIATE */ /* | VERBOSE_VARRAY */ /* | VERBOSE_TEXTURE */ /* | VERBOSE_API */ @@ -62,6 +62,7 @@ int MESA_VERBOSE = 0 /* | VERBOSE_STATE */ /* | VERBOSE_CULL */ /* | VERBOSE_DISPLAY_LIST */ +/* | VERBOSE_LIGHTING */ ; #endif diff --git a/xc/extras/Mesa/src/pipeline.h b/xc/extras/Mesa/src/pipeline.h index b385b8688..15478195e 100644 --- a/xc/extras/Mesa/src/pipeline.h +++ b/xc/extras/Mesa/src/pipeline.h @@ -1,4 +1,4 @@ -/* $Id: pipeline.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pipeline.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pixel.c b/xc/extras/Mesa/src/pixel.c index 0e3771a24..f06e40677 100644 --- a/xc/extras/Mesa/src/pixel.c +++ b/xc/extras/Mesa/src/pixel.c @@ -1,4 +1,4 @@ -/* $Id: pixel.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pixel.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pixel.h b/xc/extras/Mesa/src/pixel.h index b658bb37b..b6c6e116a 100644 --- a/xc/extras/Mesa/src/pixel.h +++ b/xc/extras/Mesa/src/pixel.h @@ -1,4 +1,4 @@ -/* $Id: pixel.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pixel.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pointers.c b/xc/extras/Mesa/src/pointers.c index e71268dfe..ef72b7a84 100644 --- a/xc/extras/Mesa/src/pointers.c +++ b/xc/extras/Mesa/src/pointers.c @@ -1,4 +1,4 @@ -/* $Id: pointers.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pointers.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/pointers.h b/xc/extras/Mesa/src/pointers.h index b3ed6f533..c34da6aa4 100644 --- a/xc/extras/Mesa/src/pointers.h +++ b/xc/extras/Mesa/src/pointers.h @@ -1,4 +1,4 @@ -/* $Id: pointers.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: pointers.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/points.c b/xc/extras/Mesa/src/points.c index ebe00f15e..4334be44c 100644 --- a/xc/extras/Mesa/src/points.c +++ b/xc/extras/Mesa/src/points.c @@ -1,4 +1,4 @@ -/* $Id: points.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: points.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/points.h b/xc/extras/Mesa/src/points.h index 8ef94f4fb..0232471ce 100644 --- a/xc/extras/Mesa/src/points.h +++ b/xc/extras/Mesa/src/points.h @@ -1,4 +1,4 @@ -/* $Id: points.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: points.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/polygon.c b/xc/extras/Mesa/src/polygon.c index 205d8dd44..1a48d82b2 100644 --- a/xc/extras/Mesa/src/polygon.c +++ b/xc/extras/Mesa/src/polygon.c @@ -1,4 +1,4 @@ -/* $Id: polygon.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: polygon.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/polygon.h b/xc/extras/Mesa/src/polygon.h index 9b2fba6e4..d26628ef4 100644 --- a/xc/extras/Mesa/src/polygon.h +++ b/xc/extras/Mesa/src/polygon.h @@ -1,4 +1,4 @@ -/* $Id: polygon.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: polygon.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/quads.c b/xc/extras/Mesa/src/quads.c index e23bfd479..9d1c2142d 100644 --- a/xc/extras/Mesa/src/quads.c +++ b/xc/extras/Mesa/src/quads.c @@ -1,4 +1,4 @@ -/* $Id: quads.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: quads.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/quads.h b/xc/extras/Mesa/src/quads.h index 71781ac95..fc0474c63 100644 --- a/xc/extras/Mesa/src/quads.h +++ b/xc/extras/Mesa/src/quads.h @@ -1,4 +1,4 @@ -/* $Id: quads.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: quads.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/rastpos.c b/xc/extras/Mesa/src/rastpos.c index a68009feb..fd8f58431 100644 --- a/xc/extras/Mesa/src/rastpos.c +++ b/xc/extras/Mesa/src/rastpos.c @@ -1,4 +1,4 @@ -/* $Id: rastpos.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: rastpos.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/rastpos.h b/xc/extras/Mesa/src/rastpos.h index 98b4c4678..061c303ef 100644 --- a/xc/extras/Mesa/src/rastpos.h +++ b/xc/extras/Mesa/src/rastpos.h @@ -1,4 +1,4 @@ -/* $Id: rastpos.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: rastpos.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/readpix.c b/xc/extras/Mesa/src/readpix.c index 9809e81a2..1d676d1aa 100644 --- a/xc/extras/Mesa/src/readpix.c +++ b/xc/extras/Mesa/src/readpix.c @@ -1,4 +1,4 @@ -/* $Id: readpix.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: readpix.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/readpix.h b/xc/extras/Mesa/src/readpix.h index 6e5fed2a1..ec1d8e9ad 100644 --- a/xc/extras/Mesa/src/readpix.h +++ b/xc/extras/Mesa/src/readpix.h @@ -1,4 +1,4 @@ -/* $Id: readpix.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: readpix.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/rect.c b/xc/extras/Mesa/src/rect.c index a79f22a10..41e9058a5 100644 --- a/xc/extras/Mesa/src/rect.c +++ b/xc/extras/Mesa/src/rect.c @@ -1,4 +1,4 @@ -/* $Id: rect.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: rect.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/rect.h b/xc/extras/Mesa/src/rect.h index 63d2b20f3..a0345e22a 100644 --- a/xc/extras/Mesa/src/rect.h +++ b/xc/extras/Mesa/src/rect.h @@ -1,4 +1,4 @@ -/* $Id: rect.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: rect.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/render_tmp.h b/xc/extras/Mesa/src/render_tmp.h index f550e018f..90ebad1e7 100644 --- a/xc/extras/Mesa/src/render_tmp.h +++ b/xc/extras/Mesa/src/render_tmp.h @@ -1,4 +1,4 @@ -/* $Id: render_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: render_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/scissor.c b/xc/extras/Mesa/src/scissor.c index 19865fd38..161e4deaa 100644 --- a/xc/extras/Mesa/src/scissor.c +++ b/xc/extras/Mesa/src/scissor.c @@ -1,4 +1,4 @@ -/* $Id: scissor.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: scissor.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/scissor.h b/xc/extras/Mesa/src/scissor.h index 95b50ad92..f537d2758 100644 --- a/xc/extras/Mesa/src/scissor.h +++ b/xc/extras/Mesa/src/scissor.h @@ -1,4 +1,4 @@ -/* $Id: scissor.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: scissor.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/shade.c b/xc/extras/Mesa/src/shade.c index fdcfbf943..b853efd02 100644 --- a/xc/extras/Mesa/src/shade.c +++ b/xc/extras/Mesa/src/shade.c @@ -1,4 +1,4 @@ -/* $Id: shade.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: shade.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/shade.h b/xc/extras/Mesa/src/shade.h index d68d72bda..c5f4ddcdd 100644 --- a/xc/extras/Mesa/src/shade.h +++ b/xc/extras/Mesa/src/shade.h @@ -1,4 +1,4 @@ -/* $Id: shade.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: shade.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/shade_tmp.h b/xc/extras/Mesa/src/shade_tmp.h index 26c6b3612..62fba0f63 100644 --- a/xc/extras/Mesa/src/shade_tmp.h +++ b/xc/extras/Mesa/src/shade_tmp.h @@ -1,4 +1,4 @@ -/* $Id: shade_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: shade_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -554,8 +554,7 @@ static void TAG(shade_fast_rgba)( struct vertex_buffer *VB ) COPY_3V(sum[0], base[0]); if (NR_SIDES == 2) COPY_3V(sum[1], base[1]); - if (0) -/* if (ctx->Light.ShadeModel == GL_SMOOTH) */ + if (MESA_VERBOSE&VERBOSE_LIGHTING) fprintf(stderr, "light normal %d/%d, %f %f %f\n", j, VB->Start, normal[0], normal[1], normal[2]); diff --git a/xc/extras/Mesa/src/simple_list.h b/xc/extras/Mesa/src/simple_list.h index 5bb00846a..828853035 100644 --- a/xc/extras/Mesa/src/simple_list.h +++ b/xc/extras/Mesa/src/simple_list.h @@ -1,4 +1,4 @@ -/* $Id: simple_list.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: simple_list.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/span.c b/xc/extras/Mesa/src/span.c index 022b7c3c7..ef10bb3a9 100644 --- a/xc/extras/Mesa/src/span.c +++ b/xc/extras/Mesa/src/span.c @@ -1,4 +1,4 @@ -/* $Id: span.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: span.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/span.h b/xc/extras/Mesa/src/span.h index be731a435..9a6116f67 100644 --- a/xc/extras/Mesa/src/span.h +++ b/xc/extras/Mesa/src/span.h @@ -1,4 +1,4 @@ -/* $Id: span.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: span.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/stages.c b/xc/extras/Mesa/src/stages.c index 737b0e13a..04d51a187 100644 --- a/xc/extras/Mesa/src/stages.c +++ b/xc/extras/Mesa/src/stages.c @@ -1,4 +1,4 @@ -/* $Id: stages.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: stages.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -709,7 +709,7 @@ CONST struct gl_pipeline_stage gl_default_pipeline[] = { PIPE_OP_NORM_XFORM, PIPE_PRECALC|PIPE_IMMEDIATE, 0, - NEW_LIGHTING|NEW_FOG|NEW_TEXTURING, /* state change (recheck) */ + NEW_LIGHTING|NEW_FOG|NEW_TEXTURING|NEW_NORMAL_TRANSFORM, /* state change (recheck) */ NEW_NORMAL_TRANSFORM, /* cva state change (recalc) */ 0, 0, DYN_STATE, @@ -788,8 +788,8 @@ CONST struct gl_pipeline_stage gl_default_pipeline[] = { PIPE_OP_RAST_SETUP_0|PIPE_OP_RAST_SETUP_1, PIPE_PRECALC|PIPE_IMMEDIATE, 0, - NEW_LIGHTING|NEW_TEXTURING|NEW_RASTER_OPS|NEW_POLYGON, - NEW_LIGHTING|NEW_TEXTURING|NEW_RASTER_OPS|NEW_POLYGON, + NEW_LIGHTING|NEW_TEXTURING|NEW_RASTER_OPS|NEW_POLYGON|NEW_TEXTURE_ENV, + NEW_LIGHTING|NEW_TEXTURING|NEW_RASTER_OPS|NEW_POLYGON|NEW_TEXTURE_ENV, 0, 0, DYN_STATE, check_full_setup, diff --git a/xc/extras/Mesa/src/stages.h b/xc/extras/Mesa/src/stages.h index 6e3ec4744..ca47647ac 100644 --- a/xc/extras/Mesa/src/stages.h +++ b/xc/extras/Mesa/src/stages.h @@ -1,4 +1,4 @@ -/* $Id: stages.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: stages.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/stencil.c b/xc/extras/Mesa/src/stencil.c index d7d942721..bf65801df 100644 --- a/xc/extras/Mesa/src/stencil.c +++ b/xc/extras/Mesa/src/stencil.c @@ -1,4 +1,4 @@ -/* $Id: stencil.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: stencil.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/stencil.h b/xc/extras/Mesa/src/stencil.h index ccb6b9810..375a65723 100644 --- a/xc/extras/Mesa/src/stencil.h +++ b/xc/extras/Mesa/src/stencil.h @@ -1,4 +1,4 @@ -/* $Id: stencil.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: stencil.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texgen_tmp.h b/xc/extras/Mesa/src/texgen_tmp.h index e96da6569..fed7ce0b9 100644 --- a/xc/extras/Mesa/src/texgen_tmp.h +++ b/xc/extras/Mesa/src/texgen_tmp.h @@ -1,4 +1,4 @@ -/* $Id: texgen_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: texgen_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/teximage.c b/xc/extras/Mesa/src/teximage.c index 4e965b790..a1637b8e0 100644 --- a/xc/extras/Mesa/src/teximage.c +++ b/xc/extras/Mesa/src/teximage.c @@ -1,4 +1,4 @@ -/* $Id: teximage.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: teximage.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/teximage.h b/xc/extras/Mesa/src/teximage.h index bd9fb02e0..c5cd58bbf 100644 --- a/xc/extras/Mesa/src/teximage.h +++ b/xc/extras/Mesa/src/teximage.h @@ -1,4 +1,4 @@ -/* $Id: teximage.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: teximage.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texobj.c b/xc/extras/Mesa/src/texobj.c index 484ad8ded..f9e9e6d2b 100644 --- a/xc/extras/Mesa/src/texobj.c +++ b/xc/extras/Mesa/src/texobj.c @@ -1,4 +1,4 @@ -/* $Id: texobj.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: texobj.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texobj.h b/xc/extras/Mesa/src/texobj.h index f87fbc3c7..e06354a08 100644 --- a/xc/extras/Mesa/src/texobj.h +++ b/xc/extras/Mesa/src/texobj.h @@ -1,4 +1,4 @@ -/* $Id: texobj.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: texobj.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texstate.c b/xc/extras/Mesa/src/texstate.c index ac85cb68f..9369fae39 100644 --- a/xc/extras/Mesa/src/texstate.c +++ b/xc/extras/Mesa/src/texstate.c @@ -1,4 +1,4 @@ -/* $Id: texstate.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: texstate.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texstate.h b/xc/extras/Mesa/src/texstate.h index dd65245da..39c506e85 100644 --- a/xc/extras/Mesa/src/texstate.h +++ b/xc/extras/Mesa/src/texstate.h @@ -1,4 +1,4 @@ -/* $Id: texstate.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: texstate.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texture.c b/xc/extras/Mesa/src/texture.c index 0d686da89..a20e091b6 100644 --- a/xc/extras/Mesa/src/texture.c +++ b/xc/extras/Mesa/src/texture.c @@ -1,4 +1,4 @@ -/* $Id: texture.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: texture.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/texture.h b/xc/extras/Mesa/src/texture.h index 481c73950..25a1aa9d7 100644 --- a/xc/extras/Mesa/src/texture.h +++ b/xc/extras/Mesa/src/texture.h @@ -1,4 +1,4 @@ -/* $Id: texture.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: texture.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/trans_tmp.h b/xc/extras/Mesa/src/trans_tmp.h index a75cf8234..28a43c9d9 100644 --- a/xc/extras/Mesa/src/trans_tmp.h +++ b/xc/extras/Mesa/src/trans_tmp.h @@ -1,4 +1,4 @@ -/* $Id: trans_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: trans_tmp.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/translate.c b/xc/extras/Mesa/src/translate.c index 3cf841dc8..97b4f4ad4 100644 --- a/xc/extras/Mesa/src/translate.c +++ b/xc/extras/Mesa/src/translate.c @@ -1,4 +1,4 @@ -/* $Id: translate.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: translate.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/translate.h b/xc/extras/Mesa/src/translate.h index d3f99df41..46df91afd 100644 --- a/xc/extras/Mesa/src/translate.h +++ b/xc/extras/Mesa/src/translate.h @@ -1,4 +1,4 @@ -/* $Id: translate.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: translate.h,v 1.3 1999/12/14 02:39:38 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/triangle.c b/xc/extras/Mesa/src/triangle.c index d51d460ab..11f084929 100644 --- a/xc/extras/Mesa/src/triangle.c +++ b/xc/extras/Mesa/src/triangle.c @@ -1,4 +1,4 @@ -/* $Id: triangle.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: triangle.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/triangle.h b/xc/extras/Mesa/src/triangle.h index 9c13529af..19da2ceeb 100644 --- a/xc/extras/Mesa/src/triangle.h +++ b/xc/extras/Mesa/src/triangle.h @@ -1,4 +1,4 @@ -/* $Id: triangle.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: triangle.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/tritemp.h b/xc/extras/Mesa/src/tritemp.h index 84df60add..4f46ba02f 100644 --- a/xc/extras/Mesa/src/tritemp.h +++ b/xc/extras/Mesa/src/tritemp.h @@ -1,4 +1,4 @@ -/* $Id: tritemp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: tritemp.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/types.h b/xc/extras/Mesa/src/types.h index f0ffa2443..ff9f93d2c 100644 --- a/xc/extras/Mesa/src/types.h +++ b/xc/extras/Mesa/src/types.h @@ -1,5 +1,5 @@ /* -*- mode: C; tab-width:8; c-basic-offset:8 -*- */ -/* $Id: types.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: types.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -2089,7 +2089,8 @@ enum _verbose { VERBOSE_API = 0x40, VERBOSE_TRIANGLE_CHECKS = 0x80, VERBOSE_CULL = 0x100, - VERBOSE_DISPLAY_LIST = 0x200 + VERBOSE_DISPLAY_LIST = 0x200, + VERBOSE_LIGHTING = 0x400, }; diff --git a/xc/extras/Mesa/src/varray.c b/xc/extras/Mesa/src/varray.c index 5aaa07aad..b73c89e61 100644 --- a/xc/extras/Mesa/src/varray.c +++ b/xc/extras/Mesa/src/varray.c @@ -1,4 +1,4 @@ -/* $Id: varray.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: varray.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/varray.h b/xc/extras/Mesa/src/varray.h index 391b3e471..a04adb309 100644 --- a/xc/extras/Mesa/src/varray.h +++ b/xc/extras/Mesa/src/varray.h @@ -1,4 +1,4 @@ -/* $Id: varray.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: varray.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vb.c b/xc/extras/Mesa/src/vb.c index a370e7e23..932bcf243 100644 --- a/xc/extras/Mesa/src/vb.c +++ b/xc/extras/Mesa/src/vb.c @@ -1,4 +1,4 @@ -/* $Id: vb.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vb.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vb.h b/xc/extras/Mesa/src/vb.h index cb05d6d7d..f7d73d4d7 100644 --- a/xc/extras/Mesa/src/vb.h +++ b/xc/extras/Mesa/src/vb.h @@ -1,4 +1,4 @@ -/* $Id: vb.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vb.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbcull.c b/xc/extras/Mesa/src/vbcull.c index 97e2c970e..605dbf8f2 100644 --- a/xc/extras/Mesa/src/vbcull.c +++ b/xc/extras/Mesa/src/vbcull.c @@ -1,4 +1,4 @@ -/* $Id: vbcull.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbcull.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbcull.h b/xc/extras/Mesa/src/vbcull.h index 0b4a18fac..0ac1e00c3 100644 --- a/xc/extras/Mesa/src/vbcull.h +++ b/xc/extras/Mesa/src/vbcull.h @@ -1,4 +1,4 @@ -/* $Id: vbcull.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbcull.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbfill.c b/xc/extras/Mesa/src/vbfill.c index 8e8e72563..af8801b4d 100644 --- a/xc/extras/Mesa/src/vbfill.c +++ b/xc/extras/Mesa/src/vbfill.c @@ -1,4 +1,4 @@ -/* $Id: vbfill.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbfill.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbfill.h b/xc/extras/Mesa/src/vbfill.h index 9a71438f9..0b837eaf6 100644 --- a/xc/extras/Mesa/src/vbfill.h +++ b/xc/extras/Mesa/src/vbfill.h @@ -1,4 +1,4 @@ -/* $Id: vbfill.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbfill.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbindirect.c b/xc/extras/Mesa/src/vbindirect.c index 169f9eee8..f0f693946 100644 --- a/xc/extras/Mesa/src/vbindirect.c +++ b/xc/extras/Mesa/src/vbindirect.c @@ -1,4 +1,4 @@ -/* $Id: vbindirect.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbindirect.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbindirect.h b/xc/extras/Mesa/src/vbindirect.h index 182040bc0..c361c1091 100644 --- a/xc/extras/Mesa/src/vbindirect.h +++ b/xc/extras/Mesa/src/vbindirect.h @@ -1,4 +1,4 @@ -/* $Id: vbindirect.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbindirect.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbrender.c b/xc/extras/Mesa/src/vbrender.c index 7f028af26..ef7cdca4c 100644 --- a/xc/extras/Mesa/src/vbrender.c +++ b/xc/extras/Mesa/src/vbrender.c @@ -1,4 +1,4 @@ -/* $Id: vbrender.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbrender.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -450,7 +450,7 @@ do { \ GLuint vlist[VB_SIZE]; \ GLubyte *eflag = VB->EdgeFlagPtr->data; \ GLuint *stipplecounter = &VB->ctx->StippleCounter; \ - (void) vlist; (void) eflag; + (void) vlist; (void) eflag; (void) stipplecounter; #define TAG(x) x##_cull #define INIT(x) FLUSH_PRIM(x) @@ -489,7 +489,7 @@ do { \ GLcontext *ctx = VB->ctx; \ GLubyte *eflag = VB->EdgeFlagPtr->data; \ GLuint *stipplecounter = &VB->ctx->StippleCounter; \ - (void) eflag; + (void) eflag; (void) stipplecounter; #define INIT(x) FLUSH_PRIM(x); #define RESET_STIPPLE *stipplecounter = 0 @@ -527,7 +527,7 @@ do { \ GLcontext *ctx = VB->ctx; \ GLubyte *eflag = VB->EdgeFlagPtr->data; \ GLuint *stipplecounter = &VB->ctx->StippleCounter; \ - (void) eflag; + (void) eflag; (void) stipplecounter; #define INIT(x) FLUSH_PRIM(x); #define TAG(x) x##_clipped diff --git a/xc/extras/Mesa/src/vbrender.h b/xc/extras/Mesa/src/vbrender.h index e2d53b874..37f9297d4 100644 --- a/xc/extras/Mesa/src/vbrender.h +++ b/xc/extras/Mesa/src/vbrender.h @@ -1,4 +1,4 @@ -/* $Id: vbrender.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbrender.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vbxform.c b/xc/extras/Mesa/src/vbxform.c index 7e5eb332c..6bd11e5f5 100644 --- a/xc/extras/Mesa/src/vbxform.c +++ b/xc/extras/Mesa/src/vbxform.c @@ -1,4 +1,4 @@ -/* $Id: vbxform.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbxform.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library @@ -540,10 +540,8 @@ void gl_fixup_input( GLcontext *ctx, struct immediate *IM ) if (MESA_VERBOSE&VERBOSE_IMMEDIATE) gl_print_vert_flags("copy from current", copy); - if (copy & VERT_NORM) { - IM->Flag[start] |= VERT_NORM; + if (copy & VERT_NORM) COPY_3V( IM->Normal[start], ctx->Current.Normal ); - } if (copy & VERT_RGBA) COPY_4UBV( IM->Color[start], ctx->Current.ByteColor); @@ -604,10 +602,17 @@ void gl_fixup_input( GLcontext *ctx, struct immediate *IM ) } if (fixup & VERT_NORM) { - if (IM->OrFlag & VERT_NORM) + /* Only eval cannot use the Flag member to find valid normals: + */ + if (IM->OrFlag & VERT_EVAL_ANY) fixup_3f( IM->Normal, IM->Flag, start, VERT_NORM ); - else if (!(IM->Flag[IM->LastData] & VERT_NORM)) - find_last_3f( IM->Normal, IM->Flag, VERT_NORM, IM->LastData ); + else { + /* Copy-to-current requires a valid normal in the last slot: + */ + if ((IM->OrFlag & VERT_NORM) && + !(IM->Flag[IM->LastData] & VERT_NORM)) + find_last_3f( IM->Normal, IM->Flag, VERT_NORM, IM->LastData ); + } } } diff --git a/xc/extras/Mesa/src/vbxform.h b/xc/extras/Mesa/src/vbxform.h index 4496ab4b7..d69f9f7ce 100644 --- a/xc/extras/Mesa/src/vbxform.h +++ b/xc/extras/Mesa/src/vbxform.h @@ -1,4 +1,4 @@ -/* $Id: vbxform.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vbxform.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vector.c b/xc/extras/Mesa/src/vector.c index 26fcc7f90..9edbe37b7 100644 --- a/xc/extras/Mesa/src/vector.c +++ b/xc/extras/Mesa/src/vector.c @@ -1,4 +1,4 @@ -/* $Id: vector.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vector.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vector.h b/xc/extras/Mesa/src/vector.h index a9315bf5f..4b0dc0171 100644 --- a/xc/extras/Mesa/src/vector.h +++ b/xc/extras/Mesa/src/vector.h @@ -1,4 +1,4 @@ -/* $Id: vector.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vector.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vertices.c b/xc/extras/Mesa/src/vertices.c index 26596dff8..45786b658 100644 --- a/xc/extras/Mesa/src/vertices.c +++ b/xc/extras/Mesa/src/vertices.c @@ -1,4 +1,4 @@ -/* $Id: vertices.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vertices.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/vertices.h b/xc/extras/Mesa/src/vertices.h index 4bc835d40..8c1299393 100644 --- a/xc/extras/Mesa/src/vertices.h +++ b/xc/extras/Mesa/src/vertices.h @@ -1,4 +1,4 @@ -/* $Id: vertices.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: vertices.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/winpos.c b/xc/extras/Mesa/src/winpos.c index 7ca152e8a..4a3d7b62f 100644 --- a/xc/extras/Mesa/src/winpos.c +++ b/xc/extras/Mesa/src/winpos.c @@ -1,4 +1,4 @@ -/* $Id: winpos.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: winpos.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/winpos.h b/xc/extras/Mesa/src/winpos.h index fd2b1fe79..d9293511b 100644 --- a/xc/extras/Mesa/src/winpos.h +++ b/xc/extras/Mesa/src/winpos.h @@ -1,4 +1,4 @@ -/* $Id: winpos.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: winpos.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/xform.c b/xc/extras/Mesa/src/xform.c index 99f413231..83328db0b 100644 --- a/xc/extras/Mesa/src/xform.c +++ b/xc/extras/Mesa/src/xform.c @@ -1,4 +1,4 @@ -/* $Id: xform.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: xform.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/xform.h b/xc/extras/Mesa/src/xform.h index 26110f5c6..3e74e2826 100644 --- a/xc/extras/Mesa/src/xform.h +++ b/xc/extras/Mesa/src/xform.h @@ -1,4 +1,4 @@ -/* $Id: xform.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: xform.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/xform_tmp.h b/xc/extras/Mesa/src/xform_tmp.h index 9fad0f286..57d9f9345 100644 --- a/xc/extras/Mesa/src/xform_tmp.h +++ b/xc/extras/Mesa/src/xform_tmp.h @@ -1,4 +1,4 @@ -/* $Id: xform_tmp.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: xform_tmp.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/zoom.c b/xc/extras/Mesa/src/zoom.c index 6ff309d3b..ea732e215 100644 --- a/xc/extras/Mesa/src/zoom.c +++ b/xc/extras/Mesa/src/zoom.c @@ -1,4 +1,4 @@ -/* $Id: zoom.c,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: zoom.c,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* * Mesa 3-D graphics library diff --git a/xc/extras/Mesa/src/zoom.h b/xc/extras/Mesa/src/zoom.h index b4ae3a464..bb6761481 100644 --- a/xc/extras/Mesa/src/zoom.h +++ b/xc/extras/Mesa/src/zoom.h @@ -1,4 +1,4 @@ -/* $Id: zoom.h,v 1.2 1999/12/07 03:37:15 daryll Exp $ */ +/* $Id: zoom.h,v 1.3 1999/12/14 02:39:39 daryll Exp $ */ /* diff --git a/xc/lib/GL/Imakefile b/xc/lib/GL/Imakefile index 17604072f..da415bfb6 100644 --- a/xc/lib/GL/Imakefile +++ b/xc/lib/GL/Imakefile @@ -12,7 +12,7 @@ XCOMM $PI: xc/lib/GL/Imakefile,v 1.11 1999/06/14 21:10:34 faith Exp $ #if BuildXF86DRI DRIDIRS = dri -MESADIRS = mesa/src +MESADIRS = mesa/include/GL mesa/src #endif SUBDIRS = glx $(DRIDIRS) $(MESADIRS) diff --git a/xc/lib/GL/mesa/include/GL/Imakefile b/xc/lib/GL/mesa/include/GL/Imakefile new file mode 100644 index 000000000..899ca1abc --- /dev/null +++ b/xc/lib/GL/mesa/include/GL/Imakefile @@ -0,0 +1,13 @@ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/include/GL/Imakefile,v 1.2 1999/06/14 07:31:42 dawes Exp $ +XCOMM $PI: xc/programs/Xserver/GL/mesa/include/GL/Imakefile,v 1.6 1999/03/15 21:36:09 martin Exp $ + +#define IHaveModules +#include <Server.tmpl> + + DEFINES = $(GLX_DEFINES) + +LinkSourceFile(gl.h, ../../../../../extras/Mesa/include/GL) +LinkSourceFile(glx.h, ../../../../../extras/Mesa/include/GL) +LinkSourceFile(xmesa.h, ../../../../../extras/Mesa/include/GL) +LinkSourceFile(xmesa_x.h, ../../../../../extras/Mesa/include/GL) +LinkSourceFile(xmesa_xf86.h, ../../../../../extras/Mesa/include/GL) diff --git a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_xmesa.c b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_xmesa.c index dca2d806d..1de9c8a16 100644 --- a/xc/lib/GL/mesa/src/drv/tdfx/tdfx_xmesa.c +++ b/xc/lib/GL/mesa/src/drv/tdfx/tdfx_xmesa.c @@ -200,10 +200,15 @@ void XMesaDestroyContext(XMesaContext c) tdfxContextPrivate *cPriv; cPriv=(tdfxContextPrivate*)c->private; + fprintf(stderr, "Destory context cPriv=%x\n", cPriv); if (cPriv) { gl_destroy_context(cPriv->glCtx); gl_destroy_framebuffer(cPriv->glBuffer); } + if (c==gCC) { + gCC=0; + gCCPriv=0; + } } XMesaBuffer XMesaCreateWindowBuffer(XMesaVisual v, XMesaWindow w, @@ -254,7 +259,6 @@ GLboolean XMesaMakeCurrent(XMesaContext c, XMesaBuffer b) gCC = c; gCCPriv = (tdfxContextPrivate *)c->private; - fprintf(stderr, "Make current\n"); driDrawPriv = gCC->driContextPriv->driDrawablePriv; if (!gCCPriv->initDone) { gCCPriv->width=driDrawPriv->w; diff --git a/xc/programs/Xserver/GL/mesa/include/GL/Imakefile b/xc/programs/Xserver/GL/mesa/include/GL/Imakefile index 03769a520..f4a4af7ec 100644 --- a/xc/programs/Xserver/GL/mesa/include/GL/Imakefile +++ b/xc/programs/Xserver/GL/mesa/include/GL/Imakefile @@ -6,8 +6,8 @@ XCOMM $PI: xc/programs/Xserver/GL/mesa/include/GL/Imakefile,v 1.6 1999/03/15 21: DEFINES = $(GLX_DEFINES) -LinkSourceFile(gl.h,../../../../../../lib/GL/mesa/include/GL) -LinkSourceFile(glx.h,../../../../../../lib/GL/mesa/include/GL) -LinkSourceFile(xmesa.h,../../../../../../lib/GL/mesa/include/GL) -LinkSourceFile(xmesa_x.h,../../../../../../lib/GL/mesa/include/GL) -LinkSourceFile(xmesa_xf86.h,../../../../../../lib/GL/mesa/include/GL) +LinkSourceFile(gl.h, ../../../../../../extras/Mesa/include/GL) +LinkSourceFile(glx.h, ../../../../../../extras/Mesa/include/GL) +LinkSourceFile(xmesa.h, ../../../../../../extras/Mesa/include/GL) +LinkSourceFile(xmesa_x.h, ../../../../../../extras/Mesa/include/GL) +LinkSourceFile(xmesa_xf86.h, ../../../../../../extras/Mesa/include/GL) diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c index 402cec628..0c8688cbd 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c @@ -56,7 +56,11 @@ TDFXInitVisualConfigs(ScreenPtr pScreen) case 32: break; case 16: +#if 0 numConfigs = 4; +#else + numConfigs = 1; +#endif if (!(pConfigs = (__GLXvisualConfig*)xnfcalloc(sizeof(__GLXvisualConfig), numConfigs))) { @@ -76,30 +80,25 @@ TDFXInitVisualConfigs(ScreenPtr pScreen) for (i=0; i<numConfigs; i++) pTDFXConfigPtrs[i] = &pTDFXConfigs[i]; - /* config 0: db=FALSE, depth=0 - config 1: db=FALSE, depth=16 - config 2: db=TRUE, depth=0; - config 3: db=TRUE, depth=16 - */ pConfigs[0].vid = -1; pConfigs[0].class = -1; pConfigs[0].rgba = TRUE; - pConfigs[0].redSize = 8; - pConfigs[0].greenSize = 8; - pConfigs[0].blueSize = 8; - pConfigs[0].redMask = 0x00FF0000; - pConfigs[0].greenMask = 0x0000FF00; - pConfigs[0].blueMask = 0x000000FF; + pConfigs[0].redSize = 5; + pConfigs[0].greenSize = 6; + pConfigs[0].blueSize = 5; + pConfigs[0].redMask = 0x0000F800; + pConfigs[0].greenMask = 0x000007E0; + pConfigs[0].blueMask = 0x0000001F; pConfigs[0].alphaMask = 0; pConfigs[0].accumRedSize = 0; pConfigs[0].accumGreenSize = 0; pConfigs[0].accumBlueSize = 0; pConfigs[0].accumAlphaSize = 0; - pConfigs[0].doubleBuffer = FALSE; + pConfigs[0].doubleBuffer = TRUE; pConfigs[0].stereo = FALSE; pConfigs[0].bufferSize = 16; - pConfigs[0].depthSize = 0; - pConfigs[0].stencilSize = 0; + pConfigs[0].depthSize = 16; + pConfigs[0].stencilSize = 8; pConfigs[0].auxBuffers = 0; pConfigs[0].level = 0; pConfigs[0].visualRating = 0; @@ -109,95 +108,9 @@ TDFXInitVisualConfigs(ScreenPtr pScreen) pConfigs[0].transparentBlue = 0; pConfigs[0].transparentAlpha = 0; pConfigs[0].transparentIndex = 0; - - pConfigs[1].vid = -1; - pConfigs[1].class = -1; - pConfigs[1].rgba = TRUE; - pConfigs[1].redSize = 8; - pConfigs[1].greenSize = 8; - pConfigs[1].blueSize = 8; - pConfigs[1].redMask = 0x00FF0000; - pConfigs[1].greenMask = 0x0000FF00; - pConfigs[1].blueMask = 0x000000FF; - pConfigs[1].alphaMask = 0; - pConfigs[1].accumRedSize = 0; - pConfigs[1].accumGreenSize = 0; - pConfigs[1].accumBlueSize = 0; - pConfigs[1].accumAlphaSize = 0; - pConfigs[1].doubleBuffer = FALSE; - pConfigs[1].stereo = FALSE; - pConfigs[1].bufferSize = 16; - pConfigs[1].depthSize = 16; - pConfigs[1].stencilSize = 0; - pConfigs[1].auxBuffers = 0; - pConfigs[1].level = 0; - pConfigs[1].visualRating = 0; - pConfigs[1].transparentPixel = 0; - pConfigs[1].transparentRed = 0; - pConfigs[1].transparentGreen = 0; - pConfigs[1].transparentBlue = 0; - pConfigs[1].transparentAlpha = 0; - pConfigs[1].transparentIndex = 0; - - pConfigs[2].vid = -1; - pConfigs[2].class = -1; - pConfigs[2].rgba = TRUE; - pConfigs[2].redSize = 8; - pConfigs[2].greenSize = 8; - pConfigs[2].blueSize = 8; - pConfigs[2].redMask = 0x00FF0000; - pConfigs[2].greenMask = 0x0000FF00; - pConfigs[2].blueMask = 0x000000FF; - pConfigs[2].alphaMask = 0; - pConfigs[2].accumRedSize = 0; - pConfigs[2].accumGreenSize = 0; - pConfigs[2].accumBlueSize = 0; - pConfigs[2].accumAlphaSize = 0; - pConfigs[2].doubleBuffer = TRUE; - pConfigs[2].stereo = FALSE; - pConfigs[2].bufferSize = 16; - pConfigs[2].depthSize = 0; - pConfigs[2].stencilSize = 0; - pConfigs[2].auxBuffers = 0; - pConfigs[2].level = 0; - pConfigs[2].visualRating = 0; - pConfigs[2].transparentPixel = 0; - pConfigs[2].transparentRed = 0; - pConfigs[2].transparentGreen = 0; - pConfigs[2].transparentBlue = 0; - pConfigs[2].transparentAlpha = 0; - pConfigs[2].transparentIndex = 0; - - pConfigs[3].vid = -1; - pConfigs[3].class = -1; - pConfigs[3].rgba = TRUE; - pConfigs[3].redSize = 8; - pConfigs[3].greenSize = 8; - pConfigs[3].blueSize = 8; - pConfigs[3].redMask = 0x00FF0000; - pConfigs[3].greenMask = 0x0000FF00; - pConfigs[3].blueMask = 0x000000FF; - pConfigs[3].alphaMask = 0; - pConfigs[3].accumRedSize = 0; - pConfigs[3].accumGreenSize = 0; - pConfigs[3].accumBlueSize = 0; - pConfigs[3].accumAlphaSize = 0; - pConfigs[3].doubleBuffer = TRUE; - pConfigs[3].stereo = FALSE; - pConfigs[3].bufferSize = 16; - pConfigs[3].depthSize = 16; - pConfigs[3].stencilSize = 0; - pConfigs[3].auxBuffers = 0; - pConfigs[3].level = 0; - pConfigs[3].visualRating = 0; - pConfigs[3].transparentPixel = 0; - pConfigs[3].transparentRed = 0; - pConfigs[3].transparentGreen = 0; - pConfigs[3].transparentBlue = 0; - pConfigs[3].transparentAlpha = 0; - pConfigs[3].transparentIndex = 0; break; } + pTDFX->numVisualConfigs = numConfigs; pTDFX->pVisualConfigs = pConfigs; pTDFX->pVisualConfigsPriv = pTDFXConfigs; |