Import MesaLibs 6.5.1. (in dist/ since its code is shared between lib

and xserver)...

19 files changed, 115 insertions, 117 deletions

diff --git a/dist/Mesa/src/glu/sgi/glu.def b/dist/Mesa/src/glu/sgi/glu.def
index 0c8b02176..ffec651a0 100644
--- a/dist/Mesa/src/glu/sgi/glu.def
+++ b/dist/Mesa/src/glu/sgi/glu.def
@@ -1,4 +1,4 @@
-;DESCRIPTION 'Mesa GLU (OpenGL work-alike) for Win32'
+DESCRIPTION 'Mesa GLU (OpenGL work-alike) for Win32'
 VERSION 5.1
 ;
 ; Module definition file for GLU (GLU32.DLL)
diff --git a/dist/Mesa/src/glu/sgi/libnurbs/interface/glsurfeval.cc b/dist/Mesa/src/glu/sgi/libnurbs/interface/glsurfeval.cc
index b5bfab1e2..a36b30450 100644
--- a/dist/Mesa/src/glu/sgi/libnurbs/interface/glsurfeval.cc
+++ b/dist/Mesa/src/glu/sgi/libnurbs/interface/glsurfeval.cc
@@ -1184,11 +1184,8 @@ return;
 
 }
 
-#ifdef _WIN32
-void OpenGLSurfaceEvaluator::putCallBack(GLenum which, void (GLAPIENTRY *fn)() )
-#else
-void OpenGLSurfaceEvaluator::putCallBack(GLenum which, _GLUfuncptr fn )
-#endif
+void
+OpenGLSurfaceEvaluator::putCallBack(GLenum which, _GLUfuncptr fn )
 {
   switch(which)
     {
diff --git a/dist/Mesa/src/mesa/drivers/dri/i810/i810span.h b/dist/Mesa/src/mesa/drivers/dri/i810/i810span.h
index 184a37a10..9aed253bd 100644
--- a/dist/Mesa/src/mesa/drivers/dri/i810/i810span.h
+++ b/dist/Mesa/src/mesa/drivers/dri/i810/i810span.h
@@ -3,12 +3,12 @@
 
 #include "drirenderbuffer.h"
 
-extern void i810InitSpanFuncs( struct gl_context *ctx );
+extern void i810InitSpanFuncs( GLcontext *ctx );
 
-extern void i810SpanRenderFinish( struct gl_context *ctx );
-extern void i810SpanRenderStart( struct gl_context *ctx );
+extern void i810SpanRenderFinish( GLcontext *ctx );
+extern void i810SpanRenderStart( GLcontext *ctx );
 
 extern void
-i810SetSpanFunctions(driRenderbuffer *rb, const struct gl_config *vis);
+i810SetSpanFunctions(driRenderbuffer *rb, const GLvisual *vis);
 
 #endif
diff --git a/dist/Mesa/src/mesa/drivers/dri/i810/i810state.h b/dist/Mesa/src/mesa/drivers/dri/i810/i810state.h
index 96af12376..118b07549 100644
--- a/dist/Mesa/src/mesa/drivers/dri/i810/i810state.h
+++ b/dist/Mesa/src/mesa/drivers/dri/i810/i810state.h
@@ -3,10 +3,10 @@
 
 #include "i810context.h"
 
-extern void i810InitState( struct gl_context *ctx );
-extern void i810InitStateFuncs( struct gl_context *ctx );
+extern void i810InitState( GLcontext *ctx );
+extern void i810InitStateFuncs( GLcontext *ctx );
 extern void i810PrintDirty( const char *msg, GLuint state );
-extern void i810DrawBuffer(struct gl_context *ctx, GLenum mode );
+extern void i810DrawBuffer(GLcontext *ctx, GLenum mode );
 
 extern void i810Fallback( i810ContextPtr imesa, GLuint bit, GLboolean mode );
 #define FALLBACK( imesa, bit, mode ) i810Fallback( imesa, bit, mode )
diff --git a/dist/Mesa/src/mesa/drivers/dri/savage/savagestate.h b/dist/Mesa/src/mesa/drivers/dri/savage/savagestate.h
index dca4fd0c0..5fe718d7a 100644
--- a/dist/Mesa/src/mesa/drivers/dri/savage/savagestate.h
+++ b/dist/Mesa/src/mesa/drivers/dri/savage/savagestate.h
@@ -28,14 +28,14 @@
 
 #include "savagecontext.h"
 
-void savageCalcViewport( struct gl_context *ctx );
+void savageCalcViewport( GLcontext *ctx );
 void savageEmitOldState( savageContextPtr imesa );
 void savageEmitChangedState( savageContextPtr imesa );
 
-extern void savageDDUpdateHwState( struct gl_context *ctx );
+extern void savageDDUpdateHwState( GLcontext *ctx );
 extern void savageDDInitState( savageContextPtr imesa );
-extern void savageDDInitStateFuncs( struct gl_context *ctx );
-extern void savageDDRenderStart(struct gl_context *ctx);
-extern void savageDDRenderEnd(struct gl_context *ctx);
+extern void savageDDInitStateFuncs( GLcontext *ctx );
+extern void savageDDRenderStart(GLcontext *ctx);
+extern void savageDDRenderEnd(GLcontext *ctx);
 
 #endif
diff --git a/dist/Mesa/src/mesa/drivers/dri/unichrome/server/via_dri.h b/dist/Mesa/src/mesa/drivers/dri/unichrome/server/via_dri.h
index c6eed03c1..b47397d57 100644
--- a/dist/Mesa/src/mesa/drivers/dri/unichrome/server/via_dri.h
+++ b/dist/Mesa/src/mesa/drivers/dri/unichrome/server/via_dri.h
@@ -35,7 +35,9 @@
 #define VIA_DRIDDX_VERSION_MINOR  0
 #define VIA_DRIDDX_VERSION_PATCH  0
 
+#ifndef XFree86Server
 typedef int Bool;
+#endif
 
 typedef struct {
     drm_handle_t handle;
diff --git a/dist/Mesa/src/mesa/drivers/dri/unichrome/server/via_regs.h b/dist/Mesa/src/mesa/drivers/dri/unichrome/server/via_regs.h
index 87e1e9daa..5c5eecbe8 100644
--- a/dist/Mesa/src/mesa/drivers/dri/unichrome/server/via_regs.h
+++ b/dist/Mesa/src/mesa/drivers/dri/unichrome/server/via_regs.h
@@ -44,7 +44,6 @@
 #define PCI_CHIP_VT7205         0x7205
 #define PCI_CHIP_VT3204         0x3108
 #define PCI_CHIP_VT3259         0x3118
-#define PCI_CHIP_VT3344         0x3344
 
 
 #define BIOS_BSIZE              1024
diff --git a/dist/Mesa/src/mesa/drivers/dri/unichrome/via_span.h b/dist/Mesa/src/mesa/drivers/dri/unichrome/via_span.h
index b7abf6853..3dca0d566 100644
--- a/dist/Mesa/src/mesa/drivers/dri/unichrome/via_span.h
+++ b/dist/Mesa/src/mesa/drivers/dri/unichrome/via_span.h
@@ -25,11 +25,11 @@
 #ifndef _VIA_SPAN_H
 #define _VIA_SPAN_H
 
-extern void viaInitSpanFuncs(struct gl_context *ctx);
-extern void viaSpanRenderStart( struct gl_context *ctx );
-extern void viaSpanRenderFinish( struct gl_context *ctx );
+extern void viaInitSpanFuncs(GLcontext *ctx);
+extern void viaSpanRenderStart( GLcontext *ctx );
+extern void viaSpanRenderFinish( GLcontext *ctx );
 
 extern void
-viaSetSpanFunctions(struct via_renderbuffer *vrb, const struct gl_config *vis);
+viaSetSpanFunctions(struct via_renderbuffer *vrb, const GLvisual *vis);
 
 #endif
diff --git a/dist/Mesa/src/mesa/drivers/dri/unichrome/via_state.h b/dist/Mesa/src/mesa/drivers/dri/unichrome/via_state.h
index 8a2370552..065ec57d3 100644
--- a/dist/Mesa/src/mesa/drivers/dri/unichrome/via_state.h
+++ b/dist/Mesa/src/mesa/drivers/dri/unichrome/via_state.h
@@ -27,10 +27,10 @@
 
 #include "via_context.h"
 
-extern void viaInitState(struct gl_context *ctx);
-extern void viaInitStateFuncs(struct gl_context *ctx);
-extern void viaCalcViewport(struct gl_context *ctx);
-extern void viaValidateState(struct gl_context *ctx);
+extern void viaInitState(GLcontext *ctx);
+extern void viaInitStateFuncs(GLcontext *ctx);
+extern void viaCalcViewport(GLcontext *ctx);
+extern void viaValidateState(GLcontext *ctx);
 extern void viaEmitState(struct via_context *vmesa);
 
 extern void viaFallback(struct via_context *vmesa, GLuint bit, GLboolean mode);
diff --git a/dist/Mesa/src/mesa/drivers/windows/gldirect/dglcontext.h b/dist/Mesa/src/mesa/drivers/windows/gldirect/dglcontext.h
index ce04603c1..5c433b857 100644
--- a/dist/Mesa/src/mesa/drivers/windows/gldirect/dglcontext.h
+++ b/dist/Mesa/src/mesa/drivers/windows/gldirect/dglcontext.h
@@ -87,9 +87,9 @@ typedef struct {
 	void				*glPriv;
 
 	// Mesa vars:
-	struct gl_context			*glCtx;			// The core Mesa context
-	struct gl_config			*glVis;			// Describes the color buffer
-	struct gl_framebuffer		*glBuffer;		// Ancillary buffers
+	GLcontext			*glCtx;			// The core Mesa context
+	GLvisual			*glVis;			// Describes the color buffer
+	GLframebuffer		*glBuffer;		// Ancillary buffers
 
 	GLuint				ClearIndex;
 	GLuint				CurrentIndex;
@@ -135,9 +135,9 @@ typedef struct {
 	//
 	// Mesa context vars:
 	//
-	struct gl_context			*glCtx;			// The core Mesa context
-	struct gl_config			*glVis;			// Describes the color buffer
-	struct gl_framebuffer		*glBuffer;		// Ancillary buffers
+	GLcontext			*glCtx;			// The core Mesa context
+	GLvisual			*glVis;			// Describes the color buffer
+	GLframebuffer		*glBuffer;		// Ancillary buffers
 
 	GLuint				ClearIndex;
 	GLuint				CurrentIndex;
diff --git a/dist/Mesa/src/mesa/drivers/windows/gldirect/dglwgl.c b/dist/Mesa/src/mesa/drivers/windows/gldirect/dglwgl.c
index c46cfe162..74ecb01a5 100644
--- a/dist/Mesa/src/mesa/drivers/windows/gldirect/dglwgl.c
+++ b/dist/Mesa/src/mesa/drivers/windows/gldirect/dglwgl.c
@@ -874,8 +874,8 @@ BOOL APIENTRY _GLD_WGL_EXPORT(SetPixelFormat)(
 // Copied from GLD2.x. KeithH
 //
 static GLboolean _gldShareLists(
-	struct gl_context *ctx1,
-	struct gl_context *ctx2)
+	GLcontext *ctx1,
+	GLcontext *ctx2)
 {
 	/* Sanity check context pointers */
 	if (ctx1 == NULL || ctx2 == NULL)
@@ -955,7 +955,7 @@ BOOL APIENTRY _GLD_WGL_EXPORT(SwapLayerBuffers)(
 // either MESA glViewport() or GLD wglMakeCurrent().
 
 BOOL dglWglResizeBuffers(
-	struct gl_context *ctx,
+	GLcontext *ctx,
 	BOOL bDefaultDriver)
 {
 	DGL_ctx						*dgl = NULL;
diff --git a/dist/Mesa/src/mesa/drivers/windows/gldirect/dglwgl.h b/dist/Mesa/src/mesa/drivers/windows/gldirect/dglwgl.h
index 3e7e5892c..aac041033 100644
--- a/dist/Mesa/src/mesa/drivers/windows/gldirect/dglwgl.h
+++ b/dist/Mesa/src/mesa/drivers/windows/gldirect/dglwgl.h
@@ -118,7 +118,7 @@ BOOL	APIENTRY DGL_UseFontOutlinesA(HDC a, DWORD b, DWORD c, DWORD d, FLOAT e, FL
 BOOL	APIENTRY DGL_UseFontOutlinesW(HDC a, DWORD b, DWORD c, DWORD d, FLOAT e, FLOAT f, int g, LPGLYPHMETRICSFLOAT h);
 #endif //_USE_GLD3_WGL
 
-BOOL	dglWglResizeBuffers(struct gl_context *ctx, BOOL bDefaultDriver);
+BOOL	dglWglResizeBuffers(GLcontext *ctx, BOOL bDefaultDriver);
 
 #ifdef  __cplusplus
 }
diff --git a/dist/Mesa/src/mesa/drivers/windows/gldirect/gld_driver.c b/dist/Mesa/src/mesa/drivers/windows/gldirect/gld_driver.c
index aa7bc27c9..f7c575614 100644
--- a/dist/Mesa/src/mesa/drivers/windows/gldirect/gld_driver.c
+++ b/dist/Mesa/src/mesa/drivers/windows/gldirect/gld_driver.c
@@ -193,7 +193,7 @@ static BOOL	_GetDisplayMode_ERROR(
 //---------------------------------------------------------------------------
 
 const GLubyte* _gldGetStringGeneric(
-	struct gl_context *ctx,
+	GLcontext *ctx,
 	GLenum name)
 {
 	if (!ctx)
diff --git a/dist/Mesa/src/mesa/drivers/windows/gldirect/gld_driver.h b/dist/Mesa/src/mesa/drivers/windows/gldirect/gld_driver.h
index 7c393bc4c..01a46a832 100644
--- a/dist/Mesa/src/mesa/drivers/windows/gldirect/gld_driver.h
+++ b/dist/Mesa/src/mesa/drivers/windows/gldirect/gld_driver.h
@@ -83,7 +83,7 @@ typedef struct {
 extern GLD_driver _gldDriver;
 
 BOOL gldInitDriverPointers(DWORD dwDriver);
-const GLubyte* _gldGetStringGeneric(struct gl_context *ctx, GLenum name);
+const GLubyte* _gldGetStringGeneric(GLcontext *ctx, GLenum name);
 
 #endif // _USE_GLD3_WGL
 
diff --git a/dist/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_primtmp.h b/dist/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_primtmp.h
index 7103db535..97dca3fd4 100644
--- a/dist/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_primtmp.h
+++ b/dist/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_primtmp.h
@@ -46,7 +46,7 @@
  * GL_POINTS
  */
 
-static void TAG(flush_point_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_point_0)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    if ( !v0->mask ) {
       LOCAL_VARS;
@@ -59,16 +59,16 @@ static void TAG(flush_point_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
  * GL_LINES
  */
 
-static void TAG(flush_line_1)( struct gl_context *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_line_1)( GLcontext *ctx, TNL_VERTEX *v0 );
 
-static void TAG(flush_line_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_line_0)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    FLUSH_VERTEX = TAG(flush_line_1);
    ACTIVE_VERTEX = IMM_VERTICES( 1 );
 }
 
-static void TAG(flush_line_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_line_1)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    TNL_VERTEX *v1 = v0 - 1;
@@ -85,10 +85,10 @@ static void TAG(flush_line_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
  * GL_LINE_LOOP
  */
 
-static void TAG(flush_line_loop_2)( struct gl_context *ctx, TNL_VERTEX *v0 );
-static void TAG(flush_line_loop_1)( struct gl_context *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_line_loop_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_line_loop_1)( GLcontext *ctx, TNL_VERTEX *v0 );
 
-static void TAG(flush_line_loop_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_line_loop_0)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
 
@@ -107,7 +107,7 @@ static void TAG(flush_line_loop_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
       EMIT_VERTEX( b );      				\
    }
 
-static void TAG(flush_line_loop_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_line_loop_1)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    TNL_VERTEX *v1 = v0 - 1;
@@ -116,7 +116,7 @@ static void TAG(flush_line_loop_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
    DRAW_LINELOOP_LINE( v1, v0 );
 }
 
-static void TAG(flush_line_loop_2)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_line_loop_2)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    TNL_VERTEX *v1 = v0 + 1;
@@ -125,7 +125,7 @@ static void TAG(flush_line_loop_2)( struct gl_context *ctx, TNL_VERTEX *v0 )
    DRAW_LINELOOP_LINE( v1, v0 );
 }
 
-static void TAG(end_line_loop)( struct gl_context *ctx )
+static void TAG(end_line_loop)( GLcontext *ctx )
 {
    LOCAL_VARS;
 
@@ -142,10 +142,10 @@ static void TAG(end_line_loop)( struct gl_context *ctx )
  * GL_LINE_STRIP
  */
 
-static void TAG(flush_line_strip_2)( struct gl_context *ctx, TNL_VERTEX *v0 );
-static void TAG(flush_line_strip_1)( struct gl_context *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_line_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_line_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 );
 
-static void TAG(flush_line_strip_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_line_strip_0)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
 
@@ -154,7 +154,7 @@ static void TAG(flush_line_strip_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
 }
 
 
-static void TAG(flush_line_strip_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_line_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    TNL_VERTEX *v1 = v0 - 1;
@@ -173,7 +173,7 @@ static void TAG(flush_line_strip_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
    }      
 }
 
-static void TAG(flush_line_strip_2)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_line_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    TNL_VERTEX *v1 = v0 + 1;
@@ -198,10 +198,10 @@ static void TAG(flush_line_strip_2)( struct gl_context *ctx, TNL_VERTEX *v0 )
  * GL_TRIANGLES
  */
 
-static void TAG(flush_triangle_2)( struct gl_context *ctx, TNL_VERTEX *v0 );
-static void TAG(flush_triangle_1)( struct gl_context *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_triangle_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_triangle_1)( GLcontext *ctx, TNL_VERTEX *v0 );
 
-static void TAG(flush_triangle_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_triangle_0)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
 
@@ -212,7 +212,7 @@ static void TAG(flush_triangle_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
    BEGIN_PRIM( GL_TRIANGLES, 0 );
 }
 
-static void TAG(flush_triangle_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_triangle_1)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
 
@@ -222,7 +222,7 @@ static void TAG(flush_triangle_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
    FLUSH_VERTEX = TAG(flush_triangle_2);
 }
 
-static void TAG(flush_triangle_2)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_triangle_2)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    TNL_VERTEX *v2 = v0 - 2;
@@ -249,18 +249,18 @@ static void TAG(flush_triangle_2)( struct gl_context *ctx, TNL_VERTEX *v0 )
  * GL_TRIANGLE_STRIP
  */
 
-static void TAG(flush_tri_strip_3)( struct gl_context *ctx, TNL_VERTEX *v0 );
-static void TAG(flush_tri_strip_2)( struct gl_context *ctx, TNL_VERTEX *v0 );
-static void TAG(flush_tri_strip_1)( struct gl_context *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_tri_strip_3)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_tri_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_tri_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 );
 
-static void TAG(flush_tri_strip_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_tri_strip_0)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    ACTIVE_VERTEX = IMM_VERTICES( 1 );
    FLUSH_VERTEX = TAG(flush_tri_strip_1);
 }
 
-static void TAG(flush_tri_strip_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_tri_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    ACTIVE_VERTEX = IMM_VERTICES( 2 );
@@ -283,7 +283,7 @@ static void TAG(flush_tri_strip_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
       EMIT_VERTEX( v0 );      					\
    }      
 
-static void TAG(flush_tri_strip_2)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_tri_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    FLUSH_VERTEX = TAG(flush_tri_strip_3);
@@ -291,7 +291,7 @@ static void TAG(flush_tri_strip_2)( struct gl_context *ctx, TNL_VERTEX *v0 )
    DO_TRISTRIP_TRI( 0, 1 );
 }
 
-static void TAG(flush_tri_strip_3)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_tri_strip_3)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    FLUSH_VERTEX = TAG(flush_tri_strip_4);
@@ -299,7 +299,7 @@ static void TAG(flush_tri_strip_3)( struct gl_context *ctx, TNL_VERTEX *v0 )
    DO_TRISTRIP_TRI( 1, 2 );
 }
 
-static void TAG(flush_tri_strip_4)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_tri_strip_4)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    FLUSH_VERTEX = TAG(flush_tri_strip_5);
@@ -307,7 +307,7 @@ static void TAG(flush_tri_strip_4)( struct gl_context *ctx, TNL_VERTEX *v0 )
    DO_TRISTRIP_TRI( 2, 3 );
 }
 
-static void TAG(flush_tri_strip_5)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_tri_strip_5)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    FLUSH_VERTEX = TAG(flush_tri_strip_2);
@@ -321,10 +321,10 @@ static void TAG(flush_tri_strip_5)( struct gl_context *ctx, TNL_VERTEX *v0 )
  * GL_TRIANGLE_FAN
  */
 
-static void TAG(flush_tri_fan_2)( struct gl_context *ctx, TNL_VERTEX *v0 );
-static void TAG(flush_tri_fan_1)( struct gl_context *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_tri_fan_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_tri_fan_1)( GLcontext *ctx, TNL_VERTEX *v0 );
 
-static void TAG(flush_tri_fan_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_tri_fan_0)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
 
@@ -332,7 +332,7 @@ static void TAG(flush_tri_fan_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
    FLUSH_VERTEX = TAG(flush_tri_fan_1);
 }
 
-static void TAG(flush_tri_fan_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_tri_fan_1)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
 
@@ -356,7 +356,7 @@ static void TAG(flush_tri_fan_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
       EMIT_VERTEX( v0 );      					\
    }      
 
-static void TAG(flush_tri_fan_2)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_tri_fan_2)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    ACTIVE_VERTEX = IMM_VERTICES( 1 );
@@ -364,7 +364,7 @@ static void TAG(flush_tri_fan_2)( struct gl_context *ctx, TNL_VERTEX *v0 )
    DO_TRIFAN_TRI( 0, 1 );
 }
 
-static void TAG(flush_tri_fan_3)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_tri_fan_3)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    ACTIVE_VERTEX = IMM_VERTICES( 2 );
@@ -378,32 +378,32 @@ static void TAG(flush_tri_fan_3)( struct gl_context *ctx, TNL_VERTEX *v0 )
  * GL_QUADS
  */
 
-static void TAG(flush_quad_3)( struct gl_context *ctx, TNL_VERTEX *v0 );
-static void TAG(flush_quad_2)( struct gl_context *ctx, TNL_VERTEX *v0 );
-static void TAG(flush_quad_1)( struct gl_context *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_quad_3)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_quad_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_quad_1)( GLcontext *ctx, TNL_VERTEX *v0 );
 
-static void TAG(flush_quad_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_quad_0)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    IMM_VERTEX( v0 ) = v0 + 1;
    FLUSH_VERTEX = TAG(flush_quad_1);
 }
 
-static void TAG(flush_quad_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_quad_1)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    IMM_VERTEX( v0 ) = v0 + 1;
    FLUSH_VERTEX = TAG(flush_quad_2);
 }
 
-static void TAG(flush_quad_2)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_quad_2)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    IMM_VERTEX( v0 ) = v0 + 1;
    FLUSH_VERTEX = TAG(flush_quad_3);
 }
 
-static void TAG(flush_quad_3)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_quad_3)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    TNL_VERTEX *v3 = v0 - 3;
@@ -431,11 +431,11 @@ static void TAG(flush_quad_3)( struct gl_context *ctx, TNL_VERTEX *v0 )
  * GL_QUAD_STRIP
  */
 
-static void TAG(flush_quad_strip_3)( struct gl_context *ctx, TNL_VERTEX *v0 );
-static void TAG(flush_quad_strip_2)( struct gl_context *ctx, TNL_VERTEX *v0 );
-static void TAG(flush_quad_strip_1)( struct gl_context *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_quad_strip_3)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_quad_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_quad_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 );
 
-static void TAG(flush_quad_strip_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_quad_strip_0)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
 
@@ -444,7 +444,7 @@ static void TAG(flush_quad_strip_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
    FLUSH_VERTEX = TAG(flush_quad_strip_1);
 }
 
-static void TAG(flush_quad_strip_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_quad_strip_1)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
 
@@ -453,7 +453,7 @@ static void TAG(flush_quad_strip_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
    FLUSH_VERTEX = TAG(flush_quad_strip_2);
 }
 
-static void TAG(flush_quad_strip_2)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_quad_strip_2)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
 
@@ -462,7 +462,7 @@ static void TAG(flush_quad_strip_2)( struct gl_context *ctx, TNL_VERTEX *v0 )
    FLUSH_VERTEX = TAG(flush_quad_strip_3);
 }
 
-static void TAG(flush_quad_strip_3)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_quad_strip_3)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    TNL_VERTEX *v3 = IMM_VERTEX( v3 );
@@ -489,17 +489,17 @@ static void TAG(flush_quad_strip_3)( struct gl_context *ctx, TNL_VERTEX *v0 )
  * GL_POLYGON
  */
 
-static void TAG(flush_poly_2)( struct gl_context *ctx, TNL_VERTEX *v0 );
-static void TAG(flush_poly_1)( struct gl_context *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_poly_2)( GLcontext *ctx, TNL_VERTEX *v0 );
+static void TAG(flush_poly_1)( GLcontext *ctx, TNL_VERTEX *v0 );
 
-static void TAG(flush_poly_0)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_poly_0)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    ACTIVE_VERTEX = IMM_VERTICES( 1 );
    FLUSH_VERTEX = TAG(flush_poly_1);
 }
 
-static void TAG(flush_poly_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_poly_1)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    ACTIVE_VERTEX = IMM_VERTICES( 2 );
@@ -522,7 +522,7 @@ static void TAG(flush_poly_1)( struct gl_context *ctx, TNL_VERTEX *v0 )
       EMIT_VERTEX( v0 );					\
    }      
 
-static void TAG(flush_poly_2)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_poly_2)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    ACTIVE_VERTEX = IMM_VERTICES( 1 );
@@ -530,7 +530,7 @@ static void TAG(flush_poly_2)( struct gl_context *ctx, TNL_VERTEX *v0 )
    DO_POLY_TRI( 0, 1 );
 }
 
-static void TAG(flush_poly_3)( struct gl_context *ctx, TNL_VERTEX *v0 )
+static void TAG(flush_poly_3)( GLcontext *ctx, TNL_VERTEX *v0 )
 {
    LOCAL_VARS;
    ACTIVE_VERTEX = IMM_VERTICES( 2 );
@@ -539,7 +539,7 @@ static void TAG(flush_poly_3)( struct gl_context *ctx, TNL_VERTEX *v0 )
 }
 
 
-void (*TAG(flush_tab)[GL_POLYGON+1])( struct gl_context *, TNL_VERTEX * ) =
+void (*TAG(flush_tab)[GL_POLYGON+1])( GLcontext *, TNL_VERTEX * ) =
 {
    TAG(flush_point),
    TAG(flush_line_0),
diff --git a/dist/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_vb.c b/dist/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_vb.c
index 5081d92db..0c4462f55 100644
--- a/dist/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_vb.c
+++ b/dist/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_vb.c
@@ -113,7 +113,7 @@ do {							\
 
 /* Clip a line against the viewport and user clip planes.
  */
-static void TAG(clip_draw_line)( struct gl_context *ctx,
+static void TAG(clip_draw_line)( GLcontext *ctx,
 				 TNL_VERTEX *I,
 				 TNL_VERTEX *J,
 				 GLuint mask )
@@ -140,7 +140,7 @@ static void TAG(clip_draw_line)( struct gl_context *ctx,
 
 /* Clip a triangle against the viewport and user clip planes.
  */
-static void TAG(clip_draw_triangle)( struct gl_context *ctx,
+static void TAG(clip_draw_triangle)( GLcontext *ctx,
 				     TNL_VERTEX *v0,
 				     TNL_VERTEX *v1,
 				     TNL_VERTEX *v2,
@@ -173,7 +173,7 @@ static void TAG(clip_draw_triangle)( struct gl_context *ctx,
 }
 
 
-static __inline void TAG(draw_triangle)( struct gl_context *ctx,
+static __inline void TAG(draw_triangle)( GLcontext *ctx,
 					 TNL_VERTEX *v0,
 					 TNL_VERTEX *v1,
 					 TNL_VERTEX *v2 )
@@ -188,7 +188,7 @@ static __inline void TAG(draw_triangle)( struct gl_context *ctx,
    }
 }
 
-static __inline void TAG(draw_line)( struct gl_context *ctx,
+static __inline void TAG(draw_line)( GLcontext *ctx,
 				     TNL_VERTEX *v0,
 				     TNL_VERTEX *v1 )
 {
diff --git a/dist/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h b/dist/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h
index bb394622f..2f76553cf 100644
--- a/dist/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h
+++ b/dist/Mesa/src/mesa/tnl_dd/imm/t_dd_imm_vbtmp.h
@@ -41,7 +41,7 @@
 
 /* COPY_VERTEX_FROM_CURRENT in t_dd_imm_vapi.c
  */
-static void TAG(emit_vfmt)( struct gl_context *ctx, VERTEX *v )
+static void TAG(emit_vfmt)( GLcontext *ctx, VERTEX *v )
 {
    LOCALVARS
       ;
@@ -132,7 +132,7 @@ static void TAG(emit_vfmt)( struct gl_context *ctx, VERTEX *v )
 
 
 
-static void TAG(interp)( struct gl_context *ctx,
+static void TAG(interp)( GLcontext *ctx,
 			 GLfloat t,
 			 TNL_VERTEX *dst,
 			 TNL_VERTEX *in,
@@ -240,7 +240,7 @@ static void TAG(interp)( struct gl_context *ctx,
 }
 
 
-static __inline void TAG(copy_pv)( struct gl_context *ctx,
+static __inline void TAG(copy_pv)( GLcontext *ctx,
 				   TNL_VERTEX *dst, 
 				   TNL_VERTEX *src )
 {
diff --git a/dist/Mesa/src/mesa/tnl_dd/t_dd.c b/dist/Mesa/src/mesa/tnl_dd/t_dd.c
index 214ebd428..731da5c32 100644
--- a/dist/Mesa/src/mesa/tnl_dd/t_dd.c
+++ b/dist/Mesa/src/mesa/tnl_dd/t_dd.c
@@ -26,7 +26,7 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-static void copy_pv_rgba4_spec5( struct gl_context *ctx, GLuint edst, GLuint esrc )
+static void copy_pv_rgba4_spec5( GLcontext *ctx, GLuint edst, GLuint esrc )
 {
    i810ContextPtr imesa = I810_CONTEXT( ctx );
    GLubyte *i810verts = (GLubyte *)imesa->verts;
@@ -37,7 +37,7 @@ static void copy_pv_rgba4_spec5( struct gl_context *ctx, GLuint edst, GLuint esr
    dst->ui[5] = src->ui[5];
 }
 
-static void copy_pv_rgba4( struct gl_context *ctx, GLuint edst, GLuint esrc )
+static void copy_pv_rgba4( GLcontext *ctx, GLuint edst, GLuint esrc )
 {
    i810ContextPtr imesa = I810_CONTEXT( ctx );
    GLubyte *i810verts = (GLubyte *)imesa->verts;
@@ -47,7 +47,7 @@ static void copy_pv_rgba4( struct gl_context *ctx, GLuint edst, GLuint esrc )
    dst->ui[4] = src->ui[4];
 }
 
-static void copy_pv_rgba3( struct gl_context *ctx, GLuint edst, GLuint esrc )
+static void copy_pv_rgba3( GLcontext *ctx, GLuint edst, GLuint esrc )
 {
    i810ContextPtr imesa = I810_CONTEXT( ctx );
    GLubyte *i810verts = (GLubyte *)imesa->verts;
diff --git a/dist/Mesa/src/mesa/tnl_dd/t_dd_rendertmp.h b/dist/Mesa/src/mesa/tnl_dd/t_dd_rendertmp.h
index 692b4d1fd..b9f030195 100644
--- a/dist/Mesa/src/mesa/tnl_dd/t_dd_rendertmp.h
+++ b/dist/Mesa/src/mesa/tnl_dd/t_dd_rendertmp.h
@@ -63,7 +63,7 @@
 #define RENDER_TAB_QUALIFIER static
 #endif
 
-static void TAG(render_points)( struct gl_context *ctx,
+static void TAG(render_points)( GLcontext *ctx,
 				GLuint start,
 				GLuint count,
 				GLuint flags )
@@ -77,7 +77,7 @@ static void TAG(render_points)( struct gl_context *ctx,
    POSTFIX;
 }
 
-static void TAG(render_lines)( struct gl_context *ctx,
+static void TAG(render_lines)( GLcontext *ctx,
 			       GLuint start,
 			       GLuint count,
 			       GLuint flags )
@@ -96,7 +96,7 @@ static void TAG(render_lines)( struct gl_context *ctx,
 }
 
 
-static void TAG(render_line_strip)( struct gl_context *ctx,
+static void TAG(render_line_strip)( GLcontext *ctx,
 				    GLuint start,
 				    GLuint count,
 				    GLuint flags )
@@ -118,7 +118,7 @@ static void TAG(render_line_strip)( struct gl_context *ctx,
 }
 
 
-static void TAG(render_line_loop)( struct gl_context *ctx,
+static void TAG(render_line_loop)( GLcontext *ctx,
 				   GLuint start,
 				   GLuint count,
 				   GLuint flags )
@@ -150,7 +150,7 @@ static void TAG(render_line_loop)( struct gl_context *ctx,
 }
 
 
-static void TAG(render_triangles)( struct gl_context *ctx,
+static void TAG(render_triangles)( GLcontext *ctx,
 				   GLuint start,
 				   GLuint count,
 				   GLuint flags )
@@ -177,7 +177,7 @@ static void TAG(render_triangles)( struct gl_context *ctx,
 
 
 
-static void TAG(render_tri_strip)( struct gl_context *ctx,
+static void TAG(render_tri_strip)( GLcontext *ctx,
 				   GLuint start,
 				   GLuint count,
 				   GLuint flags )
@@ -213,7 +213,7 @@ static void TAG(render_tri_strip)( struct gl_context *ctx,
 }
 
 
-static void TAG(render_tri_fan)( struct gl_context *ctx,
+static void TAG(render_tri_fan)( GLcontext *ctx,
 				 GLuint start,
 				 GLuint count,
 				 GLuint flags )
@@ -252,7 +252,7 @@ static void TAG(render_tri_fan)( struct gl_context *ctx,
 }
 
 
-static void TAG(render_poly)( struct gl_context *ctx,
+static void TAG(render_poly)( GLcontext *ctx,
 			      GLuint start,
 			      GLuint count,
 			      GLuint flags )
@@ -321,7 +321,7 @@ static void TAG(render_poly)( struct gl_context *ctx,
    POSTFIX;
 }
 
-static void TAG(render_quads)( struct gl_context *ctx,
+static void TAG(render_quads)( GLcontext *ctx,
 			       GLuint start,
 			       GLuint count,
 			       GLuint flags )
@@ -346,7 +346,7 @@ static void TAG(render_quads)( struct gl_context *ctx,
    POSTFIX;
 }
 
-static void TAG(render_quad_strip)( struct gl_context *ctx,
+static void TAG(render_quad_strip)( GLcontext *ctx,
 				    GLuint start,
 				    GLuint count,
 				    GLuint flags )
@@ -384,7 +384,7 @@ static void TAG(render_quad_strip)( struct gl_context *ctx,
    POSTFIX;
 }
 
-static void TAG(render_noop)( struct gl_context *ctx,
+static void TAG(render_noop)( GLcontext *ctx,
 			      GLuint start,
 			      GLuint count,
 			      GLuint flags )
@@ -392,7 +392,7 @@ static void TAG(render_noop)( struct gl_context *ctx,
    (void)(ctx && start && count && flags);
 }
 
-RENDER_TAB_QUALIFIER void (*TAG(render_tab)[GL_POLYGON+2])(struct gl_context *,
+RENDER_TAB_QUALIFIER void (*TAG(render_tab)[GL_POLYGON+2])(GLcontext *,
 							   GLuint,
 							   GLuint,
 							   GLuint) =