Merge remote branch 'origin/master' into lp-setup-llvm

Conflicts: src/gallium/drivers/llvmpipe/lp_setup_coef.c src/gallium/drivers/llvmpipe/lp_setup_coef.h src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c src/gallium/drivers/llvmpipe/lp_setup_point.c src/gallium/drivers/llvmpipe/lp_setup_tri.c src/gallium/drivers/llvmpipe/lp_state_derived.c src/gallium/drivers/llvmpipe/lp_state_fs.h
author: Keith Whitwell <[email protected]> 2010-10-17 19:03:42 -0700
committer: Keith Whitwell <[email protected]> 2010-10-17 19:09:42 -0700
commit: 0072acd447dc6be652e63752e50215c3105322c8 (patch)
tree: 847d1763b54772d336a04e606f8248291c3092b7 /src/mesa/main
parent: 543fb77ddece7e1806e8eaa0d65bb2a945ef9a75 (diff)
parent: ca2b2ac131933b4171b519813df1aaa3a81621cd (diff)
155 files changed, 4328 insertions, 6953 deletions
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 4c5fd59d4fb..4dc0b0d4851 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -383,6 +383,7 @@
 		<value name="GL_ALPHA"/>
 		<value name="GL_RGB"/>
 		<value name="GL_RGBA"/>
+		<value name="GL_BGRA_EXT"/>
 		<value name="GL_LUMINANCE"/>
 		<value name="GL_LUMINANCE_ALPHA"/>
 		<value name="GL_DEPTH_COMPONENT" category="OES_depth_texture"/>
@@ -458,11 +459,18 @@
 
 	<desc name="format" category="OES_packed_depth_stencil">
 		<value name="GL_DEPTH_STENCIL_OES"/>
-
 		<desc name="type" error="GL_INVALID_OPERATION">
 			<value name="GL_UNSIGNED_INT_24_8_OES"/>
 		</desc>
 	</desc>
+
+	<desc name="format" category="EXT_texture_format_BGRA8888">
+		<value name="GL_BGRA_EXT"/>
+
+		<desc name="type" error="GL_INVALID_OPERATION">
+			<value name="GL_UNSIGNED_BYTE"/>
+		</desc>
+	</desc>
 </template>
 
 <template name="TexEnv">
@@ -4121,6 +4129,7 @@
 	<category name="OES_depth_texture"/>
 	<category name="OES_packed_depth_stencil"/>
 	<category name="OES_standard_derivatives"/>
+	<category name="EXT_texture_format_BGRA8888"/>
 
 	<category name="EXT_texture_compression_dxt1"/>
 	<category name="EXT_blend_minmax"/>
diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c
index 2012d00fd5f..9026110f3ef 100644
--- a/src/mesa/main/accum.c
+++ b/src/mesa/main/accum.c
@@ -115,7 +115,7 @@ _mesa_init_accum_dispatch(struct _glapi_table *disp)
 
 
 void 
-_mesa_init_accum( GLcontext *ctx )
+_mesa_init_accum( struct gl_context *ctx )
 {
    /* Accumulate buffer group */
    ASSIGN_4V( ctx->Accum.ClearColor, 0.0, 0.0, 0.0, 0.0 );
diff --git a/src/mesa/main/accum.h b/src/mesa/main/accum.h
index 4b628bafa02..def692a73a5 100644
--- a/src/mesa/main/accum.h
+++ b/src/mesa/main/accum.h
@@ -67,6 +67,6 @@ _mesa_init_accum_dispatch(struct _glapi_table *disp)
 #endif /* FEATURE_accum */
 
 extern void
-_mesa_init_accum( GLcontext *ctx );
+_mesa_init_accum( struct gl_context *ctx );
 
 #endif /* ACCUM_H */
diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index ffcd194240f..172c33b47bf 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -1031,7 +1031,7 @@ static attrib_func AttribFuncsARB[2][4][8] = {
 /**********************************************************************/
 
 
-GLboolean _ae_create_context( GLcontext *ctx )
+GLboolean _ae_create_context( struct gl_context *ctx )
 {
    if (ctx->aelt_context)
       return GL_TRUE;
@@ -1064,7 +1064,7 @@ GLboolean _ae_create_context( GLcontext *ctx )
 }
 
 
-void _ae_destroy_context( GLcontext *ctx )
+void _ae_destroy_context( struct gl_context *ctx )
 {
    if ( AE_CONTEXT( ctx ) ) {
       FREE( ctx->aelt_context );
@@ -1092,7 +1092,7 @@ static void check_vbo( AEcontext *actx,
  * etc).
  * Note: this may be called during display list construction.
  */
-static void _ae_update_state( GLcontext *ctx )
+static void _ae_update_state( struct gl_context *ctx )
 {
    AEcontext *actx = AE_CONTEXT(ctx);
    AEarray *aa = actx->arrays;
@@ -1211,7 +1211,7 @@ static void _ae_update_state( GLcontext *ctx )
    actx->NewState = 0;
 }
 
-void _ae_map_vbos( GLcontext *ctx )
+void _ae_map_vbos( struct gl_context *ctx )
 {
    AEcontext *actx = AE_CONTEXT(ctx);
    GLuint i;
@@ -1232,7 +1232,7 @@ void _ae_map_vbos( GLcontext *ctx )
       actx->mapped_vbos = GL_TRUE;
 }
 
-void _ae_unmap_vbos( GLcontext *ctx )
+void _ae_unmap_vbos( struct gl_context *ctx )
 {
    AEcontext *actx = AE_CONTEXT(ctx);
    GLuint i;
@@ -1300,7 +1300,7 @@ void GLAPIENTRY _ae_ArrayElement( GLint elt )
 }
 
 
-void _ae_invalidate_state( GLcontext *ctx, GLuint new_state )
+void _ae_invalidate_state( struct gl_context *ctx, GLuint new_state )
 {
    AEcontext *actx = AE_CONTEXT(ctx);
 
diff --git a/src/mesa/main/api_arrayelt.h b/src/mesa/main/api_arrayelt.h
index d18c0792c35..610e522a943 100644
--- a/src/mesa/main/api_arrayelt.h
+++ b/src/mesa/main/api_arrayelt.h
@@ -37,15 +37,15 @@
       (vfmt)->ArrayElement = impl ## ArrayElement; \
    } while (0)
 
-extern GLboolean _ae_create_context( GLcontext *ctx );
-extern void _ae_destroy_context( GLcontext *ctx );
-extern void _ae_invalidate_state( GLcontext *ctx, GLuint new_state );
+extern GLboolean _ae_create_context( struct gl_context *ctx );
+extern void _ae_destroy_context( struct gl_context *ctx );
+extern void _ae_invalidate_state( struct gl_context *ctx, GLuint new_state );
 extern void GLAPIENTRY _ae_ArrayElement( GLint elt );
 
 /* May optionally be called before a batch of element calls:
  */
-extern void _ae_map_vbos( GLcontext *ctx );
-extern void _ae_unmap_vbos( GLcontext *ctx );
+extern void _ae_map_vbos( struct gl_context *ctx );
+extern void _ae_unmap_vbos( struct gl_context *ctx );
 
 extern void
 _mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,
@@ -56,18 +56,18 @@ _mesa_install_arrayelt_vtxfmt(struct _glapi_table *disp,
 #define _MESA_INIT_ARRAYELT_VTXFMT(vfmt, impl) do { } while (0)
 
 static INLINE GLboolean
-_ae_create_context( GLcontext *ctx )
+_ae_create_context( struct gl_context *ctx )
 {
    return GL_TRUE;
 }
 
 static INLINE void
-_ae_destroy_context( GLcontext *ctx )
+_ae_destroy_context( struct gl_context *ctx )
 {
 }
 
 static INLINE void
-_ae_invalidate_state( GLcontext *ctx, GLuint new_state )
+_ae_invalidate_state( struct gl_context *ctx, GLuint new_state )
 {
 }
 
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index c3c710f5ef9..ae653e1914e 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -91,10 +91,7 @@
 #include "mtypes.h"
 #include "varray.h"
 #include "viewport.h"
-#if FEATURE_NV_vertex_program
-#include "nvprogram.h"
-#endif
-#if FEATURE_NV_fragment_program
+#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
 #include "nvprogram.h"
 #endif
 #if FEATURE_ARB_shader_objects
@@ -224,8 +221,6 @@ _mesa_create_exec_table(void)
    SET_ClearIndex(exec, _mesa_ClearIndex);
    SET_ClipPlane(exec, _mesa_ClipPlane);
    SET_ColorMaterial(exec, _mesa_ColorMaterial);
-   SET_CullParameterfvEXT(exec, _mesa_CullParameterfvEXT);
-   SET_CullParameterdvEXT(exec, _mesa_CullParameterdvEXT);
    SET_DepthFunc(exec, _mesa_DepthFunc);
    SET_DepthMask(exec, _mesa_DepthMask);
    SET_DepthRange(exec, _mesa_DepthRange);
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index b3b5c6cc053..4929a9310d4 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -54,7 +54,7 @@ index_bytes(GLenum type, GLsizei count)
  * Find the max index in the given element/index buffer
  */
 GLuint
-_mesa_max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
+_mesa_max_buffer_index(struct gl_context *ctx, GLuint count, GLenum type,
                        const void *indices,
                        struct gl_buffer_object *elementBuf)
 {
@@ -99,7 +99,7 @@ _mesa_max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
  * Check if OK to draw arrays/elements.
  */
 static GLboolean
-check_valid_to_render(GLcontext *ctx, const char *function)
+check_valid_to_render(struct gl_context *ctx, const char *function)
 {
    if (!_mesa_valid_to_render(ctx, function)) {
       return GL_FALSE;
@@ -140,7 +140,7 @@ check_valid_to_render(GLcontext *ctx, const char *function)
  * \return GL_TRUE if OK, GL_FALSE if any indexed vertex goes is out of bounds
  */
 static GLboolean
-check_index_bounds(GLcontext *ctx, GLsizei count, GLenum type,
+check_index_bounds(struct gl_context *ctx, GLsizei count, GLenum type,
 		   const GLvoid *indices, GLint basevertex)
 {
    struct _mesa_prim prim;
@@ -181,7 +181,7 @@ check_index_bounds(GLcontext *ctx, GLsizei count, GLenum type,
  * \return GL_TRUE if OK to render, GL_FALSE if error found
  */
 GLboolean
-_mesa_validate_DrawElements(GLcontext *ctx,
+_mesa_validate_DrawElements(struct gl_context *ctx,
 			    GLenum mode, GLsizei count, GLenum type,
 			    const GLvoid *indices, GLint basevertex)
 {
@@ -237,7 +237,7 @@ _mesa_validate_DrawElements(GLcontext *ctx,
  * \return GL_TRUE if OK to render, GL_FALSE if error found
  */
 GLboolean
-_mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
+_mesa_validate_DrawRangeElements(struct gl_context *ctx, GLenum mode,
 				 GLuint start, GLuint end,
 				 GLsizei count, GLenum type,
 				 const GLvoid *indices, GLint basevertex)
@@ -298,7 +298,7 @@ _mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
  * \return GL_TRUE if OK to render, GL_FALSE if error found
  */
 GLboolean
-_mesa_validate_DrawArrays(GLcontext *ctx,
+_mesa_validate_DrawArrays(struct gl_context *ctx,
 			  GLenum mode, GLint start, GLsizei count)
 {
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
@@ -327,7 +327,7 @@ _mesa_validate_DrawArrays(GLcontext *ctx,
 
 
 GLboolean
-_mesa_validate_DrawArraysInstanced(GLcontext *ctx, GLenum mode, GLint first,
+_mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint first,
                                    GLsizei count, GLsizei primcount)
 {
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
@@ -371,7 +371,7 @@ _mesa_validate_DrawArraysInstanced(GLcontext *ctx, GLenum mode, GLint first,
 
 
 GLboolean
-_mesa_validate_DrawElementsInstanced(GLcontext *ctx,
+_mesa_validate_DrawElementsInstanced(struct gl_context *ctx,
                                      GLenum mode, GLsizei count, GLenum type,
                                      const GLvoid *indices, GLsizei primcount)
 {
diff --git a/src/mesa/main/api_validate.h b/src/mesa/main/api_validate.h
index cd27d58aa7d..b232a90843e 100644
--- a/src/mesa/main/api_validate.h
+++ b/src/mesa/main/api_validate.h
@@ -32,32 +32,32 @@
 
 
 extern GLuint
-_mesa_max_buffer_index(GLcontext *ctx, GLuint count, GLenum type,
+_mesa_max_buffer_index(struct gl_context *ctx, GLuint count, GLenum type,
                        const void *indices,
                        struct gl_buffer_object *elementBuf);
 
 extern GLboolean
-_mesa_validate_DrawArrays(GLcontext *ctx,
+_mesa_validate_DrawArrays(struct gl_context *ctx,
 			  GLenum mode, GLint start, GLsizei count);
 
 extern GLboolean
-_mesa_validate_DrawElements(GLcontext *ctx,
+_mesa_validate_DrawElements(struct gl_context *ctx,
 			    GLenum mode, GLsizei count, GLenum type,
 			    const GLvoid *indices, GLint basevertex);
 
 extern GLboolean
-_mesa_validate_DrawRangeElements(GLcontext *ctx, GLenum mode,
+_mesa_validate_DrawRangeElements(struct gl_context *ctx, GLenum mode,
 				 GLuint start, GLuint end,
 				 GLsizei count, GLenum type,
 				 const GLvoid *indices, GLint basevertex);
 
 
 extern GLboolean
-_mesa_validate_DrawArraysInstanced(GLcontext *ctx, GLenum mode, GLint first,
+_mesa_validate_DrawArraysInstanced(struct gl_context *ctx, GLenum mode, GLint first,
                                    GLsizei count, GLsizei primcount);
 
 extern GLboolean
-_mesa_validate_DrawElementsInstanced(GLcontext *ctx,
+_mesa_validate_DrawElementsInstanced(struct gl_context *ctx,
                                      GLenum mode, GLsizei count, GLenum type,
                                      const GLvoid *indices, GLsizei primcount);
 
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 0069cd3dcfd..0d64b7de8dd 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -61,7 +61,7 @@
  */
 
 static INLINE struct gl_array_object *
-lookup_arrayobj(GLcontext *ctx, GLuint id)
+lookup_arrayobj(struct gl_context *ctx, GLuint id)
 {
    if (id == 0)
       return NULL;
@@ -77,7 +77,7 @@ lookup_arrayobj(GLcontext *ctx, GLuint id)
  * This is done just prior to array object destruction.
  */
 static void
-unbind_array_object_vbos(GLcontext *ctx, struct gl_array_object *obj)
+unbind_array_object_vbos(struct gl_context *ctx, struct gl_array_object *obj)
 {
    GLuint i;
 
@@ -109,7 +109,7 @@ unbind_array_object_vbos(GLcontext *ctx, struct gl_array_object *obj)
  * \c dd_function_table::NewArrayObject.
  */
 struct gl_array_object *
-_mesa_new_array_object( GLcontext *ctx, GLuint name )
+_mesa_new_array_object( struct gl_context *ctx, GLuint name )
 {
    struct gl_array_object *obj = CALLOC_STRUCT(gl_array_object);
    if (obj)
@@ -125,7 +125,7 @@ _mesa_new_array_object( GLcontext *ctx, GLuint name )
  * \c dd_function_table::DeleteArrayObject.
  */
 void
-_mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj )
+_mesa_delete_array_object( struct gl_context *ctx, struct gl_array_object *obj )
 {
    (void) ctx;
    unbind_array_object_vbos(ctx, obj);
@@ -138,7 +138,7 @@ _mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj )
  * Set ptr to arrayObj w/ reference counting.
  */
 void
-_mesa_reference_array_object(GLcontext *ctx,
+_mesa_reference_array_object(struct gl_context *ctx,
                              struct gl_array_object **ptr,
                              struct gl_array_object *arrayObj)
 {
@@ -193,7 +193,7 @@ _mesa_reference_array_object(GLcontext *ctx,
 
 
 static void
-init_array(GLcontext *ctx,
+init_array(struct gl_context *ctx,
            struct gl_client_array *array, GLint size, GLint type)
 {
    array->Size = size;
@@ -216,7 +216,7 @@ init_array(GLcontext *ctx,
  * Initialize a gl_array_object's arrays.
  */
 void
-_mesa_initialize_array_object( GLcontext *ctx,
+_mesa_initialize_array_object( struct gl_context *ctx,
 			       struct gl_array_object *obj,
 			       GLuint name )
 {
@@ -253,7 +253,7 @@ _mesa_initialize_array_object( GLcontext *ctx,
  * Add the given array object to the array object pool.
  */
 static void
-save_array_object( GLcontext *ctx, struct gl_array_object *obj )
+save_array_object( struct gl_context *ctx, struct gl_array_object *obj )
 {
    if (obj->Name > 0) {
       /* insert into hash table */
@@ -267,7 +267,7 @@ save_array_object( GLcontext *ctx, struct gl_array_object *obj )
  * Do not deallocate the array object though.
  */
 static void
-remove_array_object( GLcontext *ctx, struct gl_array_object *obj )
+remove_array_object( struct gl_context *ctx, struct gl_array_object *obj )
 {
    if (obj->Name > 0) {
       /* remove from hash table */
@@ -327,7 +327,7 @@ update_min(GLuint min, struct gl_client_array *array)
  * Examine vertex arrays to update the gl_array_object::_MaxElement field.
  */
 void
-_mesa_update_array_object_max_element(GLcontext *ctx,
+_mesa_update_array_object_max_element(struct gl_context *ctx,
                                       struct gl_array_object *arrayObj)
 {
    GLuint i, min = ~0;
@@ -364,7 +364,7 @@ _mesa_update_array_object_max_element(GLcontext *ctx,
  *                     glGenVertexArrays().
  */
 static void
-bind_vertex_array(GLcontext *ctx, GLuint id, GLboolean genRequired)
+bind_vertex_array(struct gl_context *ctx, GLuint id, GLboolean genRequired)
 {
    struct gl_array_object * const oldObj = ctx->Array.ArrayObj;
    struct gl_array_object *newObj = NULL;
@@ -495,7 +495,7 @@ _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
  * \param vboOnly Will arrays have to reside in VBOs?
  */
 static void 
-gen_vertex_arrays(GLcontext *ctx, GLsizei n, GLuint *arrays, GLboolean vboOnly)
+gen_vertex_arrays(struct gl_context *ctx, GLsizei n, GLuint *arrays, GLboolean vboOnly)
 {
    GLuint first;
    GLint i;
diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h
index fdf7e2bca46..26e3af19c91 100644
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@ -43,23 +43,23 @@
  */
 
 extern struct gl_array_object *
-_mesa_new_array_object( GLcontext *ctx, GLuint name );
+_mesa_new_array_object( struct gl_context *ctx, GLuint name );
 
 extern void
-_mesa_delete_array_object( GLcontext *ctx, struct gl_array_object *obj );
+_mesa_delete_array_object( struct gl_context *ctx, struct gl_array_object *obj );
 
 extern void
-_mesa_reference_array_object(GLcontext *ctx,
+_mesa_reference_array_object(struct gl_context *ctx,
                              struct gl_array_object **ptr,
                              struct gl_array_object *arrayObj);
 
 extern void
-_mesa_initialize_array_object( GLcontext *ctx,
+_mesa_initialize_array_object( struct gl_context *ctx,
                                struct gl_array_object *obj, GLuint name );
 
 
 extern void
-_mesa_update_array_object_max_element(GLcontext *ctx,
+_mesa_update_array_object_max_element(struct gl_context *ctx,
                                       struct gl_array_object *arrayObj);
 
 
diff --git a/src/mesa/main/atifragshader.c b/src/mesa/main/atifragshader.c
index 550f50b7a00..ae2feb3229a 100644
--- a/src/mesa/main/atifragshader.c
+++ b/src/mesa/main/atifragshader.c
@@ -62,7 +62,7 @@ _mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp)
  * Allocate and initialize a new ATI fragment shader object.
  */
 struct ati_fragment_shader *
-_mesa_new_ati_fragment_shader(GLcontext *ctx, GLuint id)
+_mesa_new_ati_fragment_shader(struct gl_context *ctx, GLuint id)
 {
    struct ati_fragment_shader *s = CALLOC_STRUCT(ati_fragment_shader);
    (void) ctx;
@@ -78,7 +78,7 @@ _mesa_new_ati_fragment_shader(GLcontext *ctx, GLuint id)
  * Delete the given ati fragment shader
  */
 void
-_mesa_delete_ati_fragment_shader(GLcontext *ctx, struct ati_fragment_shader *s)
+_mesa_delete_ati_fragment_shader(struct gl_context *ctx, struct ati_fragment_shader *s)
 {
    GLuint i;
    for (i = 0; i < MAX_NUM_PASSES_ATI; i++) {
diff --git a/src/mesa/main/atifragshader.h b/src/mesa/main/atifragshader.h
index 31c335ec815..6911bba5aee 100644
--- a/src/mesa/main/atifragshader.h
+++ b/src/mesa/main/atifragshader.h
@@ -66,10 +66,10 @@ extern void
 _mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp);
 
 extern struct ati_fragment_shader *
-_mesa_new_ati_fragment_shader(GLcontext *ctx, GLuint id);
+_mesa_new_ati_fragment_shader(struct gl_context *ctx, GLuint id);
 
 extern void
-_mesa_delete_ati_fragment_shader(GLcontext *ctx,
+_mesa_delete_ati_fragment_shader(struct gl_context *ctx,
                                  struct ati_fragment_shader *s);
 
 
@@ -133,13 +133,13 @@ _mesa_init_ati_fragment_shader_dispatch(struct _glapi_table *disp)
 }
 
 static INLINE struct ati_fragment_shader *
-_mesa_new_ati_fragment_shader(GLcontext *ctx, GLuint id)
+_mesa_new_ati_fragment_shader(struct gl_context *ctx, GLuint id)
 {
    return NULL;
 }
 
 static INLINE void
-_mesa_delete_ati_fragment_shader(GLcontext *ctx,
+_mesa_delete_ati_fragment_shader(struct gl_context *ctx,
                                  struct ati_fragment_shader *s)
 {
 }
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 753949be503..fb6fbe5b6db 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -69,16 +69,11 @@ struct gl_enable_attrib
    GLboolean Blend;
    GLbitfield ClipPlanes;
    GLboolean ColorMaterial;
-   GLboolean ColorTable[COLORTABLE_MAX];
-   GLboolean Convolution1D;
-   GLboolean Convolution2D;
-   GLboolean Separable2D;
    GLboolean CullFace;
    GLboolean DepthClamp;
    GLboolean DepthTest;
    GLboolean Dither;
    GLboolean Fog;
-   GLboolean Histogram;
    GLboolean Light[MAX_LIGHTS];
    GLboolean Lighting;
    GLboolean LineSmooth;
@@ -107,7 +102,6 @@ struct gl_enable_attrib
    GLboolean Map2Vertex4;
    GLboolean Map2Attrib[16];  /* GL_NV_vertex_program */
 
-   GLboolean MinMax;
    GLboolean Normalize;
    GLboolean PixelTexture;
    GLboolean PointSmooth;
@@ -262,12 +256,6 @@ _mesa_PushAttrib(GLbitfield mask)
       attr->Blend = ctx->Color.BlendEnabled;
       attr->ClipPlanes = ctx->Transform.ClipPlanesEnabled;
       attr->ColorMaterial = ctx->Light.ColorMaterialEnabled;
-      for (i = 0; i < COLORTABLE_MAX; i++) {
-         attr->ColorTable[i] = ctx->Pixel.ColorTableEnabled[i];
-      }
-      attr->Convolution1D = ctx->Pixel.Convolution1DEnabled;
-      attr->Convolution2D = ctx->Pixel.Convolution2DEnabled;
-      attr->Separable2D = ctx->Pixel.Separable2DEnabled;
       attr->CullFace = ctx->Polygon.CullFlag;
       attr->DepthClamp = ctx->Transform.DepthClamp;
       attr->DepthTest = ctx->Depth.Test;
@@ -279,8 +267,6 @@ _mesa_PushAttrib(GLbitfield mask)
       attr->Lighting = ctx->Light.Enabled;
       attr->LineSmooth = ctx->Line.SmoothFlag;
       attr->LineStipple = ctx->Line.StippleFlag;
-      attr->Histogram = ctx->Pixel.HistogramEnabled;
-      attr->MinMax = ctx->Pixel.MinMaxEnabled;
       attr->IndexLogicOp = ctx->Color.IndexLogicOpEnabled;
       attr->ColorLogicOp = ctx->Color.ColorLogicOpEnabled;
       attr->Map1Color4 = ctx->Eval.Map1Color4;
@@ -487,7 +473,7 @@ end:
 
 
 static void
-pop_enable_group(GLcontext *ctx, const struct gl_enable_attrib *enable)
+pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable)
 {
    const GLuint curTexUnitSave = ctx->Texture.CurrentUnit;
    GLuint i;
@@ -519,26 +505,11 @@ pop_enable_group(GLcontext *ctx, const struct gl_enable_attrib *enable)
 
    TEST_AND_UPDATE(ctx->Light.ColorMaterialEnabled, enable->ColorMaterial,
                    GL_COLOR_MATERIAL);
-   TEST_AND_UPDATE(ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION],
-                   enable->ColorTable[COLORTABLE_PRECONVOLUTION],
-                   GL_COLOR_TABLE);
-   TEST_AND_UPDATE(ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION],
-                   enable->ColorTable[COLORTABLE_POSTCONVOLUTION],
-                   GL_POST_CONVOLUTION_COLOR_TABLE);
-   TEST_AND_UPDATE(ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX],
-                   enable->ColorTable[COLORTABLE_POSTCOLORMATRIX],
-                   GL_POST_COLOR_MATRIX_COLOR_TABLE);
    TEST_AND_UPDATE(ctx->Polygon.CullFlag, enable->CullFace, GL_CULL_FACE);
    TEST_AND_UPDATE(ctx->Transform.DepthClamp, enable->DepthClamp,
 		   GL_DEPTH_CLAMP);
    TEST_AND_UPDATE(ctx->Depth.Test, enable->DepthTest, GL_DEPTH_TEST);
    TEST_AND_UPDATE(ctx->Color.DitherFlag, enable->Dither, GL_DITHER);
-   TEST_AND_UPDATE(ctx->Pixel.Convolution1DEnabled, enable->Convolution1D,
-                   GL_CONVOLUTION_1D);
-   TEST_AND_UPDATE(ctx->Pixel.Convolution2DEnabled, enable->Convolution2D,
-                   GL_CONVOLUTION_2D);
-   TEST_AND_UPDATE(ctx->Pixel.Separable2DEnabled, enable->Separable2D,
-                   GL_SEPARABLE_2D);
    TEST_AND_UPDATE(ctx->Fog.Enabled, enable->Fog, GL_FOG);
    TEST_AND_UPDATE(ctx->Light.Enabled, enable->Lighting, GL_LIGHTING);
    TEST_AND_UPDATE(ctx->Line.SmoothFlag, enable->LineSmooth, GL_LINE_SMOOTH);
@@ -698,7 +669,7 @@ pop_enable_group(GLcontext *ctx, const struct gl_enable_attrib *enable)
  * Pop/restore texture attribute/group state.
  */
 static void
-pop_texture_group(GLcontext *ctx, struct texture_state *texstate)
+pop_texture_group(struct gl_context *ctx, struct texture_state *texstate)
 {
    GLuint u;
 
@@ -1352,7 +1323,7 @@ adjust_buffer_object_ref_counts(struct gl_array_object *arrayObj, GLint step)
  * object refcounts.
  */
 static void
-copy_pixelstore(GLcontext *ctx,
+copy_pixelstore(struct gl_context *ctx,
                 struct gl_pixelstore_attrib *dst,
                 const struct gl_pixelstore_attrib *src)
 {
@@ -1535,7 +1506,7 @@ _mesa_init_attrib_dispatch(struct _glapi_table *disp)
  * Free any attribute state data that might be attached to the context.
  */
 void
-_mesa_free_attrib_data(GLcontext *ctx)
+_mesa_free_attrib_data(struct gl_context *ctx)
 {
    while (ctx->AttribStackDepth > 0) {
       struct gl_attrib_node *attr, *next;
@@ -1567,7 +1538,7 @@ _mesa_free_attrib_data(GLcontext *ctx)
 }
 
 
-void _mesa_init_attrib( GLcontext *ctx )
+void _mesa_init_attrib( struct gl_context *ctx )
 {
    /* Renderer and client attribute stacks */
    ctx->AttribStackDepth = 0;
diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h
index 83b28a65b77..777781bdf0d 100644
--- a/src/mesa/main/attrib.h
+++ b/src/mesa/main/attrib.h
@@ -70,9 +70,9 @@ _mesa_init_attrib_dispatch(struct _glapi_table *disp)
 #endif /* FEATURE_attrib_stack */
 
 extern void 
-_mesa_init_attrib( GLcontext *ctx );
+_mesa_init_attrib( struct gl_context *ctx );
 
 extern void 
-_mesa_free_attrib_data( GLcontext *ctx );
+_mesa_free_attrib_data( struct gl_context *ctx );
 
 #endif /* ATTRIB_H */
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index d022770f24c..ec778b7244d 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -207,7 +207,7 @@ _mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
 #if _HAVE_FULL_GL
 
 static GLboolean
-_mesa_validate_blend_equation( GLcontext *ctx,
+_mesa_validate_blend_equation( struct gl_context *ctx,
 			       GLenum mode, GLboolean is_separate )
 {
    switch (mode) {
@@ -215,8 +215,7 @@ _mesa_validate_blend_equation( GLcontext *ctx,
          break;
       case GL_MIN:
       case GL_MAX:
-         if (!ctx->Extensions.EXT_blend_minmax &&
-             !ctx->Extensions.ARB_imaging) {
+         if (!ctx->Extensions.EXT_blend_minmax) {
             return GL_FALSE;
          }
          break;
@@ -229,8 +228,7 @@ _mesa_validate_blend_equation( GLcontext *ctx,
          break;
       case GL_FUNC_SUBTRACT:
       case GL_FUNC_REVERSE_SUBTRACT:
-         if (!ctx->Extensions.EXT_blend_subtract &&
-             !ctx->Extensions.ARB_imaging) {
+         if (!ctx->Extensions.EXT_blend_subtract) {
             return GL_FALSE;
          }
          break;
@@ -591,9 +589,9 @@ _mesa_ClampColorARB(GLenum target, GLenum clamp)
  * \param ctx GL context.
  *
  * Initializes the related fields in the context color attribute group,
- * __GLcontextRec::Color.
+ * __struct gl_contextRec::Color.
  */
-void _mesa_init_color( GLcontext * ctx )
+void _mesa_init_color( struct gl_context * ctx )
 {
    /* Color buffer group */
    ctx->Color.IndexMask = ~0u;
diff --git a/src/mesa/main/blend.h b/src/mesa/main/blend.h
index b4fd7470ebe..677b01cc9fc 100644
--- a/src/mesa/main/blend.h
+++ b/src/mesa/main/blend.h
@@ -82,6 +82,6 @@ _mesa_ClampColorARB(GLenum target, GLenum clamp);
 
 
 extern void  
-_mesa_init_color( GLcontext * ctx );
+_mesa_init_color( struct gl_context * ctx );
 
 #endif
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 4797f29b4dc..0a68008a100 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -62,7 +62,7 @@
  *           specified context or \c NULL if \c target is invalid.
  */
 static INLINE struct gl_buffer_object **
-get_buffer_target(GLcontext *ctx, GLenum target)
+get_buffer_target(struct gl_context *ctx, GLenum target)
 {
    switch (target) {
    case GL_ARRAY_BUFFER_ARB:
@@ -74,15 +74,9 @@ get_buffer_target(GLcontext *ctx, GLenum target)
    case GL_PIXEL_UNPACK_BUFFER_EXT:
       return &ctx->Unpack.BufferObj;
    case GL_COPY_READ_BUFFER:
-      if (ctx->Extensions.ARB_copy_buffer) {
-         return &ctx->CopyReadBuffer;
-      }
-      break;
+      return &ctx->CopyReadBuffer;
    case GL_COPY_WRITE_BUFFER:
-      if (ctx->Extensions.ARB_copy_buffer) {
-         return &ctx->CopyWriteBuffer;
-      }
-      break;
+      return &ctx->CopyWriteBuffer;
 #if FEATURE_EXT_transform_feedback
    case GL_TRANSFORM_FEEDBACK_BUFFER:
       if (ctx->Extensions.EXT_transform_feedback) {
@@ -105,7 +99,7 @@ get_buffer_target(GLcontext *ctx, GLenum target)
  *           specified context or \c NULL if \c target is invalid.
  */
 static INLINE struct gl_buffer_object *
-get_buffer(GLcontext *ctx, GLenum target)
+get_buffer(struct gl_context *ctx, GLenum target)
 {
    struct gl_buffer_object **bufObj = get_buffer_target(ctx, target);
    if (bufObj)
@@ -149,7 +143,7 @@ simplified_access_mode(GLbitfield access)
  * \sa glBufferSubDataARB, glGetBufferSubDataARB
  */
 static struct gl_buffer_object *
-buffer_object_subdata_range_good( GLcontext * ctx, GLenum target, 
+buffer_object_subdata_range_good( struct gl_context * ctx, GLenum target, 
                                   GLintptrARB offset, GLsizeiptrARB size,
                                   const char *caller )
 {
@@ -195,7 +189,7 @@ buffer_object_subdata_range_good( GLcontext * ctx, GLenum target,
  * Default callback for the \c dd_function_table::NewBufferObject() hook.
  */
 static struct gl_buffer_object *
-_mesa_new_buffer_object( GLcontext *ctx, GLuint name, GLenum target )
+_mesa_new_buffer_object( struct gl_context *ctx, GLuint name, GLenum target )
 {
    struct gl_buffer_object *obj;
 
@@ -213,7 +207,7 @@ _mesa_new_buffer_object( GLcontext *ctx, GLuint name, GLenum target )
  * Default callback for the \c dd_function_table::DeleteBuffer() hook.
  */
 static void
-_mesa_delete_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj )
+_mesa_delete_buffer_object( struct gl_context *ctx, struct gl_buffer_object *bufObj )
 {
    (void) ctx;
 
@@ -234,7 +228,7 @@ _mesa_delete_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj )
  * Set ptr to bufObj w/ reference counting.
  */
 void
-_mesa_reference_buffer_object(GLcontext *ctx,
+_mesa_reference_buffer_object(struct gl_context *ctx,
                               struct gl_buffer_object **ptr,
                               struct gl_buffer_object *bufObj)
 {
@@ -334,7 +328,7 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
  * \sa glBufferDataARB, dd_function_table::BufferData.
  */
 static GLboolean
-_mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
+_mesa_buffer_data( struct gl_context *ctx, GLenum target, GLsizeiptrARB size,
 		   const GLvoid * data, GLenum usage,
 		   struct gl_buffer_object * bufObj )
 {
@@ -378,7 +372,7 @@ _mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
  * \sa glBufferSubDataARB, dd_function_table::BufferSubData.
  */
 static void
-_mesa_buffer_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
+_mesa_buffer_subdata( struct gl_context *ctx, GLenum target, GLintptrARB offset,
 		      GLsizeiptrARB size, const GLvoid * data,
 		      struct gl_buffer_object * bufObj )
 {
@@ -411,7 +405,7 @@ _mesa_buffer_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
  * \sa glBufferGetSubDataARB, dd_function_table::GetBufferSubData.
  */
 static void
-_mesa_buffer_get_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
+_mesa_buffer_get_subdata( struct gl_context *ctx, GLenum target, GLintptrARB offset,
 			  GLsizeiptrARB size, GLvoid * data,
 			  struct gl_buffer_object * bufObj )
 {
@@ -438,7 +432,7 @@ _mesa_buffer_get_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
  * \sa glMapBufferARB, dd_function_table::MapBuffer
  */
 static void *
-_mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
+_mesa_buffer_map( struct gl_context *ctx, GLenum target, GLenum access,
 		  struct gl_buffer_object *bufObj )
 {
    (void) ctx;
@@ -461,7 +455,7 @@ _mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
  * Called via glMapBufferRange().
  */
 static void *
-_mesa_buffer_map_range( GLcontext *ctx, GLenum target, GLintptr offset,
+_mesa_buffer_map_range( struct gl_context *ctx, GLenum target, GLintptr offset,
                         GLsizeiptr length, GLbitfield access,
                         struct gl_buffer_object *bufObj )
 {
@@ -482,7 +476,7 @@ _mesa_buffer_map_range( GLcontext *ctx, GLenum target, GLintptr offset,
  * Called via glFlushMappedBufferRange().
  */
 static void
-_mesa_buffer_flush_mapped_range( GLcontext *ctx, GLenum target, 
+_mesa_buffer_flush_mapped_range( struct gl_context *ctx, GLenum target, 
                                  GLintptr offset, GLsizeiptr length,
                                  struct gl_buffer_object *obj )
 {
@@ -503,7 +497,7 @@ _mesa_buffer_flush_mapped_range( GLcontext *ctx, GLenum target,
  * \sa glUnmapBufferARB, dd_function_table::UnmapBuffer
  */
 static GLboolean
-_mesa_buffer_unmap( GLcontext *ctx, GLenum target,
+_mesa_buffer_unmap( struct gl_context *ctx, GLenum target,
                     struct gl_buffer_object *bufObj )
 {
    (void) ctx;
@@ -522,7 +516,7 @@ _mesa_buffer_unmap( GLcontext *ctx, GLenum target,
  * Called via glCopyBuffserSubData().
  */
 static void
-_mesa_copy_buffer_subdata(GLcontext *ctx,
+_mesa_copy_buffer_subdata(struct gl_context *ctx,
                           struct gl_buffer_object *src,
                           struct gl_buffer_object *dst,
                           GLintptr readOffset, GLintptr writeOffset,
@@ -552,7 +546,7 @@ _mesa_copy_buffer_subdata(GLcontext *ctx,
  * Initialize the state associated with buffer objects
  */
 void
-_mesa_init_buffer_objects( GLcontext *ctx )
+_mesa_init_buffer_objects( struct gl_context *ctx )
 {
    _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj,
                                  ctx->Shared->NullBufferObj);
@@ -567,7 +561,7 @@ _mesa_init_buffer_objects( GLcontext *ctx )
 
 
 void
-_mesa_free_buffer_objects( GLcontext *ctx )
+_mesa_free_buffer_objects( struct gl_context *ctx )
 {
    _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj, NULL);
    _mesa_reference_buffer_object(ctx, &ctx->Array.ElementArrayBufferObj, NULL);
@@ -582,7 +576,7 @@ _mesa_free_buffer_objects( GLcontext *ctx )
  * Called by glBindBuffer() and other functions.
  */
 static void
-bind_buffer_object(GLcontext *ctx, GLenum target, GLuint buffer)
+bind_buffer_object(struct gl_context *ctx, GLenum target, GLuint buffer)
 {
    struct gl_buffer_object *oldBufObj;
    struct gl_buffer_object *newBufObj = NULL;
@@ -638,7 +632,7 @@ bind_buffer_object(GLcontext *ctx, GLenum target, GLuint buffer)
  * shared state.
  */
 void
-_mesa_update_default_objects_buffer_objects(GLcontext *ctx)
+_mesa_update_default_objects_buffer_objects(struct gl_context *ctx)
 {
    /* Bind the NullBufferObj to remove references to those
     * in the shared context hash table.
@@ -722,7 +716,7 @@ _mesa_validate_pbo_access(GLuint dimensions,
  * \return NULL if error, else pointer to start of data
  */
 const GLvoid *
-_mesa_map_pbo_source(GLcontext *ctx,
+_mesa_map_pbo_source(struct gl_context *ctx,
                      const struct gl_pixelstore_attrib *unpack,
                      const GLvoid *src)
 {
@@ -756,7 +750,7 @@ _mesa_map_pbo_source(GLcontext *ctx,
  * _mesa_unmap_pbo_source().
  */
 const GLvoid *
-_mesa_map_validate_pbo_source(GLcontext *ctx,
+_mesa_map_validate_pbo_source(struct gl_context *ctx,
                               GLuint dimensions,
                               const struct gl_pixelstore_attrib *unpack,
                               GLsizei width, GLsizei height, GLsizei depth,
@@ -792,7 +786,7 @@ _mesa_map_validate_pbo_source(GLcontext *ctx,
  * Counterpart to _mesa_map_pbo_source()
  */
 void
-_mesa_unmap_pbo_source(GLcontext *ctx,
+_mesa_unmap_pbo_source(struct gl_context *ctx,
                        const struct gl_pixelstore_attrib *unpack)
 {
    ASSERT(unpack != &ctx->Pack); /* catch pack/unpack mismatch */
@@ -812,7 +806,7 @@ _mesa_unmap_pbo_source(GLcontext *ctx,
  * \return NULL if error, else pointer to start of data
  */
 void *
-_mesa_map_pbo_dest(GLcontext *ctx,
+_mesa_map_pbo_dest(struct gl_context *ctx,
                    const struct gl_pixelstore_attrib *pack,
                    GLvoid *dest)
 {
@@ -846,7 +840,7 @@ _mesa_map_pbo_dest(GLcontext *ctx,
  * _mesa_unmap_pbo_dest().
  */
 GLvoid *
-_mesa_map_validate_pbo_dest(GLcontext *ctx,
+_mesa_map_validate_pbo_dest(struct gl_context *ctx,
                             GLuint dimensions,
                             const struct gl_pixelstore_attrib *unpack,
                             GLsizei width, GLsizei height, GLsizei depth,
@@ -882,7 +876,7 @@ _mesa_map_validate_pbo_dest(GLcontext *ctx,
  * Counterpart to _mesa_map_pbo_dest()
  */
 void
-_mesa_unmap_pbo_dest(GLcontext *ctx,
+_mesa_unmap_pbo_dest(struct gl_context *ctx,
                      const struct gl_pixelstore_attrib *pack)
 {
    ASSERT(pack != &ctx->Unpack); /* catch pack/unpack mismatch */
@@ -898,7 +892,7 @@ _mesa_unmap_pbo_dest(GLcontext *ctx,
  * Always return NULL for ID 0.
  */
 struct gl_buffer_object *
-_mesa_lookup_bufferobj(GLcontext *ctx, GLuint buffer)
+_mesa_lookup_bufferobj(struct gl_context *ctx, GLuint buffer)
 {
    if (buffer == 0)
       return NULL;
@@ -915,7 +909,7 @@ _mesa_lookup_bufferobj(GLcontext *ctx, GLuint buffer)
  * unbound from all arrays in the current context.
  */
 static void
-unbind(GLcontext *ctx,
+unbind(struct gl_context *ctx,
        struct gl_buffer_object **ptr,
        struct gl_buffer_object *obj)
 {
@@ -1760,7 +1754,7 @@ _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
 
 #if FEATURE_APPLE_object_purgeable
 static GLenum
-_mesa_BufferObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
+_mesa_BufferObjectPurgeable(struct gl_context *ctx, GLuint name, GLenum option)
 {
    struct gl_buffer_object *bufObj;
    GLenum retval;
@@ -1793,7 +1787,7 @@ _mesa_BufferObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
 
 
 static GLenum
-_mesa_RenderObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
+_mesa_RenderObjectPurgeable(struct gl_context *ctx, GLuint name, GLenum option)
 {
    struct gl_renderbuffer *bufObj;
    GLenum retval;
@@ -1822,7 +1816,7 @@ _mesa_RenderObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
 
 
 static GLenum
-_mesa_TextureObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
+_mesa_TextureObjectPurgeable(struct gl_context *ctx, GLuint name, GLenum option)
 {
    struct gl_texture_object *bufObj;
    GLenum retval;
@@ -1903,7 +1897,7 @@ _mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
 
 
 static GLenum
-_mesa_BufferObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
+_mesa_BufferObjectUnpurgeable(struct gl_context *ctx, GLuint name, GLenum option)
 {
    struct gl_buffer_object *bufObj;
    GLenum retval;
@@ -1933,7 +1927,7 @@ _mesa_BufferObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
 
 
 static GLenum
-_mesa_RenderObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
+_mesa_RenderObjectUnpurgeable(struct gl_context *ctx, GLuint name, GLenum option)
 {
    struct gl_renderbuffer *bufObj;
    GLenum retval;
@@ -1963,7 +1957,7 @@ _mesa_RenderObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
 
 
 static GLenum
-_mesa_TextureObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
+_mesa_TextureObjectUnpurgeable(struct gl_context *ctx, GLuint name, GLenum option)
 {
    struct gl_texture_object *bufObj;
    GLenum retval;
@@ -2033,7 +2027,7 @@ _mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
 
 
 static void
-_mesa_GetBufferObjectParameterivAPPLE(GLcontext *ctx, GLuint name,
+_mesa_GetBufferObjectParameterivAPPLE(struct gl_context *ctx, GLuint name,
                                       GLenum pname, GLint* params)
 {
    struct gl_buffer_object *bufObj;
@@ -2059,7 +2053,7 @@ _mesa_GetBufferObjectParameterivAPPLE(GLcontext *ctx, GLuint name,
 
 
 static void
-_mesa_GetRenderObjectParameterivAPPLE(GLcontext *ctx, GLuint name,
+_mesa_GetRenderObjectParameterivAPPLE(struct gl_context *ctx, GLuint name,
                                       GLenum pname, GLint* params)
 {
    struct gl_renderbuffer *bufObj;
@@ -2085,7 +2079,7 @@ _mesa_GetRenderObjectParameterivAPPLE(GLcontext *ctx, GLuint name,
 
 
 static void
-_mesa_GetTextureObjectParameterivAPPLE(GLcontext *ctx, GLuint name,
+_mesa_GetTextureObjectParameterivAPPLE(struct gl_context *ctx, GLuint name,
                                        GLenum pname, GLint* params)
 {
    struct gl_texture_object *bufObj;
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index f234d06c6cc..4b97e34767e 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -57,24 +57,24 @@ _mesa_is_bufferobj(const struct gl_buffer_object *obj)
 
 
 extern void
-_mesa_init_buffer_objects( GLcontext *ctx );
+_mesa_init_buffer_objects( struct gl_context *ctx );
 
 extern void
-_mesa_free_buffer_objects( GLcontext *ctx );
+_mesa_free_buffer_objects( struct gl_context *ctx );
 
 extern void
-_mesa_update_default_objects_buffer_objects(GLcontext *ctx);
+_mesa_update_default_objects_buffer_objects(struct gl_context *ctx);
 
 
 extern struct gl_buffer_object *
-_mesa_lookup_bufferobj(GLcontext *ctx, GLuint buffer);
+_mesa_lookup_bufferobj(struct gl_context *ctx, GLuint buffer);
 
 extern void
 _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
 				GLuint name, GLenum target );
 
 extern void
-_mesa_reference_buffer_object(GLcontext *ctx,
+_mesa_reference_buffer_object(struct gl_context *ctx,
                               struct gl_buffer_object **ptr,
                               struct gl_buffer_object *bufObj);
 
@@ -85,12 +85,12 @@ _mesa_validate_pbo_access(GLuint dimensions,
                           GLenum format, GLenum type, const GLvoid *ptr);
 
 extern const GLvoid *
-_mesa_map_pbo_source(GLcontext *ctx,
+_mesa_map_pbo_source(struct gl_context *ctx,
                      const struct gl_pixelstore_attrib *unpack,
                      const GLvoid *src);
 
 extern const GLvoid *
-_mesa_map_validate_pbo_source(GLcontext *ctx,
+_mesa_map_validate_pbo_source(struct gl_context *ctx,
                               GLuint dimensions,
                               const struct gl_pixelstore_attrib *unpack,
                               GLsizei width, GLsizei height, GLsizei depth,
@@ -98,16 +98,16 @@ _mesa_map_validate_pbo_source(GLcontext *ctx,
                               const char *where);
 
 extern void
-_mesa_unmap_pbo_source(GLcontext *ctx,
+_mesa_unmap_pbo_source(struct gl_context *ctx,
                        const struct gl_pixelstore_attrib *unpack);
 
 extern void *
-_mesa_map_pbo_dest(GLcontext *ctx,
+_mesa_map_pbo_dest(struct gl_context *ctx,
                    const struct gl_pixelstore_attrib *pack,
                    GLvoid *dest);
 
 extern GLvoid *
-_mesa_map_validate_pbo_dest(GLcontext *ctx,
+_mesa_map_validate_pbo_dest(struct gl_context *ctx,
                             GLuint dimensions,
                             const struct gl_pixelstore_attrib *unpack,
                             GLsizei width, GLsizei height, GLsizei depth,
@@ -115,7 +115,7 @@ _mesa_map_validate_pbo_dest(GLcontext *ctx,
                             const char *where);
 
 extern void
-_mesa_unmap_pbo_dest(GLcontext *ctx,
+_mesa_unmap_pbo_dest(struct gl_context *ctx,
                      const struct gl_pixelstore_attrib *pack);
 
 
diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index fb30b599609..86446311fe3 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -50,7 +50,7 @@
  * \return  bitmask of BUFFER_BIT_* flags
  */
 static GLbitfield
-supported_buffer_bitmask(const GLcontext *ctx, const struct gl_framebuffer *fb)
+supported_buffer_bitmask(const struct gl_context *ctx, const struct gl_framebuffer *fb)
 {
    GLbitfield mask = 0x0;
 
@@ -355,7 +355,7 @@ _mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers)
  *                  BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_BACK_LEFT).
  */
 void
-_mesa_drawbuffers(GLcontext *ctx, GLuint n, const GLenum *buffers,
+_mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,
                   const GLbitfield *destMask)
 {
    struct gl_framebuffer *fb = ctx->DrawBuffer;
@@ -452,7 +452,7 @@ _mesa_drawbuffers(GLcontext *ctx, GLuint n, const GLenum *buffers,
  * \param bufferIndex  the numerical index corresponding to 'buffer'
  */
 void
-_mesa_readbuffer(GLcontext *ctx, GLenum buffer, GLint bufferIndex)
+_mesa_readbuffer(struct gl_context *ctx, GLenum buffer, GLint bufferIndex)
 {
    struct gl_framebuffer *fb = ctx->ReadBuffer;
 
diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h
index 8a7e7b5c1f0..36d6c8b6608 100644
--- a/src/mesa/main/buffers.h
+++ b/src/mesa/main/buffers.h
@@ -43,11 +43,11 @@ extern void GLAPIENTRY
 _mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers);
 
 extern void
-_mesa_drawbuffers(GLcontext *ctx, GLuint n, const GLenum *buffers,
+_mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,
                   const GLbitfield *destMask);
 
 extern void
-_mesa_readbuffer(GLcontext *ctx, GLenum buffer, GLint bufferIndex);
+_mesa_readbuffer(struct gl_context *ctx, GLenum buffer, GLint bufferIndex);
 
 extern void GLAPIENTRY
 _mesa_ReadBuffer( GLenum mode );
diff --git a/src/mesa/main/clear.c b/src/mesa/main/clear.c
index 49d86b3b1f1..b011da04b46 100644
--- a/src/mesa/main/clear.c
+++ b/src/mesa/main/clear.c
@@ -100,7 +100,7 @@ _mesa_ClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )
  * 
  * \param mask bit-mask indicating the buffers to be cleared.
  *
- * Flushes the vertices and verifies the parameter. If __GLcontextRec::NewState
+ * Flushes the vertices and verifies the parameter. If __struct gl_contextRec::NewState
  * is set then calls _mesa_update_state() to update gl_frame_buffer::_Xmin,
  * etc. If the rasterization mode is set to GL_RENDER then requests the driver
  * to clear the buffers, via the dd_function_table::Clear callback.
@@ -191,7 +191,7 @@ _mesa_Clear( GLbitfield mask )
  * Return INVALID_MASK if the drawbuffer value is invalid.
  */
 static GLbitfield
-make_color_buffer_mask(GLcontext *ctx, GLint drawbuffer)
+make_color_buffer_mask(struct gl_context *ctx, GLint drawbuffer)
 {
    const struct gl_renderbuffer_attachment *att = ctx->DrawBuffer->Attachment;
    GLbitfield mask = 0x0;
diff --git a/src/mesa/main/clip.c b/src/mesa/main/clip.c
index 96c80e6ef8d..be8ce4278cd 100644
--- a/src/mesa/main/clip.c
+++ b/src/mesa/main/clip.c
@@ -114,46 +114,3 @@ _mesa_GetClipPlane( GLenum plane, GLdouble *equation )
    equation[2] = (GLdouble) ctx->Transform.EyeUserPlane[p][2];
    equation[3] = (GLdouble) ctx->Transform.EyeUserPlane[p][3];
 }
-
-void GLAPIENTRY 
-_mesa_CullParameterfvEXT (GLenum cap, GLfloat *v)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (cap) {
-   case GL_CULL_VERTEX_EYE_POSITION_EXT:
-      FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-      COPY_4FV(ctx->Transform.CullEyePos, v);
-      
-      _mesa_transform_vector( ctx->Transform.CullObjPos, 
-			      ctx->Transform.CullEyePos,
-			      ctx->ModelviewMatrixStack.Top->inv );
-      break;
-
-   case GL_CULL_VERTEX_OBJECT_POSITION_EXT:
-      FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-      COPY_4FV(ctx->Transform.CullObjPos, v);
-
-      _mesa_transform_vector( ctx->Transform.CullEyePos, 
-			      ctx->Transform.CullObjPos,
-			      ctx->ModelviewMatrixStack.Top->m );
-     break;
-   default:
-      _mesa_error( ctx, GL_INVALID_ENUM, "glCullParameterfvEXT" );
-   }
-}
-
-void GLAPIENTRY 
-_mesa_CullParameterdvEXT (GLenum cap, GLdouble *v)
-{
-   GLfloat f[4];
-   
-   f[0] = (GLfloat)v[0];
-   f[1] = (GLfloat)v[1];
-   f[2] = (GLfloat)v[2];
-   f[3] = (GLfloat)v[3];
-
-   _mesa_CullParameterfvEXT(cap, f);
-}
-
diff --git a/src/mesa/main/clip.h b/src/mesa/main/clip.h
index ac472d66e08..11431dcfce0 100644
--- a/src/mesa/main/clip.h
+++ b/src/mesa/main/clip.h
@@ -39,11 +39,4 @@ _mesa_ClipPlane( GLenum plane, const GLdouble *equation );
 extern void GLAPIENTRY 
 _mesa_GetClipPlane( GLenum plane, GLdouble *equation );
 
-extern void GLAPIENTRY 
-_mesa_CullParameterfvEXT (GLenum cap, GLfloat *v);
-
-extern void GLAPIENTRY 
-_mesa_CullParameterdvEXT (GLenum cap, GLdouble *v);
-
-
 #endif
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 52d5badf39c..6295dc88dee 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -176,7 +176,7 @@ set_component_sizes( struct gl_color_table *table )
  * \param [rgba]Bias - RGBA bias factors
  */
 static void
-store_colortable_entries(GLcontext *ctx, struct gl_color_table *table,
+store_colortable_entries(struct gl_context *ctx, struct gl_color_table *table,
 			 GLsizei start, GLsizei count,
 			 GLenum format, GLenum type, const GLvoid *data,
 			 GLfloat rScale, GLfloat rBias,
@@ -297,15 +297,6 @@ _mesa_ColorTable( GLenum target, GLenum internalFormat,
       case GL_SHARED_TEXTURE_PALETTE_EXT:
          table = &ctx->Texture.Palette;
          break;
-      case GL_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_PRECONVOLUTION];
-         scale = ctx->Pixel.ColorTableScale[COLORTABLE_PRECONVOLUTION];
-         bias = ctx->Pixel.ColorTableBias[COLORTABLE_PRECONVOLUTION];
-         break;
-      case GL_PROXY_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_PRECONVOLUTION];
-         proxy = GL_TRUE;
-         break;
       case GL_TEXTURE_COLOR_TABLE_SGI:
          if (!ctx->Extensions.SGI_texture_color_table) {
             _mesa_error(ctx, GL_INVALID_ENUM, "glColorTable(target)");
@@ -323,24 +314,6 @@ _mesa_ColorTable( GLenum target, GLenum internalFormat,
          table = &(texUnit->ProxyColorTable);
          proxy = GL_TRUE;
          break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCONVOLUTION];
-         scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCONVOLUTION];
-         bias = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCONVOLUTION];
-         break;
-      case GL_PROXY_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_POSTCONVOLUTION];
-         proxy = GL_TRUE;
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCOLORMATRIX];
-         scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCOLORMATRIX];
-         bias = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCOLORMATRIX];
-         break;
-      case GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_POSTCOLORMATRIX];
-         proxy = GL_TRUE;
-         break;
       default:
          /* try texture targets */
          {
@@ -459,11 +432,6 @@ _mesa_ColorSubTable( GLenum target, GLsizei start,
       case GL_SHARED_TEXTURE_PALETTE_EXT:
          table = &ctx->Texture.Palette;
          break;
-      case GL_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_PRECONVOLUTION];
-         scale = ctx->Pixel.ColorTableScale[COLORTABLE_PRECONVOLUTION];
-         bias = ctx->Pixel.ColorTableBias[COLORTABLE_PRECONVOLUTION];
-         break;
       case GL_TEXTURE_COLOR_TABLE_SGI:
          if (!ctx->Extensions.SGI_texture_color_table) {
             _mesa_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)");
@@ -473,16 +441,6 @@ _mesa_ColorSubTable( GLenum target, GLsizei start,
          scale = ctx->Pixel.TextureColorTableScale;
          bias = ctx->Pixel.TextureColorTableBias;
          break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCONVOLUTION];
-         scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCONVOLUTION];
-         bias = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCONVOLUTION];
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCOLORMATRIX];
-         scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCOLORMATRIX];
-         bias = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCOLORMATRIX];
-         break;
       default:
          /* try texture targets */
          texObj = _mesa_select_tex_object(ctx, texUnit, target);
@@ -590,9 +548,6 @@ _mesa_GetColorTable( GLenum target, GLenum format,
       case GL_SHARED_TEXTURE_PALETTE_EXT:
          table = &ctx->Texture.Palette;
          break;
-      case GL_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_PRECONVOLUTION];
-         break;
       case GL_TEXTURE_COLOR_TABLE_SGI:
          if (!ctx->Extensions.SGI_texture_color_table) {
             _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)");
@@ -600,12 +555,6 @@ _mesa_GetColorTable( GLenum target, GLenum format,
          }
          table = &(texUnit->ColorTable);
          break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCONVOLUTION];
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCOLORMATRIX];
-         break;
       default:
          /* try texture targets */
          {
@@ -714,22 +663,10 @@ _mesa_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params)
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
    switch (target) {
-   case GL_COLOR_TABLE_SGI:
-      scale = ctx->Pixel.ColorTableScale[COLORTABLE_PRECONVOLUTION];
-      bias  = ctx->Pixel.ColorTableBias[COLORTABLE_PRECONVOLUTION];
-      break;
    case GL_TEXTURE_COLOR_TABLE_SGI:
       scale = ctx->Pixel.TextureColorTableScale;
       bias  = ctx->Pixel.TextureColorTableBias;
       break;
-   case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
-      scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCONVOLUTION];
-      bias  = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCONVOLUTION];
-      break;
-   case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
-      scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCOLORMATRIX];
-      bias  = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCOLORMATRIX];
-      break;
    default:
       _mesa_error(ctx, GL_INVALID_ENUM, "glColorTableParameter(target)");
       return;
@@ -755,10 +692,7 @@ static void GLAPIENTRY
 _mesa_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
    GLfloat fparams[4];
-   if (pname == GL_COLOR_TABLE_SGI ||
-       pname == GL_TEXTURE_COLOR_TABLE_SGI ||
-       pname == GL_POST_CONVOLUTION_COLOR_TABLE_SGI ||
-       pname == GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI) {
+   if (pname == GL_TEXTURE_COLOR_TABLE_SGI) {
       /* four values */
       fparams[0] = (GLfloat) params[0];
       fparams[1] = (GLfloat) params[1];
@@ -786,20 +720,6 @@ _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
       case GL_SHARED_TEXTURE_PALETTE_EXT:
          table = &ctx->Texture.Palette;
          break;
-      case GL_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_PRECONVOLUTION];
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            COPY_4V(params, ctx->Pixel.ColorTableScale[COLORTABLE_PRECONVOLUTION]);
-            return;
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            COPY_4V(params, ctx->Pixel.ColorTableBias[COLORTABLE_PRECONVOLUTION]);
-            return;
-         }
-         break;
-      case GL_PROXY_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_PRECONVOLUTION];
-         break;
       case GL_TEXTURE_COLOR_TABLE_SGI:
          if (!ctx->Extensions.SGI_texture_color_table) {
             _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");
@@ -822,34 +742,6 @@ _mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params )
          }
          table = &(texUnit->ProxyColorTable);
          break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCONVOLUTION];
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            COPY_4V(params, ctx->Pixel.ColorTableScale[COLORTABLE_POSTCONVOLUTION]);
-            return;
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            COPY_4V(params, ctx->Pixel.ColorTableBias[COLORTABLE_POSTCONVOLUTION]);
-            return;
-         }
-         break;
-      case GL_PROXY_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_POSTCONVOLUTION];
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCOLORMATRIX];
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            COPY_4V(params, ctx->Pixel.ColorTableScale[COLORTABLE_POSTCOLORMATRIX]);
-            return;
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            COPY_4V(params, ctx->Pixel.ColorTableBias[COLORTABLE_POSTCOLORMATRIX]);
-            return;
-         }
-         break;
-      case GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_POSTCOLORMATRIX];
-         break;
       default:
          /* try texture targets */
          {
@@ -913,28 +805,6 @@ _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )
       case GL_SHARED_TEXTURE_PALETTE_EXT:
          table = &ctx->Texture.Palette;
          break;
-      case GL_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_PRECONVOLUTION];
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            GLfloat *scale = ctx->Pixel.ColorTableScale[COLORTABLE_PRECONVOLUTION];
-            params[0] = (GLint) scale[0];
-            params[1] = (GLint) scale[1];
-            params[2] = (GLint) scale[2];
-            params[3] = (GLint) scale[3];
-            return;
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            GLfloat *bias = ctx->Pixel.ColorTableBias[COLORTABLE_PRECONVOLUTION];
-            params[0] = (GLint) bias[0];
-            params[1] = (GLint) bias[1];
-            params[2] = (GLint) bias[2];
-            params[3] = (GLint) bias[3];
-            return;
-         }
-         break;
-      case GL_PROXY_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_PRECONVOLUTION];
-         break;
       case GL_TEXTURE_COLOR_TABLE_SGI:
          if (!ctx->Extensions.SGI_texture_color_table) {
             _mesa_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)");
@@ -963,50 +833,6 @@ _mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params )
          }
          table = &(texUnit->ProxyColorTable);
          break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCONVOLUTION];
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            GLfloat *scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCONVOLUTION];
-            params[0] = (GLint) scale[0];
-            params[1] = (GLint) scale[1];
-            params[2] = (GLint) scale[2];
-            params[3] = (GLint) scale[3];
-            return;
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            GLfloat *bias = ctx->Pixel.ColorTableBias[COLORTABLE_POSTCONVOLUTION];
-            params[0] = (GLint) bias[0];
-            params[1] = (GLint) bias[1];
-            params[2] = (GLint) bias[2];
-            params[3] = (GLint) bias[3];
-            return;
-         }
-         break;
-      case GL_PROXY_POST_CONVOLUTION_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_POSTCONVOLUTION];
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ColorTable[COLORTABLE_POSTCOLORMATRIX];
-         if (pname == GL_COLOR_TABLE_SCALE_SGI) {
-            GLfloat *scale = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCOLORMATRIX];
-            params[0] = (GLint) scale[0];
-            params[0] = (GLint) scale[1];
-            params[0] = (GLint) scale[2];
-            params[0] = (GLint) scale[3];
-            return;
-         }
-         else if (pname == GL_COLOR_TABLE_BIAS_SGI) {
-            GLfloat *bias = ctx->Pixel.ColorTableScale[COLORTABLE_POSTCOLORMATRIX];
-            params[0] = (GLint) bias[0];
-            params[1] = (GLint) bias[1];
-            params[2] = (GLint) bias[2];
-            params[3] = (GLint) bias[3];
-            return;
-         }
-         break;
-      case GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE:
-         table = &ctx->ProxyColorTable[COLORTABLE_POSTCOLORMATRIX];
-         break;
       default:
          /* Try texture targets */
          {
@@ -1103,31 +929,3 @@ _mesa_free_colortable_data( struct gl_color_table *p )
       p->TableUB = NULL;
    }
 }
-
-
-/*
- * Initialize all colortables for a context.
- */
-void
-_mesa_init_colortables( GLcontext * ctx )
-{
-   GLuint i;
-   for (i = 0; i < COLORTABLE_MAX; i++) {
-      _mesa_init_colortable(&ctx->ColorTable[i]);
-      _mesa_init_colortable(&ctx->ProxyColorTable[i]);
-   }
-}
-
-
-/*
- * Free all colortable data for a context
- */
-void
-_mesa_free_colortables_data( GLcontext *ctx )
-{
-   GLuint i;
-   for (i = 0; i < COLORTABLE_MAX; i++) {
-      _mesa_free_colortable_data(&ctx->ColorTable[i]);
-      _mesa_free_colortable_data(&ctx->ProxyColorTable[i]);
-   }
-}
diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h
index 303c9fb3024..ea3ec870fd4 100644
--- a/src/mesa/main/colortab.h
+++ b/src/mesa/main/colortab.h
@@ -78,11 +78,4 @@ _mesa_init_colortable( struct gl_color_table *table );
 extern void
 _mesa_free_colortable_data( struct gl_color_table *table );
 
-extern void 
-_mesa_init_colortables( GLcontext *ctx );
-
-extern void 
-_mesa_free_colortables_data( GLcontext *ctx );
-
-
 #endif /* COLORTAB_H */
diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c
index 8d9a91d5478..25b3dd678dc 100644
--- a/src/mesa/main/condrender.c
+++ b/src/mesa/main/condrender.c
@@ -117,7 +117,7 @@ _mesa_EndConditionalRender(void)
  * \return GL_TRUE if we should render, GL_FALSE if we should discard
  */
 GLboolean
-_mesa_check_conditional_render(GLcontext *ctx)
+_mesa_check_conditional_render(struct gl_context *ctx)
 {
    struct gl_query_object *q = ctx->Query.CondRenderQuery;
 
diff --git a/src/mesa/main/condrender.h b/src/mesa/main/condrender.h
index d55e9805fe9..cf6d4ca2893 100644
--- a/src/mesa/main/condrender.h
+++ b/src/mesa/main/condrender.h
@@ -39,7 +39,7 @@ extern void APIENTRY
 _mesa_EndConditionalRender(void);
 
 extern GLboolean
-_mesa_check_conditional_render(GLcontext *ctx);
+_mesa_check_conditional_render(struct gl_context *ctx);
 
 
 #endif /* CONDRENDER_H */
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index b1f800f4c21..1625e4c5019 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -86,7 +86,6 @@
 #include "blend.h"
 #include "buffers.h"
 #include "bufferobj.h"
-#include "colortab.h"
 #include "context.h"
 #include "cpuinfo.h"
 #include "debug.h"
@@ -98,7 +97,6 @@
 #include "feedback.h"
 #include "fog.h"
 #include "framebuffer.h"
-#include "histogram.h"
 #include "hint.h"
 #include "hash.h"
 #include "light.h"
@@ -139,7 +137,7 @@
 #endif
 
 #include "glsl_parser_extras.h"
-
+#include <stdbool.h>
 
 
 #ifndef MESA_VERBOSE
@@ -165,7 +163,7 @@ GLfloat _mesa_ubyte_to_float_color_tab[256];
  * We have to finish any pending rendering.
  */
 void
-_mesa_notifySwapBuffers(__GLcontext *ctx)
+_mesa_notifySwapBuffers(struct gl_context *ctx)
 {
    if (MESA_VERBOSE & VERBOSE_SWAPBUFFERS)
       _mesa_debug(ctx, "SwapBuffers\n");
@@ -182,7 +180,7 @@ _mesa_notifySwapBuffers(__GLcontext *ctx)
 /*@{*/
 
 /**
- * Allocates a GLvisual structure and initializes it via
+ * Allocates a struct gl_config structure and initializes it via
  * _mesa_initialize_visual().
  * 
  * \param dbFlag double buffering
@@ -200,12 +198,12 @@ _mesa_notifySwapBuffers(__GLcontext *ctx)
  * \param alphaBits same as above.
  * \param numSamples not really used.
  * 
- * \return pointer to new GLvisual or NULL if requested parameters can't be
+ * \return pointer to new struct gl_config or NULL if requested parameters can't be
  * met.
  *
  * \note Need to add params for level and numAuxBuffers (at least)
  */
-GLvisual *
+struct gl_config *
 _mesa_create_visual( GLboolean dbFlag,
                      GLboolean stereoFlag,
                      GLint redBits,
@@ -220,7 +218,7 @@ _mesa_create_visual( GLboolean dbFlag,
                      GLint accumAlphaBits,
                      GLint numSamples )
 {
-   GLvisual *vis = (GLvisual *) calloc(1, sizeof(GLvisual));
+   struct gl_config *vis = (struct gl_config *) calloc(1, sizeof(struct gl_config));
    if (vis) {
       if (!_mesa_initialize_visual(vis, dbFlag, stereoFlag,
                                    redBits, greenBits, blueBits, alphaBits,
@@ -237,15 +235,15 @@ _mesa_create_visual( GLboolean dbFlag,
 
 /**
  * Makes some sanity checks and fills in the fields of the
- * GLvisual object with the given parameters.  If the caller needs
- * to set additional fields, he should just probably init the whole GLvisual
+ * struct gl_config object with the given parameters.  If the caller needs
+ * to set additional fields, he should just probably init the whole struct gl_config
  * object himself.
  * \return GL_TRUE on success, or GL_FALSE on failure.
  *
  * \sa _mesa_create_visual() above for the parameter description.
  */
 GLboolean
-_mesa_initialize_visual( GLvisual *vis,
+_mesa_initialize_visual( struct gl_config *vis,
                          GLboolean dbFlag,
                          GLboolean stereoFlag,
                          GLint redBits,
@@ -298,7 +296,6 @@ _mesa_initialize_visual( GLvisual *vis,
 
    vis->numAuxBuffers = 0;
    vis->level = 0;
-   vis->pixmapMode = 0;
    vis->sampleBuffers = numSamples > 0 ? 1 : 0;
    vis->samples = numSamples;
 
@@ -314,7 +311,7 @@ _mesa_initialize_visual( GLvisual *vis,
  * Frees the visual structure.
  */
 void
-_mesa_destroy_visual( GLvisual *vis )
+_mesa_destroy_visual( struct gl_config *vis )
 {
    free(vis);
 }
@@ -342,7 +339,6 @@ static void
 dummy_enum_func(void)
 {
    gl_buffer_index bi = BUFFER_FRONT_LEFT;
-   gl_colortable_index ci = COLORTABLE_PRECONVOLUTION;
    gl_face_index fi = FACE_POS_X;
    gl_frag_attrib fa = FRAG_ATTRIB_WPOS;
    gl_frag_result fr = FRAG_RESULT_DEPTH;
@@ -353,7 +349,6 @@ dummy_enum_func(void)
    gl_geom_result gr = GEOM_RESULT_POS;
 
    (void) bi;
-   (void) ci;
    (void) fi;
    (void) fa;
    (void) fr;
@@ -382,7 +377,7 @@ _glthread_DECLARE_STATIC_MUTEX(OneTimeLock);
  * \sa _math_init().
  */
 static void
-one_time_init( GLcontext *ctx )
+one_time_init( struct gl_context *ctx )
 {
    static GLboolean alreadyCalled = GL_FALSE;
    (void) ctx;
@@ -449,7 +444,7 @@ one_time_init( GLcontext *ctx )
  * Initialize fields of gl_current_attrib (aka ctx->Current.*)
  */
 static void
-_mesa_init_current(GLcontext *ctx)
+_mesa_init_current(struct gl_context *ctx)
 {
    GLuint i;
 
@@ -531,7 +526,7 @@ init_program_limits(GLenum type, struct gl_program_constants *prog)
  * some of these values (such as number of texture units).
  */
 static void 
-_mesa_init_constants(GLcontext *ctx)
+_mesa_init_constants(struct gl_context *ctx)
 {
    assert(ctx);
 
@@ -560,8 +555,6 @@ _mesa_init_constants(GLcontext *ctx)
    ctx->Const.MaxLineWidthAA = MAX_LINE_WIDTH;
    ctx->Const.LineWidthGranularity = (GLfloat) LINE_WIDTH_GRANULARITY;
    ctx->Const.MaxColorTableSize = MAX_COLOR_TABLE_SIZE;
-   ctx->Const.MaxConvolutionWidth = MAX_CONVOLUTION_WIDTH;
-   ctx->Const.MaxConvolutionHeight = MAX_CONVOLUTION_HEIGHT;
    ctx->Const.MaxClipPlanes = MAX_CLIP_PLANES;
    ctx->Const.MaxLights = MAX_LIGHTS;
    ctx->Const.MaxShininess = 128.0;
@@ -597,6 +590,21 @@ _mesa_init_constants(GLcontext *ctx)
    ctx->Const.MaxVarying = MAX_VARYING;
 #endif
 
+   /* Shading language version */
+   if (ctx->API == API_OPENGL) {
+#if FEATURE_ARB_shading_language_120
+      ctx->Const.GLSLVersion = 120;
+#else
+      ctx->Const.GLSLVersion = 110;
+#endif
+   }
+   else if (ctx->API == API_OPENGLES2) {
+      ctx->Const.GLSLVersion = 100;
+   }
+   else if (ctx->API == API_OPENGLES) {
+      ctx->Const.GLSLVersion = 0; /* GLSL not supported */
+   }
+
    /* GL_ARB_framebuffer_object */
    ctx->Const.MaxSamples = 0;
 
@@ -624,7 +632,7 @@ _mesa_init_constants(GLcontext *ctx)
  * Only called the first time a context is bound.
  */
 static void
-check_context_limits(GLcontext *ctx)
+check_context_limits(struct gl_context *ctx)
 {
    /* check that we don't exceed the size of various bitfields */
    assert(VERT_RESULT_MAX <=
@@ -699,7 +707,7 @@ check_context_limits(GLcontext *ctx)
  * functions for the more complex data structures.
  */
 static GLboolean
-init_attrib_groups(GLcontext *ctx)
+init_attrib_groups(struct gl_context *ctx)
 {
    assert(ctx);
 
@@ -714,7 +722,6 @@ init_attrib_groups(GLcontext *ctx)
    _mesa_init_attrib( ctx );
    _mesa_init_buffer_objects( ctx );
    _mesa_init_color( ctx );
-   _mesa_init_colortables( ctx );
    _mesa_init_current( ctx );
    _mesa_init_depth( ctx );
    _mesa_init_debug( ctx );
@@ -723,7 +730,6 @@ init_attrib_groups(GLcontext *ctx)
    _mesa_init_fbobjects( ctx );
    _mesa_init_feedback( ctx );
    _mesa_init_fog( ctx );
-   _mesa_init_histogram( ctx );
    _mesa_init_hint( ctx );
    _mesa_init_line( ctx );
    _mesa_init_lighting( ctx );
@@ -769,7 +775,7 @@ init_attrib_groups(GLcontext *ctx)
  * state.
  */
 static GLboolean
-update_default_objects(GLcontext *ctx)
+update_default_objects(struct gl_context *ctx)
 {
    assert(ctx);
 
@@ -821,7 +827,7 @@ _mesa_alloc_dispatch_table(int size)
 
 
 /**
- * Initialize a GLcontext struct (rendering context).
+ * Initialize a struct gl_context struct (rendering context).
  *
  * This includes allocating all the other structs and arrays which hang off of
  * the context by pointers.
@@ -848,10 +854,10 @@ _mesa_alloc_dispatch_table(int size)
  * \param driverContext pointer to driver-specific context data
  */
 GLboolean
-_mesa_initialize_context_for_api(GLcontext *ctx,
+_mesa_initialize_context_for_api(struct gl_context *ctx,
 				 gl_api api,
-				 const GLvisual *visual,
-				 GLcontext *share_list,
+				 const struct gl_config *visual,
+				 struct gl_context *share_list,
 				 const struct dd_function_table *driverFunctions,
 				 void *driverContext)
 {
@@ -943,11 +949,6 @@ _mesa_initialize_context_for_api(GLcontext *ctx,
 
    switch (ctx->API) {
    case API_OPENGL:
-      /* Neutral tnl module stuff */
-      _mesa_init_exec_vtxfmt( ctx ); 
-      ctx->TnlModule.Current = NULL;
-      ctx->TnlModule.SwapCount = 0;
-
 #if FEATURE_dlist
       ctx->Save = _mesa_create_save_table();
       if (!ctx->Save) {
@@ -987,9 +988,9 @@ _mesa_initialize_context_for_api(GLcontext *ctx,
 }
 
 GLboolean
-_mesa_initialize_context(GLcontext *ctx,
-                         const GLvisual *visual,
-                         GLcontext *share_list,
+_mesa_initialize_context(struct gl_context *ctx,
+                         const struct gl_config *visual,
+                         struct gl_context *share_list,
                          const struct dd_function_table *driverFunctions,
                          void *driverContext)
 {
@@ -1002,33 +1003,33 @@ _mesa_initialize_context(GLcontext *ctx,
 }
 
 /**
- * Allocate and initialize a GLcontext structure.
+ * Allocate and initialize a struct gl_context structure.
  * Note that the driver needs to pass in its dd_function_table here since
  * we need to at least call driverFunctions->NewTextureObject to initialize
  * the rendering context.
  *
  * \param api the GL API type to create the context for
- * \param visual a GLvisual pointer (we copy the struct contents)
+ * \param visual a struct gl_config pointer (we copy the struct contents)
  * \param share_list another context to share display lists with or NULL
  * \param driverFunctions points to the dd_function_table into which the
  *        driver has plugged in all its special functions.
  * \param driverContext points to the device driver's private context state
  * 
- * \return pointer to a new __GLcontextRec or NULL if error.
+ * \return pointer to a new __struct gl_contextRec or NULL if error.
  */
-GLcontext *
+struct gl_context *
 _mesa_create_context_for_api(gl_api api,
-			     const GLvisual *visual,
-			     GLcontext *share_list,
+			     const struct gl_config *visual,
+			     struct gl_context *share_list,
 			     const struct dd_function_table *driverFunctions,
 			     void *driverContext)
 {
-   GLcontext *ctx;
+   struct gl_context *ctx;
 
    ASSERT(visual);
    /*ASSERT(driverContext);*/
 
-   ctx = (GLcontext *) calloc(1, sizeof(GLcontext));
+   ctx = (struct gl_context *) calloc(1, sizeof(struct gl_context));
    if (!ctx)
       return NULL;
 
@@ -1042,9 +1043,9 @@ _mesa_create_context_for_api(gl_api api,
    }
 }
 
-GLcontext *
-_mesa_create_context(const GLvisual *visual,
-		     GLcontext *share_list,
+struct gl_context *
+_mesa_create_context(const struct gl_config *visual,
+		     struct gl_context *share_list,
 		     const struct dd_function_table *driverFunctions,
 		     void *driverContext)
 {
@@ -1057,12 +1058,12 @@ _mesa_create_context(const GLvisual *visual,
 /**
  * Free the data associated with the given context.
  * 
- * But doesn't free the GLcontext struct itself.
+ * But doesn't free the struct gl_context struct itself.
  *
  * \sa _mesa_initialize_context() and init_attrib_groups().
  */
 void
-_mesa_free_context_data( GLcontext *ctx )
+_mesa_free_context_data( struct gl_context *ctx )
 {
    if (!_mesa_get_current_context()){
       /* No current context, but we may need one in order to delete
@@ -1092,7 +1093,6 @@ _mesa_free_context_data( GLcontext *ctx )
    _mesa_free_texture_data( ctx );
    _mesa_free_matrix_data( ctx );
    _mesa_free_viewport_data( ctx );
-   _mesa_free_colortables_data( ctx );
    _mesa_free_program_data(ctx);
    _mesa_free_shader_state(ctx);
    _mesa_free_queryobj_data(ctx);
@@ -1137,14 +1137,14 @@ _mesa_free_context_data( GLcontext *ctx )
 
 
 /**
- * Destroy a GLcontext structure.
+ * Destroy a struct gl_context structure.
  *
  * \param ctx GL context.
  * 
- * Calls _mesa_free_context_data() and frees the GLcontext structure itself.
+ * Calls _mesa_free_context_data() and frees the struct gl_context structure itself.
  */
 void
-_mesa_destroy_context( GLcontext *ctx )
+_mesa_destroy_context( struct gl_context *ctx )
 {
    if (ctx) {
       _mesa_free_context_data(ctx);
@@ -1167,7 +1167,7 @@ _mesa_destroy_context( GLcontext *ctx )
  * structures.
  */
 void
-_mesa_copy_context( const GLcontext *src, GLcontext *dst, GLuint mask )
+_mesa_copy_context( const struct gl_context *src, struct gl_context *dst, GLuint mask )
 {
    if (mask & GL_ACCUM_BUFFER_BIT) {
       /* OK to memcpy */
@@ -1286,10 +1286,10 @@ _mesa_copy_context( const GLcontext *src, GLcontext *dst, GLuint mask )
  * \return GL_TRUE if compatible, GL_FALSE otherwise.
  */
 static GLboolean 
-check_compatible(const GLcontext *ctx, const GLframebuffer *buffer)
+check_compatible(const struct gl_context *ctx, const struct gl_framebuffer *buffer)
 {
-   const GLvisual *ctxvis = &ctx->Visual;
-   const GLvisual *bufvis = &buffer->Visual;
+   const struct gl_config *ctxvis = &ctx->Visual;
+   const struct gl_config *bufvis = &buffer->Visual;
 
    if (ctxvis == bufvis)
       return GL_TRUE;
@@ -1335,7 +1335,7 @@ check_compatible(const GLcontext *ctx, const GLframebuffer *buffer)
  * Really, the device driver should totally take care of this.
  */
 static void
-initialize_framebuffer_size(GLcontext *ctx, GLframebuffer *fb)
+initialize_framebuffer_size(struct gl_context *ctx, struct gl_framebuffer *fb)
 {
    GLuint width, height;
    if (ctx->Driver.GetBufferSize) {
@@ -1352,7 +1352,7 @@ initialize_framebuffer_size(GLcontext *ctx, GLframebuffer *fb)
  * Initialize the size if the given width and height are non-zero.
  */
 void
-_mesa_check_init_viewport(GLcontext *ctx, GLuint width, GLuint height)
+_mesa_check_init_viewport(struct gl_context *ctx, GLuint width, GLuint height)
 {
    if (!ctx->ViewportInitialized && width > 0 && height > 0) {
       /* Note: set flag here, before calling _mesa_set_viewport(), to prevent
@@ -1380,8 +1380,8 @@ _mesa_check_init_viewport(GLcontext *ctx, GLuint width, GLuint height)
  * \param readBuffer  the reading framebuffer
  */
 GLboolean
-_mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
-                    GLframebuffer *readBuffer )
+_mesa_make_current( struct gl_context *newCtx, struct gl_framebuffer *drawBuffer,
+                    struct gl_framebuffer *readBuffer )
 {
    if (MESA_VERBOSE & VERBOSE_API)
       _mesa_debug(newCtx, "_mesa_make_current()\n");
@@ -1519,7 +1519,7 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
  * be deleted if nobody else is sharing them.
  */
 GLboolean
-_mesa_share_state(GLcontext *ctx, GLcontext *ctxToShare)
+_mesa_share_state(struct gl_context *ctx, struct gl_context *ctxToShare)
 {
    if (ctx && ctxToShare && ctx->Shared && ctxToShare->Shared) {
       struct gl_shared_state *oldSharedState = ctx->Shared;
@@ -1550,10 +1550,10 @@ _mesa_share_state(GLcontext *ctx, GLcontext *ctxToShare)
  * context.  If you need speed, see the #GET_CURRENT_CONTEXT macro in
  * context.h.
  */
-GLcontext *
+struct gl_context *
 _mesa_get_current_context( void )
 {
-   return (GLcontext *) _glapi_get_context();
+   return (struct gl_context *) _glapi_get_context();
 }
 
 
@@ -1567,10 +1567,10 @@ _mesa_get_current_context( void )
  *
  * \return pointer to dispatch_table.
  *
- * Simply returns __GLcontextRec::CurrentDispatch.
+ * Simply returns __struct gl_contextRec::CurrentDispatch.
  */
 struct _glapi_table *
-_mesa_get_dispatch(GLcontext *ctx)
+_mesa_get_dispatch(struct gl_context *ctx)
 {
    return ctx->CurrentDispatch;
 }
@@ -1596,7 +1596,7 @@ _mesa_get_dispatch(GLcontext *ctx)
  * This is called via _mesa_error().
  */
 void
-_mesa_record_error(GLcontext *ctx, GLenum error)
+_mesa_record_error(struct gl_context *ctx, GLenum error)
 {
    if (!ctx)
       return;
@@ -1616,7 +1616,7 @@ _mesa_record_error(GLcontext *ctx, GLenum error)
  * Flush commands and wait for completion.
  */
 void
-_mesa_finish(GLcontext *ctx)
+_mesa_finish(struct gl_context *ctx)
 {
    FLUSH_CURRENT( ctx, 0 );
    if (ctx->Driver.Finish) {
@@ -1629,7 +1629,7 @@ _mesa_finish(GLcontext *ctx)
  * Flush commands.
  */
 void
-_mesa_flush(GLcontext *ctx)
+_mesa_flush(struct gl_context *ctx)
 {
    FLUSH_CURRENT( ctx, 0 );
    if (ctx->Driver.Flush) {
@@ -1675,7 +1675,7 @@ _mesa_Flush(void)
  * Otherwise we default to MUL/MAD.
  */
 void
-_mesa_set_mvp_with_dp4( GLcontext *ctx,
+_mesa_set_mvp_with_dp4( struct gl_context *ctx,
                         GLboolean flag )
 {
    ctx->mvp_with_dp4 = flag;
@@ -1691,15 +1691,21 @@ _mesa_set_mvp_with_dp4( GLcontext *ctx,
  * \return GL_TRUE if OK to render, GL_FALSE if not
  */
 GLboolean
-_mesa_valid_to_render(GLcontext *ctx, const char *where)
+_mesa_valid_to_render(struct gl_context *ctx, const char *where)
 {
+   bool vert_from_glsl_shader = false;
+   bool geom_from_glsl_shader = false;
+   bool frag_from_glsl_shader = false;
+
    /* This depends on having up to date derived state (shaders) */
    if (ctx->NewState)
       _mesa_update_state(ctx);
 
    if (ctx->Shader.CurrentProgram) {
+      struct gl_shader_program *const prog = ctx->Shader.CurrentProgram;
+
       /* using shaders */
-      if (!ctx->Shader.CurrentProgram->LinkStatus) {
+      if (!prog->LinkStatus) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "%s(shader not linked)", where);
          return GL_FALSE;
@@ -1707,25 +1713,46 @@ _mesa_valid_to_render(GLcontext *ctx, const char *where)
 #if 0 /* not normally enabled */
       {
          char errMsg[100];
-         if (!_mesa_validate_shader_program(ctx, ctx->Shader.CurrentProgram,
-                                            errMsg)) {
+         if (!_mesa_validate_shader_program(ctx, prog, errMsg)) {
             _mesa_warning(ctx, "Shader program %u is invalid: %s",
-                          ctx->Shader.CurrentProgram->Name, errMsg);
+                          prog->Name, errMsg);
          }
       }
 #endif
+
+      /* Figure out which shader stages are provided by the GLSL program.  For
+       * any stages that are not provided, the corresponding assembly shader
+       * target will be validated below.
+       */
+      vert_from_glsl_shader =
+	 prog->_LinkedShaders[MESA_SHADER_VERTEX] != NULL;
+      geom_from_glsl_shader =
+	 prog->_LinkedShaders[MESA_SHADER_GEOMETRY] != NULL;
+      frag_from_glsl_shader =
+	 prog->_LinkedShaders[MESA_SHADER_FRAGMENT] != NULL;
    }
-   else {
-      if (ctx->VertexProgram.Enabled && !ctx->VertexProgram._Enabled) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "%s(vertex program not valid)", where);
-         return GL_FALSE;
-      }
-      if (ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "%s(fragment program not valid)", where);
-         return GL_FALSE;
-      }
+
+
+   /* Any shader stages that are not supplied by the GLSL shader and have
+    * assembly shaders enabled must now be validated.
+    */
+   if (!vert_from_glsl_shader
+       && ctx->VertexProgram.Enabled && !ctx->VertexProgram._Enabled) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+		  "%s(vertex program not valid)", where);
+      return GL_FALSE;
+   }
+
+   /* FINISHME: If GL_NV_geometry_program4 is ever supported, the current
+    * FINISHME: geometry program should validated here.
+    */
+   (void) geom_from_glsl_shader;
+
+   if (!frag_from_glsl_shader
+       && ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+		  "%s(fragment program not valid)", where);
+      return GL_FALSE;
    }
 
    if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index c61da62826f..42d98a33a8d 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -29,16 +29,16 @@
  *
  * There are three large Mesa data types/classes which are meant to be
  * used by device drivers:
- * - GLcontext: this contains the Mesa rendering state
- * - GLvisual:  this describes the color buffer (RGB vs. ci), whether or not
+ * - struct gl_context: this contains the Mesa rendering state
+ * - struct gl_config:  this describes the color buffer (RGB vs. ci), whether or not
  *   there's a depth buffer, stencil buffer, etc.
- * - GLframebuffer:  contains pointers to the depth buffer, stencil buffer,
+ * - struct gl_framebuffer:  contains pointers to the depth buffer, stencil buffer,
  *   accum buffer and alpha buffers.
  *
  * These types should be encapsulated by corresponding device driver
  * data types.  See xmesa.h and xmesaP.h for an example.
  *
- * In OOP terms, GLcontext, GLvisual, and GLframebuffer are base classes
+ * In OOP terms, struct gl_context, struct gl_config, and struct gl_framebuffer are base classes
  * which the device driver must derive from.
  *
  * The following functions create and destroy these data types.
@@ -59,7 +59,7 @@ struct _glapi_table;
 /** \name Visual-related functions */
 /*@{*/
  
-extern GLvisual *
+extern struct gl_config *
 _mesa_create_visual( GLboolean dbFlag,
                      GLboolean stereoFlag,
                      GLint redBits,
@@ -75,7 +75,7 @@ _mesa_create_visual( GLboolean dbFlag,
                      GLint numSamples );
 
 extern GLboolean
-_mesa_initialize_visual( GLvisual *v,
+_mesa_initialize_visual( struct gl_config *v,
                          GLboolean dbFlag,
                          GLboolean stereoFlag,
                          GLint redBits,
@@ -91,7 +91,7 @@ _mesa_initialize_visual( GLvisual *v,
                          GLint numSamples );
 
 extern void
-_mesa_destroy_visual( GLvisual *vis );
+_mesa_destroy_visual( struct gl_config *vis );
 
 /*@}*/
 
@@ -99,78 +99,78 @@ _mesa_destroy_visual( GLvisual *vis );
 /** \name Context-related functions */
 /*@{*/
 
-extern GLcontext *
-_mesa_create_context( const GLvisual *visual,
-                      GLcontext *share_list,
+extern struct gl_context *
+_mesa_create_context( const struct gl_config *visual,
+                      struct gl_context *share_list,
                       const struct dd_function_table *driverFunctions,
                       void *driverContext );
 
 extern GLboolean
-_mesa_initialize_context( GLcontext *ctx,
-                          const GLvisual *visual,
-                          GLcontext *share_list,
+_mesa_initialize_context( struct gl_context *ctx,
+                          const struct gl_config *visual,
+                          struct gl_context *share_list,
                           const struct dd_function_table *driverFunctions,
                           void *driverContext );
 
-extern GLcontext *
+extern struct gl_context *
 _mesa_create_context_for_api(gl_api api,
-			     const GLvisual *visual,
-			     GLcontext *share_list,
+			     const struct gl_config *visual,
+			     struct gl_context *share_list,
 			     const struct dd_function_table *driverFunctions,
 			     void *driverContext);
 
 extern GLboolean
-_mesa_initialize_context_for_api(GLcontext *ctx,
+_mesa_initialize_context_for_api(struct gl_context *ctx,
 				 gl_api api,
-				 const GLvisual *visual,
-				 GLcontext *share_list,
+				 const struct gl_config *visual,
+				 struct gl_context *share_list,
 				 const struct dd_function_table *driverFunctions,
 				 void *driverContext);
 
 extern void
-_mesa_free_context_data( GLcontext *ctx );
+_mesa_free_context_data( struct gl_context *ctx );
 
 extern void
-_mesa_destroy_context( GLcontext *ctx );
+_mesa_destroy_context( struct gl_context *ctx );
 
 
 extern void
-_mesa_copy_context(const GLcontext *src, GLcontext *dst, GLuint mask);
+_mesa_copy_context(const struct gl_context *src, struct gl_context *dst, GLuint mask);
 
 
 extern void
-_mesa_check_init_viewport(GLcontext *ctx, GLuint width, GLuint height);
+_mesa_check_init_viewport(struct gl_context *ctx, GLuint width, GLuint height);
 
 extern GLboolean
-_mesa_make_current( GLcontext *ctx, GLframebuffer *drawBuffer,
-                    GLframebuffer *readBuffer );
+_mesa_make_current( struct gl_context *ctx, struct gl_framebuffer *drawBuffer,
+                    struct gl_framebuffer *readBuffer );
 
 extern GLboolean
-_mesa_share_state(GLcontext *ctx, GLcontext *ctxToShare);
+_mesa_share_state(struct gl_context *ctx, struct gl_context *ctxToShare);
 
-extern GLcontext *
+extern struct gl_context *
 _mesa_get_current_context(void);
 
 /*@}*/
 
 extern void
-_mesa_init_get_hash(GLcontext *ctx);
+_mesa_init_get_hash(struct gl_context *ctx);
 
 extern void
-_mesa_notifySwapBuffers(__GLcontext *gc);
+_mesa_notifySwapBuffers(struct gl_context *gc);
 
 
 extern struct _glapi_table *
-_mesa_get_dispatch(GLcontext *ctx);
+_mesa_get_dispatch(struct gl_context *ctx);
 
 
 void
-_mesa_set_mvp_with_dp4( GLcontext *ctx,
+_mesa_set_mvp_with_dp4( struct gl_context *ctx,
                         GLboolean flag );
 
 
 extern GLboolean
-_mesa_valid_to_render(GLcontext *ctx, const char *where);
+_mesa_valid_to_render(struct gl_context *ctx, const char *where);
 
 
 
@@ -178,14 +178,14 @@ _mesa_valid_to_render(GLcontext *ctx, const char *where);
 /*@{*/
 
 extern void
-_mesa_record_error( GLcontext *ctx, GLenum error );
+_mesa_record_error( struct gl_context *ctx, GLenum error );
 
 
 extern void
-_mesa_finish(GLcontext *ctx);
+_mesa_finish(struct gl_context *ctx);
 
 extern void
-_mesa_flush(GLcontext *ctx);
+_mesa_flush(struct gl_context *ctx);
 
 
 extern void GLAPIENTRY
@@ -211,7 +211,7 @@ _mesa_Flush( void );
  *
  * Checks if dd_function_table::NeedFlush is marked to flush stored vertices,
  * and calls dd_function_table::FlushVertices if so. Marks
- * __GLcontextRec::NewState with \p newstate.
+ * __struct gl_contextRec::NewState with \p newstate.
  */
 #define FLUSH_VERTICES(ctx, newstate)				\
 do {								\
@@ -230,7 +230,7 @@ do {								\
  *
  * Checks if dd_function_table::NeedFlush is marked to flush current state,
  * and calls dd_function_table::FlushVertices if so. Marks
- * __GLcontextRec::NewState with \p newstate.
+ * __struct gl_contextRec::NewState with \p newstate.
  */
 #define FLUSH_CURRENT(ctx, newstate)				\
 do {								\
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index f63bddc44d5..0231bcf6d3f 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -35,228 +35,27 @@
 #include "bufferobj.h"
 #include "colormac.h"
 #include "convolve.h"
-#include "context.h"
-#include "image.h"
 #include "macros.h"
 #include "mtypes.h"
-#include "state.h"
 #include "main/dispatch.h"
 
 
 #if FEATURE_convolve
 
-
-/*
- * Given an internalFormat token passed to glConvolutionFilter
- * or glSeparableFilter, return the corresponding base format.
- * Return -1 if invalid token.
- */
-static GLint
-base_filter_format( GLenum format )
-{
-   switch (format) {
-      case GL_ALPHA:
-      case GL_ALPHA4:
-      case GL_ALPHA8:
-      case GL_ALPHA12:
-      case GL_ALPHA16:
-         return GL_ALPHA;
-      case GL_LUMINANCE:
-      case GL_LUMINANCE4:
-      case GL_LUMINANCE8:
-      case GL_LUMINANCE12:
-      case GL_LUMINANCE16:
-         return GL_LUMINANCE;
-      case GL_LUMINANCE_ALPHA:
-      case GL_LUMINANCE4_ALPHA4:
-      case GL_LUMINANCE6_ALPHA2:
-      case GL_LUMINANCE8_ALPHA8:
-      case GL_LUMINANCE12_ALPHA4:
-      case GL_LUMINANCE12_ALPHA12:
-      case GL_LUMINANCE16_ALPHA16:
-         return GL_LUMINANCE_ALPHA;
-      case GL_INTENSITY:
-      case GL_INTENSITY4:
-      case GL_INTENSITY8:
-      case GL_INTENSITY12:
-      case GL_INTENSITY16:
-         return GL_INTENSITY;
-      case GL_RGB:
-      case GL_R3_G3_B2:
-      case GL_RGB4:
-      case GL_RGB5:
-      case GL_RGB8:
-      case GL_RGB10:
-      case GL_RGB12:
-      case GL_RGB16:
-         return GL_RGB;
-      case 4:
-      case GL_RGBA:
-      case GL_RGBA2:
-      case GL_RGBA4:
-      case GL_RGB5_A1:
-      case GL_RGBA8:
-      case GL_RGB10_A2:
-      case GL_RGBA12:
-      case GL_RGBA16:
-         return GL_RGBA;
-      default:
-         return -1;  /* error */
-   }
-}
-
-
-void GLAPIENTRY
+static void GLAPIENTRY
 _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-   GLint baseFormat;
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (target != GL_CONVOLUTION_1D) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D(target)");
-      return;
-   }
-
-   baseFormat = base_filter_format(internalFormat);
-   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D(internalFormat)");
-      return;
-   }
 
-   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glConvolutionFilter1D(width)");
-      return;
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glConvolutionFilter1D(format or type)");
-      return;
-   }
-
-   if (format == GL_COLOR_INDEX ||
-       format == GL_STENCIL_INDEX ||
-       format == GL_DEPTH_COMPONENT ||
-       format == GL_INTENSITY ||
-       type == GL_BITMAP) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D(format or type)");
-      return;
-   }
-
-   ctx->Convolution1D.Format = format;
-   ctx->Convolution1D.InternalFormat = internalFormat;
-   ctx->Convolution1D.Width = width;
-   ctx->Convolution1D.Height = 1;
-
-   image = _mesa_map_validate_pbo_source(ctx, 
-                                        1, &ctx->Unpack, width, 1, 1,
-                                        format, type, image,
-                                        "glConvolutionFilter1D");
-   if (!image)
-      return;
-
-   _mesa_unpack_color_span_float(ctx, width, GL_RGBA,
-                                 ctx->Convolution1D.Filter,
-                                 format, type, image, &ctx->Unpack,
-                                 0); /* transferOps */
-
-   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
-
-   _mesa_scale_and_bias_rgba(width,
-                             (GLfloat (*)[4]) ctx->Convolution1D.Filter,
-                             ctx->Pixel.ConvolutionFilterScale[0][0],
-                             ctx->Pixel.ConvolutionFilterScale[0][1],
-                             ctx->Pixel.ConvolutionFilterScale[0][2],
-                             ctx->Pixel.ConvolutionFilterScale[0][3],
-                             ctx->Pixel.ConvolutionFilterBias[0][0],
-                             ctx->Pixel.ConvolutionFilterBias[0][1],
-                             ctx->Pixel.ConvolutionFilterBias[0][2],
-                             ctx->Pixel.ConvolutionFilterBias[0][3]);
-
-   ctx->NewState |= _NEW_PIXEL;
+   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter1D");
 }
 
-
-void GLAPIENTRY
+static void GLAPIENTRY
 _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-   GLint baseFormat;
-   GLint i;
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (target != GL_CONVOLUTION_2D) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter2D(target)");
-      return;
-   }
-
-   baseFormat = base_filter_format(internalFormat);
-   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter2D(internalFormat)");
-      return;
-   }
-
-   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glConvolutionFilter2D(width)");
-      return;
-   }
-   if (height < 0 || height > MAX_CONVOLUTION_HEIGHT) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glConvolutionFilter2D(height)");
-      return;
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glConvolutionFilter2D(format or type)");
-      return;
-   }
-   if (format == GL_COLOR_INDEX ||
-       format == GL_STENCIL_INDEX ||
-       format == GL_DEPTH_COMPONENT ||
-       format == GL_INTENSITY ||
-       type == GL_BITMAP) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter2D(format or type)");
-      return;
-   }
-
-   /* this should have been caught earlier */
-   assert(_mesa_components_in_format(format));
-
-   ctx->Convolution2D.Format = format;
-   ctx->Convolution2D.InternalFormat = internalFormat;
-   ctx->Convolution2D.Width = width;
-   ctx->Convolution2D.Height = height;
-
-   image = _mesa_map_validate_pbo_source(ctx, 
-                                         2, &ctx->Unpack, width, height, 1,
-                                         format, type, image,
-                                         "glConvolutionFilter2D");
-   if (!image)
-      return;
-
-   /* Unpack filter image.  We always store filters in RGBA format. */
-   for (i = 0; i < height; i++) {
-      const GLvoid *src = _mesa_image_address2d(&ctx->Unpack, image, width,
-                                                height, format, type, i, 0);
-      GLfloat *dst = ctx->Convolution2D.Filter + i * width * 4;
-      _mesa_unpack_color_span_float(ctx, width, GL_RGBA, dst,
-                                    format, type, src, &ctx->Unpack,
-                                    0); /* transferOps */
-   }
-
-   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
 
-   _mesa_scale_and_bias_rgba(width * height,
-                             (GLfloat (*)[4]) ctx->Convolution2D.Filter,
-                             ctx->Pixel.ConvolutionFilterScale[1][0],
-                             ctx->Pixel.ConvolutionFilterScale[1][1],
-                             ctx->Pixel.ConvolutionFilterScale[1][2],
-                             ctx->Pixel.ConvolutionFilterScale[1][3],
-                             ctx->Pixel.ConvolutionFilterBias[1][0],
-                             ctx->Pixel.ConvolutionFilterBias[1][1],
-                             ctx->Pixel.ConvolutionFilterBias[1][2],
-                             ctx->Pixel.ConvolutionFilterBias[1][3]);
-
-   ctx->NewState |= _NEW_PIXEL;
+   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionFilter2D");
 }
 
 
@@ -264,42 +63,8 @@ static void GLAPIENTRY
 _mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param)
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLuint c;
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   switch (target) {
-      case GL_CONVOLUTION_1D:
-         c = 0;
-         break;
-      case GL_CONVOLUTION_2D:
-         c = 1;
-         break;
-      case GL_SEPARABLE_2D:
-         c = 2;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterf(target)");
-         return;
-   }
-
-   switch (pname) {
-      case GL_CONVOLUTION_BORDER_MODE:
-         if (param == (GLfloat) GL_REDUCE ||
-             param == (GLfloat) GL_CONSTANT_BORDER ||
-             param == (GLfloat) GL_REPLICATE_BORDER) {
-            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) param;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterf(params)");
-            return;
-         }
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterf(pname)");
-         return;
-   }
 
-   ctx->NewState |= _NEW_PIXEL;
+   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterf");
 }
 
 
@@ -307,51 +72,8 @@ static void GLAPIENTRY
 _mesa_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLuint c;
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   switch (target) {
-      case GL_CONVOLUTION_1D:
-         c = 0;
-         break;
-      case GL_CONVOLUTION_2D:
-         c = 1;
-         break;
-      case GL_SEPARABLE_2D:
-         c = 2;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterfv(target)");
-         return;
-   }
-
-   switch (pname) {
-      case GL_CONVOLUTION_BORDER_COLOR:
-         COPY_4V(ctx->Pixel.ConvolutionBorderColor[c], params);
-         break;
-      case GL_CONVOLUTION_BORDER_MODE:
-         if (params[0] == (GLfloat) GL_REDUCE ||
-             params[0] == (GLfloat) GL_CONSTANT_BORDER ||
-             params[0] == (GLfloat) GL_REPLICATE_BORDER) {
-            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) params[0];
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterfv(params)");
-            return;
-         }
-         break;
-      case GL_CONVOLUTION_FILTER_SCALE:
-         COPY_4V(ctx->Pixel.ConvolutionFilterScale[c], params);
-         break;
-      case GL_CONVOLUTION_FILTER_BIAS:
-         COPY_4V(ctx->Pixel.ConvolutionFilterBias[c], params);
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterfv(pname)");
-         return;
-   }
 
-   ctx->NewState |= _NEW_PIXEL;
+   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameterfv");
 }
 
 
@@ -359,42 +81,8 @@ static void GLAPIENTRY
 _mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint param)
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLuint c;
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   switch (target) {
-      case GL_CONVOLUTION_1D:
-         c = 0;
-         break;
-      case GL_CONVOLUTION_2D:
-         c = 1;
-         break;
-      case GL_SEPARABLE_2D:
-         c = 2;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteri(target)");
-         return;
-   }
-
-   switch (pname) {
-      case GL_CONVOLUTION_BORDER_MODE:
-         if (param == (GLint) GL_REDUCE ||
-             param == (GLint) GL_CONSTANT_BORDER ||
-             param == (GLint) GL_REPLICATE_BORDER) {
-            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) param;
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteri(params)");
-            return;
-         }
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteri(pname)");
-         return;
-   }
-
-   ctx->NewState |= _NEW_PIXEL;
+   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteri");
 }
 
 
@@ -402,132 +90,26 @@ static void GLAPIENTRY
 _mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLuint c;
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   switch (target) {
-      case GL_CONVOLUTION_1D:
-         c = 0;
-         break;
-      case GL_CONVOLUTION_2D:
-         c = 1;
-         break;
-      case GL_SEPARABLE_2D:
-         c = 2;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteriv(target)");
-         return;
-   }
-
-   switch (pname) {
-      case GL_CONVOLUTION_BORDER_COLOR:
-	 ctx->Pixel.ConvolutionBorderColor[c][0] = INT_TO_FLOAT(params[0]);
-	 ctx->Pixel.ConvolutionBorderColor[c][1] = INT_TO_FLOAT(params[1]);
-	 ctx->Pixel.ConvolutionBorderColor[c][2] = INT_TO_FLOAT(params[2]);
-	 ctx->Pixel.ConvolutionBorderColor[c][3] = INT_TO_FLOAT(params[3]);
-         break;
-      case GL_CONVOLUTION_BORDER_MODE:
-         if (params[0] == (GLint) GL_REDUCE ||
-             params[0] == (GLint) GL_CONSTANT_BORDER ||
-             params[0] == (GLint) GL_REPLICATE_BORDER) {
-            ctx->Pixel.ConvolutionBorderMode[c] = (GLenum) params[0];
-         }
-         else {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteriv(params)");
-            return;
-         }
-         break;
-      case GL_CONVOLUTION_FILTER_SCALE:
-	 /* COPY_4V(ctx->Pixel.ConvolutionFilterScale[c], params); */
-	 /* need cast to prevent compiler warnings */  
-	 ctx->Pixel.ConvolutionFilterScale[c][0] = (GLfloat) params[0]; 
-	 ctx->Pixel.ConvolutionFilterScale[c][1] = (GLfloat) params[1]; 
-	 ctx->Pixel.ConvolutionFilterScale[c][2] = (GLfloat) params[2]; 
-	 ctx->Pixel.ConvolutionFilterScale[c][3] = (GLfloat) params[3]; 
-         break;
-      case GL_CONVOLUTION_FILTER_BIAS:
-	 /* COPY_4V(ctx->Pixel.ConvolutionFilterBias[c], params); */
-	 /* need cast to prevent compiler warnings */  
-	 ctx->Pixel.ConvolutionFilterBias[c][0] = (GLfloat) params[0]; 
-	 ctx->Pixel.ConvolutionFilterBias[c][1] = (GLfloat) params[1]; 
-	 ctx->Pixel.ConvolutionFilterBias[c][2] = (GLfloat) params[2]; 
-	 ctx->Pixel.ConvolutionFilterBias[c][3] = (GLfloat) params[3]; 
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteriv(pname)");
-         return;
-   }
 
-   ctx->NewState |= _NEW_PIXEL;
+   _mesa_error(ctx, GL_INVALID_ENUM, "glConvolutionParameteriv");
 }
 
 
 static void GLAPIENTRY
 _mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width)
 {
-   GLint baseFormat;
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (target != GL_CONVOLUTION_1D) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter1D(target)");
-      return;
-   }
-
-   baseFormat = base_filter_format(internalFormat);
-   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter1D(internalFormat)");
-      return;
-   }
-
-   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glCopyConvolutionFilter1D(width)");
-      return;
-   }
-
-   if (!ctx->ReadBuffer->_ColorReadBuffer) {
-      return;      /* no readbuffer - OK */
-   }
-
-   ctx->Driver.CopyConvolutionFilter1D( ctx, target, 
-					internalFormat, x, y, width);
+   _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter1D");
 }
 
 
 static void GLAPIENTRY
 _mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-   GLint baseFormat;
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (target != GL_CONVOLUTION_2D) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter2D(target)");
-      return;
-   }
 
-   baseFormat = base_filter_format(internalFormat);
-   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter2D(internalFormat)");
-      return;
-   }
-
-   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glCopyConvolutionFilter2D(width)");
-      return;
-   }
-   if (height < 0 || height > MAX_CONVOLUTION_HEIGHT) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glCopyConvolutionFilter2D(height)");
-      return;
-   }
-
-   if (!ctx->ReadBuffer->_ColorReadBuffer) {
-      return;      /* no readbuffer - OK */
-   }
-
-   ctx->Driver.CopyConvolutionFilter2D( ctx, target, internalFormat, x, y, 
-					width, height );
+   _mesa_error(ctx, GL_INVALID_ENUM, "glCopyConvolutionFilter2D");
 }
 
 
@@ -535,58 +117,9 @@ static void GLAPIENTRY
 _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
                            GLvoid *image)
 {
-   struct gl_convolution_attrib *filter;
-   GLuint row;
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->NewState) {
-      _mesa_update_state(ctx);
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetConvolutionFilter(format or type)");
-      return;
-   }
 
-   if (format == GL_COLOR_INDEX ||
-       format == GL_STENCIL_INDEX ||
-       format == GL_DEPTH_COMPONENT ||
-       format == GL_INTENSITY ||
-       type == GL_BITMAP) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionFilter(format or type)");
-      return;
-   }
-
-   switch (target) {
-      case GL_CONVOLUTION_1D:
-         filter = &(ctx->Convolution1D);
-         break;
-      case GL_CONVOLUTION_2D:
-         filter = &(ctx->Convolution2D);
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionFilter(target)");
-         return;
-   }
-
-   image = _mesa_map_validate_pbo_dest(ctx, 2, &ctx->Pack,
-                                       filter->Width, filter->Height, 1,
-                                       format, type, image,
-                                       "glGetConvolutionFilter");
-   if (!image)
-      return;
-
-   for (row = 0; row < filter->Height; row++) {
-      GLvoid *dst = _mesa_image_address2d(&ctx->Pack, image, filter->Width,
-                                          filter->Height, format, type,
-                                          row, 0);
-      GLfloat (*src)[4] = (GLfloat (*)[4]) (filter->Filter + row * filter->Width * 4);
-      _mesa_pack_rgba_span_float(ctx, filter->Width, src,
-                                 format, type, dst, &ctx->Pack, 0x0);
-   }
-
-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetConvolutionFilter");
 }
 
 
@@ -594,60 +127,8 @@ static void GLAPIENTRY
 _mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   const struct gl_convolution_attrib *conv;
-   GLuint c;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   switch (target) {
-      case GL_CONVOLUTION_1D:
-         c = 0;
-         conv = &ctx->Convolution1D;
-         break;
-      case GL_CONVOLUTION_2D:
-         c = 1;
-         conv = &ctx->Convolution2D;
-         break;
-      case GL_SEPARABLE_2D:
-         c = 2;
-         conv = &ctx->Separable2D;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameterfv(target)");
-         return;
-   }
 
-   switch (pname) {
-      case GL_CONVOLUTION_BORDER_COLOR:
-         COPY_4V(params, ctx->Pixel.ConvolutionBorderColor[c]);
-         break;
-      case GL_CONVOLUTION_BORDER_MODE:
-         *params = (GLfloat) ctx->Pixel.ConvolutionBorderMode[c];
-         break;
-      case GL_CONVOLUTION_FILTER_SCALE:
-         COPY_4V(params, ctx->Pixel.ConvolutionFilterScale[c]);
-         break;
-      case GL_CONVOLUTION_FILTER_BIAS:
-         COPY_4V(params, ctx->Pixel.ConvolutionFilterBias[c]);
-         break;
-      case GL_CONVOLUTION_FORMAT:
-         *params = (GLfloat) conv->Format;
-         break;
-      case GL_CONVOLUTION_WIDTH:
-         *params = (GLfloat) conv->Width;
-         break;
-      case GL_CONVOLUTION_HEIGHT:
-         *params = (GLfloat) conv->Height;
-         break;
-      case GL_MAX_CONVOLUTION_WIDTH:
-         *params = (GLfloat) ctx->Const.MaxConvolutionWidth;
-         break;
-      case GL_MAX_CONVOLUTION_HEIGHT:
-         *params = (GLfloat) ctx->Const.MaxConvolutionHeight;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameterfv(pname)");
-         return;
-   }
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameterfv");
 }
 
 
@@ -655,69 +136,8 @@ static void GLAPIENTRY
 _mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   const struct gl_convolution_attrib *conv;
-   GLuint c;
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   switch (target) {
-      case GL_CONVOLUTION_1D:
-         c = 0;
-         conv = &ctx->Convolution1D;
-         break;
-      case GL_CONVOLUTION_2D:
-         c = 1;
-         conv = &ctx->Convolution2D;
-         break;
-      case GL_SEPARABLE_2D:
-         c = 2;
-         conv = &ctx->Separable2D;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameteriv(target)");
-         return;
-   }
-
-   switch (pname) {
-      case GL_CONVOLUTION_BORDER_COLOR:
-         params[0] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][0]);
-         params[1] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][1]);
-         params[2] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][2]);
-         params[3] = FLOAT_TO_INT(ctx->Pixel.ConvolutionBorderColor[c][3]);
-         break;
-      case GL_CONVOLUTION_BORDER_MODE:
-         *params = (GLint) ctx->Pixel.ConvolutionBorderMode[c];
-         break;
-      case GL_CONVOLUTION_FILTER_SCALE:
-         params[0] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][0];
-         params[1] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][1];
-         params[2] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][2];
-         params[3] = (GLint) ctx->Pixel.ConvolutionFilterScale[c][3];
-         break;
-      case GL_CONVOLUTION_FILTER_BIAS:
-         params[0] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][0];
-         params[1] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][1];
-         params[2] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][2];
-         params[3] = (GLint) ctx->Pixel.ConvolutionFilterBias[c][3];
-         break;
-      case GL_CONVOLUTION_FORMAT:
-         *params = (GLint) conv->Format;
-         break;
-      case GL_CONVOLUTION_WIDTH:
-         *params = (GLint) conv->Width;
-         break;
-      case GL_CONVOLUTION_HEIGHT:
-         *params = (GLint) conv->Height;
-         break;
-      case GL_MAX_CONVOLUTION_WIDTH:
-         *params = (GLint) ctx->Const.MaxConvolutionWidth;
-         break;
-      case GL_MAX_CONVOLUTION_HEIGHT:
-         *params = (GLint) ctx->Const.MaxConvolutionHeight;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameteriv(pname)");
-         return;
-   }
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionParameteriv");
 }
 
 
@@ -725,720 +145,20 @@ static void GLAPIENTRY
 _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
                          GLvoid *row, GLvoid *column, GLvoid *span)
 {
-   const GLint colStart = MAX_CONVOLUTION_WIDTH * 4;
-   struct gl_convolution_attrib *filter;
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (ctx->NewState) {
-      _mesa_update_state(ctx);
-   }
-
-   if (target != GL_SEPARABLE_2D) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetSeparableFilter(target)");
-      return;
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetConvolutionFilter(format or type)");
-      return;
-   }
 
-   if (format == GL_COLOR_INDEX ||
-       format == GL_STENCIL_INDEX ||
-       format == GL_DEPTH_COMPONENT ||
-       format == GL_INTENSITY ||
-       type == GL_BITMAP) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetConvolutionFilter(format or type)");
-      return;
-   }
-
-   filter = &ctx->Separable2D;
-
-   /* Get row filter */
-   row = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack,
-                                     filter->Width, 1, 1,
-                                     format, type, row,
-                                     "glGetConvolutionFilter");
-   if (row) {
-      GLvoid *dst = _mesa_image_address1d(&ctx->Pack, row, filter->Width,
-                                          format, type, 0);
-      _mesa_pack_rgba_span_float(ctx, filter->Width,
-                                 (GLfloat (*)[4]) filter->Filter,
-                                 format, type, dst, &ctx->Pack, 0x0);
-      _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-   }
-
-   /* get column filter */
-   column = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack,
-                                        filter->Height, 1, 1,
-                                        format, type, column,
-                                        "glGetConvolutionFilter");
-   if (column) {
-      GLvoid *dst = _mesa_image_address1d(&ctx->Pack, column, filter->Height,
-                                          format, type, 0);
-      GLfloat (*src)[4] = (GLfloat (*)[4]) (filter->Filter + colStart);
-      _mesa_pack_rgba_span_float(ctx, filter->Height, src,
-                                 format, type, dst, &ctx->Pack, 0x0);
-      _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-   }
-
-   (void) span;  /* unused at this time */
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetSeparableFilter");
 }
 
 
 static void GLAPIENTRY
 _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-   const GLint colStart = MAX_CONVOLUTION_WIDTH * 4;
-   GLint baseFormat;
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (target != GL_SEPARABLE_2D) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D(target)");
-      return;
-   }
-
-   baseFormat = base_filter_format(internalFormat);
-   if (baseFormat < 0 || baseFormat == GL_COLOR_INDEX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D(internalFormat)");
-      return;
-   }
-
-   if (width < 0 || width > MAX_CONVOLUTION_WIDTH) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glSeparableFilter2D(width)");
-      return;
-   }
-   if (height < 0 || height > MAX_CONVOLUTION_HEIGHT) {
-      _mesa_error(ctx, GL_INVALID_VALUE, "glSeparableFilter2D(height)");
-      return;
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glSeparableFilter2D(format or type)");
-      return;
-   }
-
-   if (format == GL_COLOR_INDEX ||
-       format == GL_STENCIL_INDEX ||
-       format == GL_DEPTH_COMPONENT ||
-       format == GL_INTENSITY ||
-       type == GL_BITMAP) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D(format or type)");
-      return;
-   }
-
-   ctx->Separable2D.Format = format;
-   ctx->Separable2D.InternalFormat = internalFormat;
-   ctx->Separable2D.Width = width;
-   ctx->Separable2D.Height = height;
-
-   /* unpack row filter */
-   row = _mesa_map_validate_pbo_source(ctx, 1, &ctx->Unpack,
-                                       width, 1, 1,
-                                       format, type, row,
-                                       "glSeparableFilter2D");
-   if (row) {
-      _mesa_unpack_color_span_float(ctx, width, GL_RGBA,
-                                    ctx->Separable2D.Filter,
-                                    format, type, row, &ctx->Unpack,
-                                    0x0);  /* transferOps */
-      _mesa_scale_and_bias_rgba(width,
-                             (GLfloat (*)[4]) ctx->Separable2D.Filter,
-                             ctx->Pixel.ConvolutionFilterScale[2][0],
-                             ctx->Pixel.ConvolutionFilterScale[2][1],
-                             ctx->Pixel.ConvolutionFilterScale[2][2],
-                             ctx->Pixel.ConvolutionFilterScale[2][3],
-                             ctx->Pixel.ConvolutionFilterBias[2][0],
-                             ctx->Pixel.ConvolutionFilterBias[2][1],
-                             ctx->Pixel.ConvolutionFilterBias[2][2],
-                             ctx->Pixel.ConvolutionFilterBias[2][3]);
-      _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
-   }
-
-   /* unpack column filter */
-   column = _mesa_map_validate_pbo_source(ctx, 1, &ctx->Unpack,
-                                          height, 1, 1,
-                                          format, type, column,
-                                          "glSeparableFilter2D");
-   if (column) {
-      _mesa_unpack_color_span_float(ctx, height, GL_RGBA,
-                                    &ctx->Separable2D.Filter[colStart],
-                                    format, type, column, &ctx->Unpack,
-                                    0); /* transferOps */
-
-      _mesa_scale_and_bias_rgba(height,
-                       (GLfloat (*)[4]) (ctx->Separable2D.Filter + colStart),
-                       ctx->Pixel.ConvolutionFilterScale[2][0],
-                       ctx->Pixel.ConvolutionFilterScale[2][1],
-                       ctx->Pixel.ConvolutionFilterScale[2][2],
-                       ctx->Pixel.ConvolutionFilterScale[2][3],
-                       ctx->Pixel.ConvolutionFilterBias[2][0],
-                       ctx->Pixel.ConvolutionFilterBias[2][1],
-                       ctx->Pixel.ConvolutionFilterBias[2][2],
-                       ctx->Pixel.ConvolutionFilterBias[2][3]);
-      _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
-   }
-
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
-
-   ctx->NewState |= _NEW_PIXEL;
-}
-
-
-/**********************************************************************/
-/***                   image convolution functions                  ***/
-/**********************************************************************/
-
-static void
-convolve_1d_reduce(GLint srcWidth, const GLfloat src[][4],
-                   GLint filterWidth, const GLfloat filter[][4],
-                   GLfloat dest[][4])
-{
-   GLint dstWidth;
-   GLint i, n;
-
-   if (filterWidth >= 1)
-      dstWidth = srcWidth - (filterWidth - 1);
-   else
-      dstWidth = srcWidth;
-
-   if (dstWidth <= 0)
-      return;  /* null result */
-
-   for (i = 0; i < dstWidth; i++) {
-      GLfloat sumR = 0.0;
-      GLfloat sumG = 0.0;
-      GLfloat sumB = 0.0;
-      GLfloat sumA = 0.0;
-      for (n = 0; n < filterWidth; n++) {
-         sumR += src[i + n][RCOMP] * filter[n][RCOMP];
-         sumG += src[i + n][GCOMP] * filter[n][GCOMP];
-         sumB += src[i + n][BCOMP] * filter[n][BCOMP];
-         sumA += src[i + n][ACOMP] * filter[n][ACOMP];
-      }
-      dest[i][RCOMP] = sumR;
-      dest[i][GCOMP] = sumG;
-      dest[i][BCOMP] = sumB;
-      dest[i][ACOMP] = sumA;
-   }
-}
-
-
-static void
-convolve_1d_constant(GLint srcWidth, const GLfloat src[][4],
-                     GLint filterWidth, const GLfloat filter[][4],
-                     GLfloat dest[][4],
-                     const GLfloat borderColor[4])
-{
-   const GLint halfFilterWidth = filterWidth / 2;
-   GLint i, n;
-
-   for (i = 0; i < srcWidth; i++) {
-      GLfloat sumR = 0.0;
-      GLfloat sumG = 0.0;
-      GLfloat sumB = 0.0;
-      GLfloat sumA = 0.0;
-      for (n = 0; n < filterWidth; n++) {
-         if (i + n < halfFilterWidth || i + n - halfFilterWidth >= srcWidth) {
-            sumR += borderColor[RCOMP] * filter[n][RCOMP];
-            sumG += borderColor[GCOMP] * filter[n][GCOMP];
-            sumB += borderColor[BCOMP] * filter[n][BCOMP];
-            sumA += borderColor[ACOMP] * filter[n][ACOMP];
-         }
-         else {
-            sumR += src[i + n - halfFilterWidth][RCOMP] * filter[n][RCOMP];
-            sumG += src[i + n - halfFilterWidth][GCOMP] * filter[n][GCOMP];
-            sumB += src[i + n - halfFilterWidth][BCOMP] * filter[n][BCOMP];
-            sumA += src[i + n - halfFilterWidth][ACOMP] * filter[n][ACOMP];
-         }
-      }
-      dest[i][RCOMP] = sumR;
-      dest[i][GCOMP] = sumG;
-      dest[i][BCOMP] = sumB;
-      dest[i][ACOMP] = sumA;
-   }
-}
-
-
-static void
-convolve_1d_replicate(GLint srcWidth, const GLfloat src[][4],
-                      GLint filterWidth, const GLfloat filter[][4],
-                      GLfloat dest[][4])
-{
-   const GLint halfFilterWidth = filterWidth / 2;
-   GLint i, n;
-
-   for (i = 0; i < srcWidth; i++) {
-      GLfloat sumR = 0.0;
-      GLfloat sumG = 0.0;
-      GLfloat sumB = 0.0;
-      GLfloat sumA = 0.0;
-      for (n = 0; n < filterWidth; n++) {
-         if (i + n < halfFilterWidth) {
-            sumR += src[0][RCOMP] * filter[n][RCOMP];
-            sumG += src[0][GCOMP] * filter[n][GCOMP];
-            sumB += src[0][BCOMP] * filter[n][BCOMP];
-            sumA += src[0][ACOMP] * filter[n][ACOMP];
-         }
-         else if (i + n - halfFilterWidth >= srcWidth) {
-            sumR += src[srcWidth - 1][RCOMP] * filter[n][RCOMP];
-            sumG += src[srcWidth - 1][GCOMP] * filter[n][GCOMP];
-            sumB += src[srcWidth - 1][BCOMP] * filter[n][BCOMP];
-            sumA += src[srcWidth - 1][ACOMP] * filter[n][ACOMP];
-         }
-         else {
-            sumR += src[i + n - halfFilterWidth][RCOMP] * filter[n][RCOMP];
-            sumG += src[i + n - halfFilterWidth][GCOMP] * filter[n][GCOMP];
-            sumB += src[i + n - halfFilterWidth][BCOMP] * filter[n][BCOMP];
-            sumA += src[i + n - halfFilterWidth][ACOMP] * filter[n][ACOMP];
-         }
-      }
-      dest[i][RCOMP] = sumR;
-      dest[i][GCOMP] = sumG;
-      dest[i][BCOMP] = sumB;
-      dest[i][ACOMP] = sumA;
-   }
-}
-
-
-static void
-convolve_2d_reduce(GLint srcWidth, GLint srcHeight,
-                   const GLfloat src[][4],
-                   GLint filterWidth, GLint filterHeight,
-                   const GLfloat filter[][4],
-                   GLfloat dest[][4])
-{
-   GLint dstWidth, dstHeight;
-   GLint i, j, n, m;
-
-   if (filterWidth >= 1)
-      dstWidth = srcWidth - (filterWidth - 1);
-   else
-      dstWidth = srcWidth;
-
-   if (filterHeight >= 1)
-      dstHeight = srcHeight - (filterHeight - 1);
-   else
-      dstHeight = srcHeight;
-
-   if (dstWidth <= 0 || dstHeight <= 0)
-      return;
-
-   for (j = 0; j < dstHeight; j++) {
-      for (i = 0; i < dstWidth; i++) {
-         GLfloat sumR = 0.0;
-         GLfloat sumG = 0.0;
-         GLfloat sumB = 0.0;
-         GLfloat sumA = 0.0;
-         for (m = 0; m < filterHeight; m++) {
-            for (n = 0; n < filterWidth; n++) {
-               const GLint k = (j + m) * srcWidth + i + n;
-               const GLint f = m * filterWidth + n;
-               sumR += src[k][RCOMP] * filter[f][RCOMP];
-               sumG += src[k][GCOMP] * filter[f][GCOMP];
-               sumB += src[k][BCOMP] * filter[f][BCOMP];
-               sumA += src[k][ACOMP] * filter[f][ACOMP];
-            }
-         }
-         dest[j * dstWidth + i][RCOMP] = sumR;
-         dest[j * dstWidth + i][GCOMP] = sumG;
-         dest[j * dstWidth + i][BCOMP] = sumB;
-         dest[j * dstWidth + i][ACOMP] = sumA;
-      }
-   }
-}
-
-
-static void
-convolve_2d_constant(GLint srcWidth, GLint srcHeight,
-                     const GLfloat src[][4],
-                     GLint filterWidth, GLint filterHeight,
-                     const GLfloat filter[][4],
-                     GLfloat dest[][4],
-                     const GLfloat borderColor[4])
-{
-   const GLint halfFilterWidth = filterWidth / 2;
-   const GLint halfFilterHeight = filterHeight / 2;
-   GLint i, j, n, m;
-
-   for (j = 0; j < srcHeight; j++) {
-      for (i = 0; i < srcWidth; i++) {
-         GLfloat sumR = 0.0;
-         GLfloat sumG = 0.0;
-         GLfloat sumB = 0.0;
-         GLfloat sumA = 0.0;
-         for (m = 0; m < filterHeight; m++) {
-            for (n = 0; n < filterWidth; n++) {
-               const GLint f = m * filterWidth + n;
-               const GLint is = i + n - halfFilterWidth;
-               const GLint js = j + m - halfFilterHeight;
-               if (is < 0 || is >= srcWidth ||
-                   js < 0 || js >= srcHeight) {
-                  sumR += borderColor[RCOMP] * filter[f][RCOMP];
-                  sumG += borderColor[GCOMP] * filter[f][GCOMP];
-                  sumB += borderColor[BCOMP] * filter[f][BCOMP];
-                  sumA += borderColor[ACOMP] * filter[f][ACOMP];
-               }
-               else {
-                  const GLint k = js * srcWidth + is;
-                  sumR += src[k][RCOMP] * filter[f][RCOMP];
-                  sumG += src[k][GCOMP] * filter[f][GCOMP];
-                  sumB += src[k][BCOMP] * filter[f][BCOMP];
-                  sumA += src[k][ACOMP] * filter[f][ACOMP];
-               }
-            }
-         }
-         dest[j * srcWidth + i][RCOMP] = sumR;
-         dest[j * srcWidth + i][GCOMP] = sumG;
-         dest[j * srcWidth + i][BCOMP] = sumB;
-         dest[j * srcWidth + i][ACOMP] = sumA;
-      }
-   }
-}
-
-
-static void
-convolve_2d_replicate(GLint srcWidth, GLint srcHeight,
-                      const GLfloat src[][4],
-                      GLint filterWidth, GLint filterHeight,
-                      const GLfloat filter[][4],
-                      GLfloat dest[][4])
-{
-   const GLint halfFilterWidth = filterWidth / 2;
-   const GLint halfFilterHeight = filterHeight / 2;
-   GLint i, j, n, m;
-
-   for (j = 0; j < srcHeight; j++) {
-      for (i = 0; i < srcWidth; i++) {
-         GLfloat sumR = 0.0;
-         GLfloat sumG = 0.0;
-         GLfloat sumB = 0.0;
-         GLfloat sumA = 0.0;
-         for (m = 0; m < filterHeight; m++) {
-            for (n = 0; n < filterWidth; n++) {
-               const GLint f = m * filterWidth + n;
-               GLint is = i + n - halfFilterWidth;
-               GLint js = j + m - halfFilterHeight;
-               GLint k;
-               if (is < 0)
-                  is = 0;
-               else if (is >= srcWidth)
-                  is = srcWidth - 1;
-               if (js < 0)
-                  js = 0;
-               else if (js >= srcHeight)
-                  js = srcHeight - 1;
-               k = js * srcWidth + is;
-               sumR += src[k][RCOMP] * filter[f][RCOMP];
-               sumG += src[k][GCOMP] * filter[f][GCOMP];
-               sumB += src[k][BCOMP] * filter[f][BCOMP];
-               sumA += src[k][ACOMP] * filter[f][ACOMP];
-            }
-         }
-         dest[j * srcWidth + i][RCOMP] = sumR;
-         dest[j * srcWidth + i][GCOMP] = sumG;
-         dest[j * srcWidth + i][BCOMP] = sumB;
-         dest[j * srcWidth + i][ACOMP] = sumA;
-      }
-   }
-}
-
-
-static void
-convolve_sep_reduce(GLint srcWidth, GLint srcHeight,
-                    const GLfloat src[][4],
-                    GLint filterWidth, GLint filterHeight,
-                    const GLfloat rowFilt[][4],
-                    const GLfloat colFilt[][4],
-                    GLfloat dest[][4])
-{
-   GLint dstWidth, dstHeight;
-   GLint i, j, n, m;
-
-   if (filterWidth >= 1)
-      dstWidth = srcWidth - (filterWidth - 1);
-   else
-      dstWidth = srcWidth;
-
-   if (filterHeight >= 1)
-      dstHeight = srcHeight - (filterHeight - 1);
-   else
-      dstHeight = srcHeight;
 
-   if (dstWidth <= 0 || dstHeight <= 0)
-      return;
-
-   for (j = 0; j < dstHeight; j++) {
-      for (i = 0; i < dstWidth; i++) {
-         GLfloat sumR = 0.0;
-         GLfloat sumG = 0.0;
-         GLfloat sumB = 0.0;
-         GLfloat sumA = 0.0;
-         for (m = 0; m < filterHeight; m++) {
-            for (n = 0; n < filterWidth; n++) {
-               GLint k = (j + m) * srcWidth + i + n;
-               sumR += src[k][RCOMP] * rowFilt[n][RCOMP] * colFilt[m][RCOMP];
-               sumG += src[k][GCOMP] * rowFilt[n][GCOMP] * colFilt[m][GCOMP];
-               sumB += src[k][BCOMP] * rowFilt[n][BCOMP] * colFilt[m][BCOMP];
-               sumA += src[k][ACOMP] * rowFilt[n][ACOMP] * colFilt[m][ACOMP];
-            }
-         }
-         dest[j * dstWidth + i][RCOMP] = sumR;
-         dest[j * dstWidth + i][GCOMP] = sumG;
-         dest[j * dstWidth + i][BCOMP] = sumB;
-         dest[j * dstWidth + i][ACOMP] = sumA;
-      }
-   }
-}
-
-
-static void
-convolve_sep_constant(GLint srcWidth, GLint srcHeight,
-                      const GLfloat src[][4],
-                      GLint filterWidth, GLint filterHeight,
-                      const GLfloat rowFilt[][4],
-                      const GLfloat colFilt[][4],
-                      GLfloat dest[][4],
-                      const GLfloat borderColor[4])
-{
-   const GLint halfFilterWidth = filterWidth / 2;
-   const GLint halfFilterHeight = filterHeight / 2;
-   GLint i, j, n, m;
-
-   for (j = 0; j < srcHeight; j++) {
-      for (i = 0; i < srcWidth; i++) {
-         GLfloat sumR = 0.0;
-         GLfloat sumG = 0.0;
-         GLfloat sumB = 0.0;
-         GLfloat sumA = 0.0;
-         for (m = 0; m < filterHeight; m++) {
-            for (n = 0; n < filterWidth; n++) {
-               const GLint is = i + n - halfFilterWidth;
-               const GLint js = j + m - halfFilterHeight;
-               if (is < 0 || is >= srcWidth ||
-                   js < 0 || js >= srcHeight) {
-                  sumR += borderColor[RCOMP] * rowFilt[n][RCOMP] * colFilt[m][RCOMP];
-                  sumG += borderColor[GCOMP] * rowFilt[n][GCOMP] * colFilt[m][GCOMP];
-                  sumB += borderColor[BCOMP] * rowFilt[n][BCOMP] * colFilt[m][BCOMP];
-                  sumA += borderColor[ACOMP] * rowFilt[n][ACOMP] * colFilt[m][ACOMP];
-               }
-               else {
-                  GLint k = js * srcWidth + is;
-                  sumR += src[k][RCOMP] * rowFilt[n][RCOMP] * colFilt[m][RCOMP];
-                  sumG += src[k][GCOMP] * rowFilt[n][GCOMP] * colFilt[m][GCOMP];
-                  sumB += src[k][BCOMP] * rowFilt[n][BCOMP] * colFilt[m][BCOMP];
-                  sumA += src[k][ACOMP] * rowFilt[n][ACOMP] * colFilt[m][ACOMP];
-               }
-
-            }
-         }
-         dest[j * srcWidth + i][RCOMP] = sumR;
-         dest[j * srcWidth + i][GCOMP] = sumG;
-         dest[j * srcWidth + i][BCOMP] = sumB;
-         dest[j * srcWidth + i][ACOMP] = sumA;
-      }
-   }
-}
-
-
-static void
-convolve_sep_replicate(GLint srcWidth, GLint srcHeight,
-                       const GLfloat src[][4],
-                       GLint filterWidth, GLint filterHeight,
-                       const GLfloat rowFilt[][4],
-                       const GLfloat colFilt[][4],
-                       GLfloat dest[][4])
-{
-   const GLint halfFilterWidth = filterWidth / 2;
-   const GLint halfFilterHeight = filterHeight / 2;
-   GLint i, j, n, m;
-
-   for (j = 0; j < srcHeight; j++) {
-      for (i = 0; i < srcWidth; i++) {
-         GLfloat sumR = 0.0;
-         GLfloat sumG = 0.0;
-         GLfloat sumB = 0.0;
-         GLfloat sumA = 0.0;
-         for (m = 0; m < filterHeight; m++) {
-            for (n = 0; n < filterWidth; n++) {
-               GLint is = i + n - halfFilterWidth;
-               GLint js = j + m - halfFilterHeight;
-               GLint k;
-               if (is < 0)
-                  is = 0;
-               else if (is >= srcWidth)
-                  is = srcWidth - 1;
-               if (js < 0)
-                  js = 0;
-               else if (js >= srcHeight)
-                  js = srcHeight - 1;
-               k = js * srcWidth + is;
-               sumR += src[k][RCOMP] * rowFilt[n][RCOMP] * colFilt[m][RCOMP];
-               sumG += src[k][GCOMP] * rowFilt[n][GCOMP] * colFilt[m][GCOMP];
-               sumB += src[k][BCOMP] * rowFilt[n][BCOMP] * colFilt[m][BCOMP];
-               sumA += src[k][ACOMP] * rowFilt[n][ACOMP] * colFilt[m][ACOMP];
-            }
-         }
-         dest[j * srcWidth + i][RCOMP] = sumR;
-         dest[j * srcWidth + i][GCOMP] = sumG;
-         dest[j * srcWidth + i][BCOMP] = sumB;
-         dest[j * srcWidth + i][ACOMP] = sumA;
-      }
-   }
-}
-
-
-
-void
-_mesa_convolve_1d_image(const GLcontext *ctx, GLsizei *width,
-                        const GLfloat *srcImage, GLfloat *dstImage)
-{
-   switch (ctx->Pixel.ConvolutionBorderMode[0]) {
-      case GL_REDUCE:
-         convolve_1d_reduce(*width, (const GLfloat (*)[4]) srcImage,
-                            ctx->Convolution1D.Width,
-                            (const GLfloat (*)[4]) ctx->Convolution1D.Filter,
-                            (GLfloat (*)[4]) dstImage);
-         *width = *width - (MAX2(ctx->Convolution1D.Width, 1) - 1);
-         break;
-      case GL_CONSTANT_BORDER:
-         convolve_1d_constant(*width, (const GLfloat (*)[4]) srcImage,
-                              ctx->Convolution1D.Width,
-                              (const GLfloat (*)[4]) ctx->Convolution1D.Filter,
-                              (GLfloat (*)[4]) dstImage,
-                              ctx->Pixel.ConvolutionBorderColor[0]);
-         break;
-      case GL_REPLICATE_BORDER:
-         convolve_1d_replicate(*width, (const GLfloat (*)[4]) srcImage,
-                              ctx->Convolution1D.Width,
-                              (const GLfloat (*)[4]) ctx->Convolution1D.Filter,
-                              (GLfloat (*)[4]) dstImage);
-         break;
-      default:
-         ;
-   }
-}
-
-
-void
-_mesa_convolve_2d_image(const GLcontext *ctx, GLsizei *width, GLsizei *height,
-                        const GLfloat *srcImage, GLfloat *dstImage)
-{
-   switch (ctx->Pixel.ConvolutionBorderMode[1]) {
-      case GL_REDUCE:
-         convolve_2d_reduce(*width, *height,
-                            (const GLfloat (*)[4]) srcImage,
-                            ctx->Convolution2D.Width,
-                            ctx->Convolution2D.Height,
-                            (const GLfloat (*)[4]) ctx->Convolution2D.Filter,
-                            (GLfloat (*)[4]) dstImage);
-         *width = *width - (MAX2(ctx->Convolution2D.Width, 1) - 1);
-         *height = *height - (MAX2(ctx->Convolution2D.Height, 1) - 1);
-         break;
-      case GL_CONSTANT_BORDER:
-         convolve_2d_constant(*width, *height,
-                              (const GLfloat (*)[4]) srcImage,
-                              ctx->Convolution2D.Width,
-                              ctx->Convolution2D.Height,
-                              (const GLfloat (*)[4]) ctx->Convolution2D.Filter,
-                              (GLfloat (*)[4]) dstImage,
-                              ctx->Pixel.ConvolutionBorderColor[1]);
-         break;
-      case GL_REPLICATE_BORDER:
-         convolve_2d_replicate(*width, *height,
-                               (const GLfloat (*)[4]) srcImage,
-                               ctx->Convolution2D.Width,
-                               ctx->Convolution2D.Height,
-                               (const GLfloat (*)[4])ctx->Convolution2D.Filter,
-                               (GLfloat (*)[4]) dstImage);
-         break;
-      default:
-         ;
-      }
-}
-
-
-void
-_mesa_convolve_sep_image(const GLcontext *ctx,
-                         GLsizei *width, GLsizei *height,
-                         const GLfloat *srcImage, GLfloat *dstImage)
-{
-   const GLfloat *rowFilter = ctx->Separable2D.Filter;
-   const GLfloat *colFilter = rowFilter + 4 * MAX_CONVOLUTION_WIDTH;
-
-   switch (ctx->Pixel.ConvolutionBorderMode[2]) {
-      case GL_REDUCE:
-         convolve_sep_reduce(*width, *height,
-                             (const GLfloat (*)[4]) srcImage,
-                             ctx->Separable2D.Width,
-                             ctx->Separable2D.Height,
-                             (const GLfloat (*)[4]) rowFilter,
-                             (const GLfloat (*)[4]) colFilter,
-                             (GLfloat (*)[4]) dstImage);
-         *width = *width - (MAX2(ctx->Separable2D.Width, 1) - 1);
-         *height = *height - (MAX2(ctx->Separable2D.Height, 1) - 1);
-         break;
-      case GL_CONSTANT_BORDER:
-         convolve_sep_constant(*width, *height,
-                               (const GLfloat (*)[4]) srcImage,
-                               ctx->Separable2D.Width,
-                               ctx->Separable2D.Height,
-                               (const GLfloat (*)[4]) rowFilter,
-                               (const GLfloat (*)[4]) colFilter,
-                               (GLfloat (*)[4]) dstImage,
-                               ctx->Pixel.ConvolutionBorderColor[2]);
-         break;
-      case GL_REPLICATE_BORDER:
-         convolve_sep_replicate(*width, *height,
-                                (const GLfloat (*)[4]) srcImage,
-                                ctx->Separable2D.Width,
-                                ctx->Separable2D.Height,
-                                (const GLfloat (*)[4]) rowFilter,
-                                (const GLfloat (*)[4]) colFilter,
-                                (GLfloat (*)[4]) dstImage);
-         break;
-      default:
-         ;
-   }
+   _mesa_error(ctx, GL_INVALID_ENUM, "glSeparableFilter2D");
 }
 
-
-
-/*
- * This function computes an image's size after convolution.
- * If the convolution border mode is GL_REDUCE, the post-convolution
- * image will be smaller than the original.
- */
-void
-_mesa_adjust_image_for_convolution(const GLcontext *ctx, GLuint dimensions,
-                                   GLsizei *width, GLsizei *height)
-{
-   if (ctx->Pixel.Convolution1DEnabled
-       && dimensions == 1
-       && ctx->Pixel.ConvolutionBorderMode[0] == GL_REDUCE) {
-      *width = *width - (MAX2(ctx->Convolution1D.Width, 1) - 1);
-   }
-   else if (ctx->Pixel.Convolution2DEnabled
-            && dimensions > 1
-            && ctx->Pixel.ConvolutionBorderMode[1] == GL_REDUCE) {
-      *width = *width - (MAX2(ctx->Convolution2D.Width, 1) - 1);
-      *height = *height - (MAX2(ctx->Convolution2D.Height, 1) - 1);
-   }
-   else if (ctx->Pixel.Separable2DEnabled
-            && dimensions > 1
-            && ctx->Pixel.ConvolutionBorderMode[2] == GL_REDUCE) {
-      *width = *width - (MAX2(ctx->Separable2D.Width, 1) - 1);
-      *height = *height - (MAX2(ctx->Separable2D.Height, 1) - 1);
-   }
-}
-
-
 void
 _mesa_init_convolve_dispatch(struct _glapi_table *disp)
 {
diff --git a/src/mesa/main/convolve.h b/src/mesa/main/convolve.h
index 80caf942fba..0277917433d 100644
--- a/src/mesa/main/convolve.h
+++ b/src/mesa/main/convolve.h
@@ -33,32 +33,6 @@
 
 #if FEATURE_convolve
 
-extern void GLAPIENTRY
-_mesa_ConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width,
-                          GLenum format, GLenum type, const GLvoid *image);
-
-extern void GLAPIENTRY
-_mesa_ConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width,
-                          GLsizei height, GLenum format, GLenum type,
-                          const GLvoid *image);
-
-extern void
-_mesa_convolve_1d_image(const GLcontext *ctx, GLsizei *width,
-                        const GLfloat *srcImage, GLfloat *dstImage);
-
-extern void
-_mesa_convolve_2d_image(const GLcontext *ctx, GLsizei *width, GLsizei *height,
-                        const GLfloat *srcImage, GLfloat *dstImage);
-
-extern void
-_mesa_convolve_sep_image(const GLcontext *ctx,
-                         GLsizei *width, GLsizei *height,
-                         const GLfloat *srcImage, GLfloat *dstImage);
-
-extern void
-_mesa_adjust_image_for_convolution(const GLcontext *ctx, GLuint dimensions,
-                                   GLsizei *width, GLsizei *height);
-
 extern void
 _mesa_init_convolve_dispatch(struct _glapi_table *disp);
 
@@ -66,50 +40,6 @@ _mesa_init_convolve_dispatch(struct _glapi_table *disp);
 
 #include "main/compiler.h"
 
-static INLINE void GLAPIENTRY
-_mesa_ConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width,
-                          GLenum format, GLenum type, const GLvoid *image)
-{
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void GLAPIENTRY
-_mesa_ConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width,
-                          GLsizei height, GLenum format, GLenum type,
-                          const GLvoid *image)
-{
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_convolve_1d_image(const GLcontext *ctx, GLsizei *width,
-                        const GLfloat *srcImage, GLfloat *dstImage)
-{
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_convolve_2d_image(const GLcontext *ctx, GLsizei *width, GLsizei *height,
-                        const GLfloat *srcImage, GLfloat *dstImage)
-{
-   ASSERT_NO_FEATURE();
-}
-
-
-static INLINE void
-_mesa_convolve_sep_image(const GLcontext *ctx,
-                         GLsizei *width, GLsizei *height,
-                         const GLfloat *srcImage, GLfloat *dstImage)
-{
-   ASSERT_NO_FEATURE();
-}
-
-static INLINE void
-_mesa_adjust_image_for_convolution(const GLcontext *ctx, GLuint dimensions,
-                                   GLsizei *width, GLsizei *height)
-{
-}
-
 static INLINE void
 _mesa_init_convolve_dispatch(struct _glapi_table *disp)
 {
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 8a20a663632..c9f0facdaff 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -70,7 +70,7 @@ struct dd_function_table {
     * Only the GL_RENDERER query must be implemented.  Otherwise, NULL can be
     * returned.
     */
-   const GLubyte * (*GetString)( GLcontext *ctx, GLenum name );
+   const GLubyte * (*GetString)( struct gl_context *ctx, GLenum name );
 
    /**
     * Notify the driver after Mesa has made some internal state changes.  
@@ -78,7 +78,7 @@ struct dd_function_table {
     * This is in addition to any state change callbacks Mesa may already have
     * made.
     */
-   void (*UpdateState)( GLcontext *ctx, GLbitfield new_state );
+   void (*UpdateState)( struct gl_context *ctx, GLbitfield new_state );
 
    /**
     * Get the width and height of the named buffer/window.
@@ -86,49 +86,49 @@ struct dd_function_table {
     * Mesa uses this to determine when the driver's window size has changed.
     * XXX OBSOLETE: this function will be removed in the future.
     */
-   void (*GetBufferSize)( GLframebuffer *buffer,
+   void (*GetBufferSize)( struct gl_framebuffer *buffer,
                           GLuint *width, GLuint *height );
 
    /**
     * Resize the given framebuffer to the given size.
     * XXX OBSOLETE: this function will be removed in the future.
     */
-   void (*ResizeBuffers)( GLcontext *ctx, GLframebuffer *fb,
+   void (*ResizeBuffers)( struct gl_context *ctx, struct gl_framebuffer *fb,
                           GLuint width, GLuint height);
 
    /**
     * Called whenever an error is generated.  
-    * __GLcontextRec::ErrorValue contains the error value.
+    * __struct gl_contextRec::ErrorValue contains the error value.
     */
-   void (*Error)( GLcontext *ctx );
+   void (*Error)( struct gl_context *ctx );
 
    /**
     * This is called whenever glFinish() is called.
     */
-   void (*Finish)( GLcontext *ctx );
+   void (*Finish)( struct gl_context *ctx );
 
    /**
     * This is called whenever glFlush() is called.
     */
-   void (*Flush)( GLcontext *ctx );
+   void (*Flush)( struct gl_context *ctx );
 
    /**
     * Clear the color/depth/stencil/accum buffer(s).
     * \param buffers  a bitmask of BUFFER_BIT_* flags indicating which
     *                 renderbuffers need to be cleared.
     */
-   void (*Clear)( GLcontext *ctx, GLbitfield buffers );
+   void (*Clear)( struct gl_context *ctx, GLbitfield buffers );
 
    /**
     * Execute glAccum command.
     */
-   void (*Accum)( GLcontext *ctx, GLenum op, GLfloat value );
+   void (*Accum)( struct gl_context *ctx, GLenum op, GLfloat value );
 
 
    /**
     * Execute glRasterPos, updating the ctx->Current.Raster fields
     */
-   void (*RasterPos)( GLcontext *ctx, const GLfloat v[4] );
+   void (*RasterPos)( struct gl_context *ctx, const GLfloat v[4] );
 
    /**
     * \name Image-related functions
@@ -139,7 +139,7 @@ struct dd_function_table {
     * Called by glDrawPixels().
     * \p unpack describes how to unpack the source image data.
     */
-   void (*DrawPixels)( GLcontext *ctx,
+   void (*DrawPixels)( struct gl_context *ctx,
 		       GLint x, GLint y, GLsizei width, GLsizei height,
 		       GLenum format, GLenum type,
 		       const struct gl_pixelstore_attrib *unpack,
@@ -148,7 +148,7 @@ struct dd_function_table {
    /**
     * Called by glReadPixels().
     */
-   void (*ReadPixels)( GLcontext *ctx,
+   void (*ReadPixels)( struct gl_context *ctx,
 		       GLint x, GLint y, GLsizei width, GLsizei height,
 		       GLenum format, GLenum type,
 		       const struct gl_pixelstore_attrib *unpack,
@@ -157,14 +157,14 @@ struct dd_function_table {
    /**
     * Called by glCopyPixels().  
     */
-   void (*CopyPixels)( GLcontext *ctx, GLint srcx, GLint srcy,
+   void (*CopyPixels)( struct gl_context *ctx, GLint srcx, GLint srcy,
                        GLsizei width, GLsizei height,
                        GLint dstx, GLint dsty, GLenum type );
 
    /**
     * Called by glBitmap().  
     */
-   void (*Bitmap)( GLcontext *ctx,
+   void (*Bitmap)( struct gl_context *ctx,
 		   GLint x, GLint y, GLsizei width, GLsizei height,
 		   const struct gl_pixelstore_attrib *unpack,
 		   const GLubyte *bitmap );
@@ -183,7 +183,7 @@ struct dd_function_table {
     * functions.  The driver should examine \p internalFormat and return a
     * gl_format value.
     */
-   GLuint (*ChooseTextureFormat)( GLcontext *ctx, GLint internalFormat,
+   GLuint (*ChooseTextureFormat)( struct gl_context *ctx, GLint internalFormat,
                                      GLenum srcFormat, GLenum srcType );
 
    /**
@@ -203,7 +203,7 @@ struct dd_function_table {
     *
     * Drivers should call a fallback routine from texstore.c if needed.
     */
-   void (*TexImage1D)( GLcontext *ctx, GLenum target, GLint level,
+   void (*TexImage1D)( struct gl_context *ctx, GLenum target, GLint level,
                        GLint internalFormat,
                        GLint width, GLint border,
                        GLenum format, GLenum type, const GLvoid *pixels,
@@ -216,7 +216,7 @@ struct dd_function_table {
     * 
     * \sa dd_function_table::TexImage1D.
     */
-   void (*TexImage2D)( GLcontext *ctx, GLenum target, GLint level,
+   void (*TexImage2D)( struct gl_context *ctx, GLenum target, GLint level,
                        GLint internalFormat,
                        GLint width, GLint height, GLint border,
                        GLenum format, GLenum type, const GLvoid *pixels,
@@ -229,7 +229,7 @@ struct dd_function_table {
     * 
     * \sa dd_function_table::TexImage1D.
     */
-   void (*TexImage3D)( GLcontext *ctx, GLenum target, GLint level,
+   void (*TexImage3D)( struct gl_context *ctx, GLenum target, GLint level,
                        GLint internalFormat,
                        GLint width, GLint height, GLint depth, GLint border,
                        GLenum format, GLenum type, const GLvoid *pixels,
@@ -258,7 +258,7 @@ struct dd_function_table {
     *
     * The driver should use a fallback routine from texstore.c if needed.
     */
-   void (*TexSubImage1D)( GLcontext *ctx, GLenum target, GLint level,
+   void (*TexSubImage1D)( struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLsizei width,
                           GLenum format, GLenum type,
                           const GLvoid *pixels,
@@ -271,7 +271,7 @@ struct dd_function_table {
     *
     * \sa dd_function_table::TexSubImage1D.
     */
-   void (*TexSubImage2D)( GLcontext *ctx, GLenum target, GLint level,
+   void (*TexSubImage2D)( struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint yoffset,
                           GLsizei width, GLsizei height,
                           GLenum format, GLenum type,
@@ -285,7 +285,7 @@ struct dd_function_table {
     *
     * \sa dd_function_table::TexSubImage1D.
     */
-   void (*TexSubImage3D)( GLcontext *ctx, GLenum target, GLint level,
+   void (*TexSubImage3D)( struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint yoffset, GLint zoffset,
                           GLsizei width, GLsizei height, GLint depth,
                           GLenum format, GLenum type,
@@ -297,7 +297,7 @@ struct dd_function_table {
    /**
     * Called by glGetTexImage().
     */
-   void (*GetTexImage)( GLcontext *ctx, GLenum target, GLint level,
+   void (*GetTexImage)( struct gl_context *ctx, GLenum target, GLint level,
                         GLenum format, GLenum type, GLvoid *pixels,
                         struct gl_texture_object *texObj,
                         struct gl_texture_image *texImage );
@@ -307,7 +307,7 @@ struct dd_function_table {
     * 
     * Drivers should use a fallback routine from texstore.c if needed.
     */
-   void (*CopyTexImage1D)( GLcontext *ctx, GLenum target, GLint level,
+   void (*CopyTexImage1D)( struct gl_context *ctx, GLenum target, GLint level,
                            GLenum internalFormat, GLint x, GLint y,
                            GLsizei width, GLint border );
 
@@ -316,7 +316,7 @@ struct dd_function_table {
     * 
     * Drivers should use a fallback routine from texstore.c if needed.
     */
-   void (*CopyTexImage2D)( GLcontext *ctx, GLenum target, GLint level,
+   void (*CopyTexImage2D)( struct gl_context *ctx, GLenum target, GLint level,
                            GLenum internalFormat, GLint x, GLint y,
                            GLsizei width, GLsizei height, GLint border );
 
@@ -325,7 +325,7 @@ struct dd_function_table {
     * 
     * Drivers should use a fallback routine from texstore.c if needed.
     */
-   void (*CopyTexSubImage1D)( GLcontext *ctx, GLenum target, GLint level,
+   void (*CopyTexSubImage1D)( struct gl_context *ctx, GLenum target, GLint level,
                               GLint xoffset,
                               GLint x, GLint y, GLsizei width );
    /**
@@ -333,7 +333,7 @@ struct dd_function_table {
     * 
     * Drivers should use a fallback routine from texstore.c if needed.
     */
-   void (*CopyTexSubImage2D)( GLcontext *ctx, GLenum target, GLint level,
+   void (*CopyTexSubImage2D)( struct gl_context *ctx, GLenum target, GLint level,
                               GLint xoffset, GLint yoffset,
                               GLint x, GLint y,
                               GLsizei width, GLsizei height );
@@ -342,7 +342,7 @@ struct dd_function_table {
     * 
     * Drivers should use a fallback routine from texstore.c if needed.
     */
-   void (*CopyTexSubImage3D)( GLcontext *ctx, GLenum target, GLint level,
+   void (*CopyTexSubImage3D)( struct gl_context *ctx, GLenum target, GLint level,
                               GLint xoffset, GLint yoffset, GLint zoffset,
                               GLint x, GLint y,
                               GLsizei width, GLsizei height );
@@ -350,7 +350,7 @@ struct dd_function_table {
    /**
     * Called by glGenerateMipmap() or when GL_GENERATE_MIPMAP_SGIS is enabled.
     */
-   void (*GenerateMipmap)(GLcontext *ctx, GLenum target,
+   void (*GenerateMipmap)(struct gl_context *ctx, GLenum target,
                           struct gl_texture_object *texObj);
 
    /**
@@ -359,7 +359,7 @@ struct dd_function_table {
     *
     * \return GL_TRUE if the proxy test passes, or GL_FALSE if the test fails.
     */
-   GLboolean (*TestProxyTexImage)(GLcontext *ctx, GLenum target,
+   GLboolean (*TestProxyTexImage)(struct gl_context *ctx, GLenum target,
                                   GLint level, GLint internalFormat,
                                   GLenum format, GLenum type,
                                   GLint width, GLint height,
@@ -387,7 +387,7 @@ struct dd_function_table {
     * \a retainInternalCopy is returned by this function and indicates whether
     * core Mesa should keep an internal copy of the texture image.
     */
-   void (*CompressedTexImage1D)( GLcontext *ctx, GLenum target,
+   void (*CompressedTexImage1D)( struct gl_context *ctx, GLenum target,
                                  GLint level, GLint internalFormat,
                                  GLsizei width, GLint border,
                                  GLsizei imageSize, const GLvoid *data,
@@ -398,7 +398,7 @@ struct dd_function_table {
     *
     * \sa dd_function_table::CompressedTexImage1D.
     */
-   void (*CompressedTexImage2D)( GLcontext *ctx, GLenum target,
+   void (*CompressedTexImage2D)( struct gl_context *ctx, GLenum target,
                                  GLint level, GLint internalFormat,
                                  GLsizei width, GLsizei height, GLint border,
                                  GLsizei imageSize, const GLvoid *data,
@@ -409,7 +409,7 @@ struct dd_function_table {
     *
     * \sa dd_function_table::CompressedTexImage3D.
     */
-   void (*CompressedTexImage3D)( GLcontext *ctx, GLenum target,
+   void (*CompressedTexImage3D)( struct gl_context *ctx, GLenum target,
                                  GLint level, GLint internalFormat,
                                  GLsizei width, GLsizei height, GLsizei depth,
                                  GLint border,
@@ -434,7 +434,7 @@ struct dd_function_table {
     * \param texImage is the target texture image.  It will have the texture \p
     * width, \p height, \p depth, \p border and \p internalFormat information.
     */
-   void (*CompressedTexSubImage1D)(GLcontext *ctx, GLenum target, GLint level,
+   void (*CompressedTexSubImage1D)(struct gl_context *ctx, GLenum target, GLint level,
                                    GLint xoffset, GLsizei width,
                                    GLenum format,
                                    GLsizei imageSize, const GLvoid *data,
@@ -445,7 +445,7 @@ struct dd_function_table {
     *
     * \sa dd_function_table::CompressedTexImage3D.
     */
-   void (*CompressedTexSubImage2D)(GLcontext *ctx, GLenum target, GLint level,
+   void (*CompressedTexSubImage2D)(struct gl_context *ctx, GLenum target, GLint level,
                                    GLint xoffset, GLint yoffset,
                                    GLsizei width, GLint height,
                                    GLenum format,
@@ -457,7 +457,7 @@ struct dd_function_table {
     *
     * \sa dd_function_table::CompressedTexImage3D.
     */
-   void (*CompressedTexSubImage3D)(GLcontext *ctx, GLenum target, GLint level,
+   void (*CompressedTexSubImage3D)(struct gl_context *ctx, GLenum target, GLint level,
                                    GLint xoffset, GLint yoffset, GLint zoffset,
                                    GLsizei width, GLint height, GLint depth,
                                    GLenum format,
@@ -469,7 +469,7 @@ struct dd_function_table {
    /**
     * Called by glGetCompressedTexImage.
     */
-   void (*GetCompressedTexImage)(GLcontext *ctx, GLenum target, GLint level,
+   void (*GetCompressedTexImage)(struct gl_context *ctx, GLenum target, GLint level,
                                  GLvoid *img,
                                  struct gl_texture_object *texObj,
                                  struct gl_texture_image *texImage);
@@ -484,7 +484,7 @@ struct dd_function_table {
    /**
     * Called by glBindTexture().
     */
-   void (*BindTexture)( GLcontext *ctx, GLenum target,
+   void (*BindTexture)( struct gl_context *ctx, GLenum target,
                         struct gl_texture_object *tObj );
 
    /**
@@ -492,7 +492,7 @@ struct dd_function_table {
     * A new gl_texture_object should be returned.  The driver should
     * attach to it any device-specific info it needs.
     */
-   struct gl_texture_object * (*NewTextureObject)( GLcontext *ctx, GLuint name,
+   struct gl_texture_object * (*NewTextureObject)( struct gl_context *ctx, GLuint name,
                                                    GLenum target );
    /**
     * Called when a texture object is about to be deallocated.  
@@ -500,22 +500,22 @@ struct dd_function_table {
     * Driver should delete the gl_texture_object object and anything
     * hanging off of it.
     */
-   void (*DeleteTexture)( GLcontext *ctx, struct gl_texture_object *tObj );
+   void (*DeleteTexture)( struct gl_context *ctx, struct gl_texture_object *tObj );
 
    /**
     * Called to allocate a new texture image object.
     */
-   struct gl_texture_image * (*NewTextureImage)( GLcontext *ctx );
+   struct gl_texture_image * (*NewTextureImage)( struct gl_context *ctx );
 
    /** 
     * Called to free tImage->Data.
     */
-   void (*FreeTexImageData)( GLcontext *ctx, struct gl_texture_image *tImage );
+   void (*FreeTexImageData)( struct gl_context *ctx, struct gl_texture_image *tImage );
 
    /** Map texture image data into user space */
-   void (*MapTexture)( GLcontext *ctx, struct gl_texture_object *tObj );
+   void (*MapTexture)( struct gl_context *ctx, struct gl_texture_object *tObj );
    /** Unmap texture images from user space */
-   void (*UnmapTexture)( GLcontext *ctx, struct gl_texture_object *tObj );
+   void (*UnmapTexture)( struct gl_context *ctx, struct gl_texture_object *tObj );
 
    /**
     * Note: no context argument.  This function doesn't initially look
@@ -533,7 +533,7 @@ struct dd_function_table {
    /**
     * Called by glAreTextureResident().
     */
-   GLboolean (*IsTextureResident)( GLcontext *ctx,
+   GLboolean (*IsTextureResident)( struct gl_context *ctx,
                                    struct gl_texture_object *t );
 
    /**
@@ -542,7 +542,7 @@ struct dd_function_table {
     * If \p tObj is NULL then the shared texture palette
     * gl_texture_object::Palette is to be updated.
     */
-   void (*UpdateTexturePalette)( GLcontext *ctx,
+   void (*UpdateTexturePalette)( struct gl_context *ctx,
                                  struct gl_texture_object *tObj );
    /*@}*/
 
@@ -551,22 +551,13 @@ struct dd_function_table {
     * \name Imaging functionality
     */
    /*@{*/
-   void (*CopyColorTable)( GLcontext *ctx,
+   void (*CopyColorTable)( struct gl_context *ctx,
 			   GLenum target, GLenum internalformat,
 			   GLint x, GLint y, GLsizei width );
 
-   void (*CopyColorSubTable)( GLcontext *ctx,
+   void (*CopyColorSubTable)( struct gl_context *ctx,
 			      GLenum target, GLsizei start,
 			      GLint x, GLint y, GLsizei width );
-
-   void (*CopyConvolutionFilter1D)( GLcontext *ctx, GLenum target,
-				    GLenum internalFormat,
-				    GLint x, GLint y, GLsizei width );
-
-   void (*CopyConvolutionFilter2D)( GLcontext *ctx, GLenum target,
-				    GLenum internalFormat,
-				    GLint x, GLint y,
-				    GLsizei width, GLsizei height );
    /*@}*/
 
 
@@ -575,21 +566,21 @@ struct dd_function_table {
     */
    /*@{*/
    /** Bind a vertex/fragment program */
-   void (*BindProgram)(GLcontext *ctx, GLenum target, struct gl_program *prog);
+   void (*BindProgram)(struct gl_context *ctx, GLenum target, struct gl_program *prog);
    /** Allocate a new program */
-   struct gl_program * (*NewProgram)(GLcontext *ctx, GLenum target, GLuint id);
+   struct gl_program * (*NewProgram)(struct gl_context *ctx, GLenum target, GLuint id);
    /** Delete a program */
-   void (*DeleteProgram)(GLcontext *ctx, struct gl_program *prog);   
+   void (*DeleteProgram)(struct gl_context *ctx, struct gl_program *prog);   
    /**
     * Notify driver that a program string (and GPU code) has been specified
     * or modified.  Return GL_TRUE or GL_FALSE to indicate if the program is
     * supported by the driver.
     */
-   GLboolean (*ProgramStringNotify)(GLcontext *ctx, GLenum target, 
+   GLboolean (*ProgramStringNotify)(struct gl_context *ctx, GLenum target, 
                                     struct gl_program *prog);
 
    /** Query if program can be loaded onto hardware */
-   GLboolean (*IsProgramNative)(GLcontext *ctx, GLenum target, 
+   GLboolean (*IsProgramNative)(struct gl_context *ctx, GLenum target, 
 				struct gl_program *prog);
    
    /*@}*/
@@ -606,14 +597,14 @@ struct dd_function_table {
     * have CompileShader() called, so if lowering passes are done they
     * need to also be performed in LinkShader().
     */
-   GLboolean (*CompileShader)(GLcontext *ctx, struct gl_shader *shader);
+   GLboolean (*CompileShader)(struct gl_context *ctx, struct gl_shader *shader);
    /**
     * Called when a shader program is linked.
     *
     * This gives drivers an opportunity to clone the IR and make their
     * own transformations on it for the purposes of code generation.
     */
-   GLboolean (*LinkShader)(GLcontext *ctx, struct gl_shader_program *shader);
+   GLboolean (*LinkShader)(struct gl_context *ctx, struct gl_shader_program *shader);
    /*@}*/
 
    /**
@@ -627,102 +618,102 @@ struct dd_function_table {
     */
    /*@{*/
    /** Specify the alpha test function */
-   void (*AlphaFunc)(GLcontext *ctx, GLenum func, GLfloat ref);
+   void (*AlphaFunc)(struct gl_context *ctx, GLenum func, GLfloat ref);
    /** Set the blend color */
-   void (*BlendColor)(GLcontext *ctx, const GLfloat color[4]);
+   void (*BlendColor)(struct gl_context *ctx, const GLfloat color[4]);
    /** Set the blend equation */
-   void (*BlendEquationSeparate)(GLcontext *ctx, GLenum modeRGB, GLenum modeA);
+   void (*BlendEquationSeparate)(struct gl_context *ctx, GLenum modeRGB, GLenum modeA);
    /** Specify pixel arithmetic */
-   void (*BlendFuncSeparate)(GLcontext *ctx,
+   void (*BlendFuncSeparate)(struct gl_context *ctx,
                              GLenum sfactorRGB, GLenum dfactorRGB,
                              GLenum sfactorA, GLenum dfactorA);
    /** Specify clear values for the color buffers */
-   void (*ClearColor)(GLcontext *ctx, const GLfloat color[4]);
+   void (*ClearColor)(struct gl_context *ctx, const GLfloat color[4]);
    /** Specify the clear value for the depth buffer */
-   void (*ClearDepth)(GLcontext *ctx, GLclampd d);
+   void (*ClearDepth)(struct gl_context *ctx, GLclampd d);
    /** Specify the clear value for the stencil buffer */
-   void (*ClearStencil)(GLcontext *ctx, GLint s);
+   void (*ClearStencil)(struct gl_context *ctx, GLint s);
    /** Specify a plane against which all geometry is clipped */
-   void (*ClipPlane)(GLcontext *ctx, GLenum plane, const GLfloat *equation );
+   void (*ClipPlane)(struct gl_context *ctx, GLenum plane, const GLfloat *equation );
    /** Enable and disable writing of frame buffer color components */
-   void (*ColorMask)(GLcontext *ctx, GLboolean rmask, GLboolean gmask,
+   void (*ColorMask)(struct gl_context *ctx, GLboolean rmask, GLboolean gmask,
                      GLboolean bmask, GLboolean amask );
-   void (*ColorMaskIndexed)(GLcontext *ctx, GLuint buf, GLboolean rmask,
+   void (*ColorMaskIndexed)(struct gl_context *ctx, GLuint buf, GLboolean rmask,
                             GLboolean gmask, GLboolean bmask, GLboolean amask);
    /** Cause a material color to track the current color */
-   void (*ColorMaterial)(GLcontext *ctx, GLenum face, GLenum mode);
+   void (*ColorMaterial)(struct gl_context *ctx, GLenum face, GLenum mode);
    /** Specify whether front- or back-facing facets can be culled */
-   void (*CullFace)(GLcontext *ctx, GLenum mode);
+   void (*CullFace)(struct gl_context *ctx, GLenum mode);
    /** Define front- and back-facing polygons */
-   void (*FrontFace)(GLcontext *ctx, GLenum mode);
+   void (*FrontFace)(struct gl_context *ctx, GLenum mode);
    /** Specify the value used for depth buffer comparisons */
-   void (*DepthFunc)(GLcontext *ctx, GLenum func);
+   void (*DepthFunc)(struct gl_context *ctx, GLenum func);
    /** Enable or disable writing into the depth buffer */
-   void (*DepthMask)(GLcontext *ctx, GLboolean flag);
+   void (*DepthMask)(struct gl_context *ctx, GLboolean flag);
    /** Specify mapping of depth values from NDC to window coordinates */
-   void (*DepthRange)(GLcontext *ctx, GLclampd nearval, GLclampd farval);
+   void (*DepthRange)(struct gl_context *ctx, GLclampd nearval, GLclampd farval);
    /** Specify the current buffer for writing */
-   void (*DrawBuffer)( GLcontext *ctx, GLenum buffer );
+   void (*DrawBuffer)( struct gl_context *ctx, GLenum buffer );
    /** Specify the buffers for writing for fragment programs*/
-   void (*DrawBuffers)( GLcontext *ctx, GLsizei n, const GLenum *buffers );
+   void (*DrawBuffers)( struct gl_context *ctx, GLsizei n, const GLenum *buffers );
    /** Enable or disable server-side gl capabilities */
-   void (*Enable)(GLcontext *ctx, GLenum cap, GLboolean state);
+   void (*Enable)(struct gl_context *ctx, GLenum cap, GLboolean state);
    /** Specify fog parameters */
-   void (*Fogfv)(GLcontext *ctx, GLenum pname, const GLfloat *params);
+   void (*Fogfv)(struct gl_context *ctx, GLenum pname, const GLfloat *params);
    /** Specify implementation-specific hints */
-   void (*Hint)(GLcontext *ctx, GLenum target, GLenum mode);
+   void (*Hint)(struct gl_context *ctx, GLenum target, GLenum mode);
    /** Set light source parameters.
     * Note: for GL_POSITION and GL_SPOT_DIRECTION, params will have already
     * been transformed to eye-space.
     */
-   void (*Lightfv)(GLcontext *ctx, GLenum light,
+   void (*Lightfv)(struct gl_context *ctx, GLenum light,
 		   GLenum pname, const GLfloat *params );
    /** Set the lighting model parameters */
-   void (*LightModelfv)(GLcontext *ctx, GLenum pname, const GLfloat *params);
+   void (*LightModelfv)(struct gl_context *ctx, GLenum pname, const GLfloat *params);
    /** Specify the line stipple pattern */
-   void (*LineStipple)(GLcontext *ctx, GLint factor, GLushort pattern );
+   void (*LineStipple)(struct gl_context *ctx, GLint factor, GLushort pattern );
    /** Specify the width of rasterized lines */
-   void (*LineWidth)(GLcontext *ctx, GLfloat width);
+   void (*LineWidth)(struct gl_context *ctx, GLfloat width);
    /** Specify a logical pixel operation for color index rendering */
-   void (*LogicOpcode)(GLcontext *ctx, GLenum opcode);
-   void (*PointParameterfv)(GLcontext *ctx, GLenum pname,
+   void (*LogicOpcode)(struct gl_context *ctx, GLenum opcode);
+   void (*PointParameterfv)(struct gl_context *ctx, GLenum pname,
                             const GLfloat *params);
    /** Specify the diameter of rasterized points */
-   void (*PointSize)(GLcontext *ctx, GLfloat size);
+   void (*PointSize)(struct gl_context *ctx, GLfloat size);
    /** Select a polygon rasterization mode */
-   void (*PolygonMode)(GLcontext *ctx, GLenum face, GLenum mode);
+   void (*PolygonMode)(struct gl_context *ctx, GLenum face, GLenum mode);
    /** Set the scale and units used to calculate depth values */
-   void (*PolygonOffset)(GLcontext *ctx, GLfloat factor, GLfloat units);
+   void (*PolygonOffset)(struct gl_context *ctx, GLfloat factor, GLfloat units);
    /** Set the polygon stippling pattern */
-   void (*PolygonStipple)(GLcontext *ctx, const GLubyte *mask );
+   void (*PolygonStipple)(struct gl_context *ctx, const GLubyte *mask );
    /* Specifies the current buffer for reading */
-   void (*ReadBuffer)( GLcontext *ctx, GLenum buffer );
+   void (*ReadBuffer)( struct gl_context *ctx, GLenum buffer );
    /** Set rasterization mode */
-   void (*RenderMode)(GLcontext *ctx, GLenum mode );
+   void (*RenderMode)(struct gl_context *ctx, GLenum mode );
    /** Define the scissor box */
-   void (*Scissor)(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h);
+   void (*Scissor)(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h);
    /** Select flat or smooth shading */
-   void (*ShadeModel)(GLcontext *ctx, GLenum mode);
+   void (*ShadeModel)(struct gl_context *ctx, GLenum mode);
    /** OpenGL 2.0 two-sided StencilFunc */
-   void (*StencilFuncSeparate)(GLcontext *ctx, GLenum face, GLenum func,
+   void (*StencilFuncSeparate)(struct gl_context *ctx, GLenum face, GLenum func,
                                GLint ref, GLuint mask);
    /** OpenGL 2.0 two-sided StencilMask */
-   void (*StencilMaskSeparate)(GLcontext *ctx, GLenum face, GLuint mask);
+   void (*StencilMaskSeparate)(struct gl_context *ctx, GLenum face, GLuint mask);
    /** OpenGL 2.0 two-sided StencilOp */
-   void (*StencilOpSeparate)(GLcontext *ctx, GLenum face, GLenum fail,
+   void (*StencilOpSeparate)(struct gl_context *ctx, GLenum face, GLenum fail,
                              GLenum zfail, GLenum zpass);
    /** Control the generation of texture coordinates */
-   void (*TexGen)(GLcontext *ctx, GLenum coord, GLenum pname,
+   void (*TexGen)(struct gl_context *ctx, GLenum coord, GLenum pname,
 		  const GLfloat *params);
    /** Set texture environment parameters */
-   void (*TexEnv)(GLcontext *ctx, GLenum target, GLenum pname,
+   void (*TexEnv)(struct gl_context *ctx, GLenum target, GLenum pname,
                   const GLfloat *param);
    /** Set texture parameters */
-   void (*TexParameter)(GLcontext *ctx, GLenum target,
+   void (*TexParameter)(struct gl_context *ctx, GLenum target,
                         struct gl_texture_object *texObj,
                         GLenum pname, const GLfloat *params);
    /** Set the viewport */
-   void (*Viewport)(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h);
+   void (*Viewport)(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h);
    /*@}*/
 
 
@@ -730,30 +721,30 @@ struct dd_function_table {
     * \name Vertex/pixel buffer object functions
     */
    /*@{*/
-   void (*BindBuffer)( GLcontext *ctx, GLenum target,
+   void (*BindBuffer)( struct gl_context *ctx, GLenum target,
 		       struct gl_buffer_object *obj );
 
-   struct gl_buffer_object * (*NewBufferObject)( GLcontext *ctx, GLuint buffer,
+   struct gl_buffer_object * (*NewBufferObject)( struct gl_context *ctx, GLuint buffer,
 						 GLenum target );
    
-   void (*DeleteBuffer)( GLcontext *ctx, struct gl_buffer_object *obj );
+   void (*DeleteBuffer)( struct gl_context *ctx, struct gl_buffer_object *obj );
 
-   GLboolean (*BufferData)( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
+   GLboolean (*BufferData)( struct gl_context *ctx, GLenum target, GLsizeiptrARB size,
                             const GLvoid *data, GLenum usage,
                             struct gl_buffer_object *obj );
 
-   void (*BufferSubData)( GLcontext *ctx, GLenum target, GLintptrARB offset,
+   void (*BufferSubData)( struct gl_context *ctx, GLenum target, GLintptrARB offset,
 			  GLsizeiptrARB size, const GLvoid *data,
 			  struct gl_buffer_object *obj );
 
-   void (*GetBufferSubData)( GLcontext *ctx, GLenum target,
+   void (*GetBufferSubData)( struct gl_context *ctx, GLenum target,
 			     GLintptrARB offset, GLsizeiptrARB size,
 			     GLvoid *data, struct gl_buffer_object *obj );
 
-   void * (*MapBuffer)( GLcontext *ctx, GLenum target, GLenum access,
+   void * (*MapBuffer)( struct gl_context *ctx, GLenum target, GLenum access,
 			struct gl_buffer_object *obj );
 
-   void (*CopyBufferSubData)( GLcontext *ctx,
+   void (*CopyBufferSubData)( struct gl_context *ctx,
                               struct gl_buffer_object *src,
                               struct gl_buffer_object *dst,
                               GLintptr readOffset, GLintptr writeOffset,
@@ -761,15 +752,15 @@ struct dd_function_table {
 
    /* May return NULL if MESA_MAP_NOWAIT_BIT is set in access:
     */
-   void * (*MapBufferRange)( GLcontext *ctx, GLenum target, GLintptr offset,
+   void * (*MapBufferRange)( struct gl_context *ctx, GLenum target, GLintptr offset,
                              GLsizeiptr length, GLbitfield access,
                              struct gl_buffer_object *obj);
 
-   void (*FlushMappedBufferRange)(GLcontext *ctx, GLenum target, 
+   void (*FlushMappedBufferRange)(struct gl_context *ctx, GLenum target, 
                                   GLintptr offset, GLsizeiptr length,
                                   struct gl_buffer_object *obj);
 
-   GLboolean (*UnmapBuffer)( GLcontext *ctx, GLenum target,
+   GLboolean (*UnmapBuffer)( struct gl_context *ctx, GLenum target,
 			     struct gl_buffer_object *obj );
    /*@}*/
 
@@ -778,38 +769,38 @@ struct dd_function_table {
     */
    /*@{*/
    /* variations on ObjectPurgeable */
-   GLenum (*BufferObjectPurgeable)( GLcontext *ctx, struct gl_buffer_object *obj, GLenum option );
-   GLenum (*RenderObjectPurgeable)( GLcontext *ctx, struct gl_renderbuffer *obj, GLenum option );
-   GLenum (*TextureObjectPurgeable)( GLcontext *ctx, struct gl_texture_object *obj, GLenum option );
+   GLenum (*BufferObjectPurgeable)( struct gl_context *ctx, struct gl_buffer_object *obj, GLenum option );
+   GLenum (*RenderObjectPurgeable)( struct gl_context *ctx, struct gl_renderbuffer *obj, GLenum option );
+   GLenum (*TextureObjectPurgeable)( struct gl_context *ctx, struct gl_texture_object *obj, GLenum option );
 
    /* variations on ObjectUnpurgeable */
-   GLenum (*BufferObjectUnpurgeable)( GLcontext *ctx, struct gl_buffer_object *obj, GLenum option );
-   GLenum (*RenderObjectUnpurgeable)( GLcontext *ctx, struct gl_renderbuffer *obj, GLenum option );
-   GLenum (*TextureObjectUnpurgeable)( GLcontext *ctx, struct gl_texture_object *obj, GLenum option );
+   GLenum (*BufferObjectUnpurgeable)( struct gl_context *ctx, struct gl_buffer_object *obj, GLenum option );
+   GLenum (*RenderObjectUnpurgeable)( struct gl_context *ctx, struct gl_renderbuffer *obj, GLenum option );
+   GLenum (*TextureObjectUnpurgeable)( struct gl_context *ctx, struct gl_texture_object *obj, GLenum option );
    /*@}*/
 
    /**
     * \name Functions for GL_EXT_framebuffer_{object,blit}.
     */
    /*@{*/
-   struct gl_framebuffer * (*NewFramebuffer)(GLcontext *ctx, GLuint name);
-   struct gl_renderbuffer * (*NewRenderbuffer)(GLcontext *ctx, GLuint name);
-   void (*BindFramebuffer)(GLcontext *ctx, GLenum target,
+   struct gl_framebuffer * (*NewFramebuffer)(struct gl_context *ctx, GLuint name);
+   struct gl_renderbuffer * (*NewRenderbuffer)(struct gl_context *ctx, GLuint name);
+   void (*BindFramebuffer)(struct gl_context *ctx, GLenum target,
                            struct gl_framebuffer *drawFb,
                            struct gl_framebuffer *readFb);
-   void (*FramebufferRenderbuffer)(GLcontext *ctx, 
+   void (*FramebufferRenderbuffer)(struct gl_context *ctx, 
                                    struct gl_framebuffer *fb,
                                    GLenum attachment,
                                    struct gl_renderbuffer *rb);
-   void (*RenderTexture)(GLcontext *ctx,
+   void (*RenderTexture)(struct gl_context *ctx,
                          struct gl_framebuffer *fb,
                          struct gl_renderbuffer_attachment *att);
-   void (*FinishRenderTexture)(GLcontext *ctx,
+   void (*FinishRenderTexture)(struct gl_context *ctx,
                                struct gl_renderbuffer_attachment *att);
-   void (*ValidateFramebuffer)(GLcontext *ctx,
+   void (*ValidateFramebuffer)(struct gl_context *ctx,
                                struct gl_framebuffer *fb);
    /*@}*/
-   void (*BlitFramebuffer)(GLcontext *ctx,
+   void (*BlitFramebuffer)(struct gl_context *ctx,
                            GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
                            GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
                            GLbitfield mask, GLenum filter);
@@ -818,12 +809,12 @@ struct dd_function_table {
     * \name Query objects
     */
    /*@{*/
-   struct gl_query_object * (*NewQueryObject)(GLcontext *ctx, GLuint id);
-   void (*DeleteQuery)(GLcontext *ctx, struct gl_query_object *q);
-   void (*BeginQuery)(GLcontext *ctx, struct gl_query_object *q);
-   void (*EndQuery)(GLcontext *ctx, struct gl_query_object *q);
-   void (*CheckQuery)(GLcontext *ctx, struct gl_query_object *q);
-   void (*WaitQuery)(GLcontext *ctx, struct gl_query_object *q);
+   struct gl_query_object * (*NewQueryObject)(struct gl_context *ctx, GLuint id);
+   void (*DeleteQuery)(struct gl_context *ctx, struct gl_query_object *q);
+   void (*BeginQuery)(struct gl_context *ctx, struct gl_query_object *q);
+   void (*EndQuery)(struct gl_context *ctx, struct gl_query_object *q);
+   void (*CheckQuery)(struct gl_context *ctx, struct gl_query_object *q);
+   void (*WaitQuery)(struct gl_context *ctx, struct gl_query_object *q);
    /*@}*/
 
 
@@ -831,21 +822,21 @@ struct dd_function_table {
     * \name Vertex Array objects
     */
    /*@{*/
-   struct gl_array_object * (*NewArrayObject)(GLcontext *ctx, GLuint id);
-   void (*DeleteArrayObject)(GLcontext *ctx, struct gl_array_object *obj);
-   void (*BindArrayObject)(GLcontext *ctx, struct gl_array_object *obj);
+   struct gl_array_object * (*NewArrayObject)(struct gl_context *ctx, GLuint id);
+   void (*DeleteArrayObject)(struct gl_context *ctx, struct gl_array_object *obj);
+   void (*BindArrayObject)(struct gl_context *ctx, struct gl_array_object *obj);
    /*@}*/
 
    /**
     * \name GLSL-related functions (ARB extensions and OpenGL 2.x)
     */
    /*@{*/
-   struct gl_shader *(*NewShader)(GLcontext *ctx, GLuint name, GLenum type);
-   void (*DeleteShader)(GLcontext *ctx, struct gl_shader *shader);
-   struct gl_shader_program *(*NewShaderProgram)(GLcontext *ctx, GLuint name);
-   void (*DeleteShaderProgram)(GLcontext *ctx,
+   struct gl_shader *(*NewShader)(struct gl_context *ctx, GLuint name, GLenum type);
+   void (*DeleteShader)(struct gl_context *ctx, struct gl_shader *shader);
+   struct gl_shader_program *(*NewShaderProgram)(struct gl_context *ctx, GLuint name);
+   void (*DeleteShaderProgram)(struct gl_context *ctx,
                                struct gl_shader_program *shProg);
-   void (*UseProgram)(GLcontext *ctx, struct gl_shader_program *shProg);
+   void (*UseProgram)(struct gl_context *ctx, struct gl_shader_program *shProg);
    /*@}*/
 
 
@@ -871,7 +862,7 @@ struct dd_function_table {
     * This must be non-NULL if a driver installs a custom T&L module and sets
     * the dd_function_table::NeedValidate bitmask, but may be NULL otherwise.
     */
-   void (*ValidateTnlModule)( GLcontext *ctx, GLuint new_state );
+   void (*ValidateTnlModule)( struct gl_context *ctx, GLuint new_state );
 
 
 #define PRIM_OUTSIDE_BEGIN_END   (GL_POLYGON+1)
@@ -898,7 +889,7 @@ struct dd_function_table {
 #define FLUSH_UPDATE_CURRENT  0x2
    /**
     * Set by the driver-supplied T&L engine whenever vertices are buffered
-    * between glBegin()/glEnd() objects or __GLcontextRec::Current is not
+    * between glBegin()/glEnd() objects or __struct gl_contextRec::Current is not
     * updated.
     *
     * The dd_function_table::FlushVertices call below may be used to resolve
@@ -911,32 +902,32 @@ struct dd_function_table {
    /* Called prior to any of the GLvertexformat functions being
     * called.  Paired with Driver.FlushVertices().
     */
-   void (*BeginVertices)( GLcontext *ctx );
+   void (*BeginVertices)( struct gl_context *ctx );
 
    /**
     * If inside glBegin()/glEnd(), it should ASSERT(0).  Otherwise, if
     * FLUSH_STORED_VERTICES bit in \p flags is set flushes any buffered
     * vertices, if FLUSH_UPDATE_CURRENT bit is set updates
-    * __GLcontextRec::Current and gl_light_attrib::Material
+    * __struct gl_contextRec::Current and gl_light_attrib::Material
     *
     * Note that the default T&L engine never clears the
     * FLUSH_UPDATE_CURRENT bit, even after performing the update.
     */
-   void (*FlushVertices)( GLcontext *ctx, GLuint flags );
-   void (*SaveFlushVertices)( GLcontext *ctx );
+   void (*FlushVertices)( struct gl_context *ctx, GLuint flags );
+   void (*SaveFlushVertices)( struct gl_context *ctx );
 
    /**
     * Give the driver the opportunity to hook in its own vtxfmt for
     * compiling optimized display lists.  This is called on each valid
     * glBegin() during list compilation.
     */
-   GLboolean (*NotifySaveBegin)( GLcontext *ctx, GLenum mode );
+   GLboolean (*NotifySaveBegin)( struct gl_context *ctx, GLenum mode );
 
    /**
     * Notify driver that the special derived value _NeedEyeCoords has
     * changed.
     */
-   void (*LightingSpaceChange)( GLcontext *ctx );
+   void (*LightingSpaceChange)( struct gl_context *ctx );
 
    /**
     * Called by glNewList().
@@ -944,64 +935,64 @@ struct dd_function_table {
     * Let the T&L component know what is going on with display lists
     * in time to make changes to dispatch tables, etc.
     */
-   void (*NewList)( GLcontext *ctx, GLuint list, GLenum mode );
+   void (*NewList)( struct gl_context *ctx, GLuint list, GLenum mode );
    /**
     * Called by glEndList().
     *
     * \sa dd_function_table::NewList.
     */
-   void (*EndList)( GLcontext *ctx );
+   void (*EndList)( struct gl_context *ctx );
 
    /**
     * Called by glCallList(s).
     *
     * Notify the T&L component before and after calling a display list.
     */
-   void (*BeginCallList)( GLcontext *ctx, 
+   void (*BeginCallList)( struct gl_context *ctx, 
 			  struct gl_display_list *dlist );
    /**
     * Called by glEndCallList().
     *
     * \sa dd_function_table::BeginCallList.
     */
-   void (*EndCallList)( GLcontext *ctx );
+   void (*EndCallList)( struct gl_context *ctx );
 
 
    /**
     * \name GL_ARB_sync interfaces
     */
    /*@{*/
-   struct gl_sync_object * (*NewSyncObject)(GLcontext *, GLenum);
-   void (*FenceSync)(GLcontext *, struct gl_sync_object *, GLenum, GLbitfield);
-   void (*DeleteSyncObject)(GLcontext *, struct gl_sync_object *);
-   void (*CheckSync)(GLcontext *, struct gl_sync_object *);
-   void (*ClientWaitSync)(GLcontext *, struct gl_sync_object *,
+   struct gl_sync_object * (*NewSyncObject)(struct gl_context *, GLenum);
+   void (*FenceSync)(struct gl_context *, struct gl_sync_object *, GLenum, GLbitfield);
+   void (*DeleteSyncObject)(struct gl_context *, struct gl_sync_object *);
+   void (*CheckSync)(struct gl_context *, struct gl_sync_object *);
+   void (*ClientWaitSync)(struct gl_context *, struct gl_sync_object *,
 			  GLbitfield, GLuint64);
-   void (*ServerWaitSync)(GLcontext *, struct gl_sync_object *,
+   void (*ServerWaitSync)(struct gl_context *, struct gl_sync_object *,
 			  GLbitfield, GLuint64);
    /*@}*/
 
    /** GL_NV_conditional_render */
-   void (*BeginConditionalRender)(GLcontext *ctx, struct gl_query_object *q,
+   void (*BeginConditionalRender)(struct gl_context *ctx, struct gl_query_object *q,
                                   GLenum mode);
-   void (*EndConditionalRender)(GLcontext *ctx, struct gl_query_object *q);
+   void (*EndConditionalRender)(struct gl_context *ctx, struct gl_query_object *q);
 
    /**
     * \name GL_OES_draw_texture interface
     */
    /*@{*/
-   void (*DrawTex)(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z,
+   void (*DrawTex)(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
                    GLfloat width, GLfloat height);
    /*@}*/
 
    /**
     * \name GL_OES_EGL_image interface
     */
-   void (*EGLImageTargetTexture2D)(GLcontext *ctx, GLenum target,
+   void (*EGLImageTargetTexture2D)(struct gl_context *ctx, GLenum target,
 				   struct gl_texture_object *texObj,
 				   struct gl_texture_image *texImage,
 				   GLeglImageOES image_handle);
-   void (*EGLImageTargetRenderbufferStorage)(GLcontext *ctx,
+   void (*EGLImageTargetRenderbufferStorage)(struct gl_context *ctx,
 					     struct gl_renderbuffer *rb,
 					     void *image_handle);
 
@@ -1009,18 +1000,18 @@ struct dd_function_table {
     * \name GL_EXT_transform_feedback interface
     */
    struct gl_transform_feedback_object *
-        (*NewTransformFeedback)(GLcontext *ctx, GLuint name);
-   void (*DeleteTransformFeedback)(GLcontext *ctx,
+        (*NewTransformFeedback)(struct gl_context *ctx, GLuint name);
+   void (*DeleteTransformFeedback)(struct gl_context *ctx,
                                    struct gl_transform_feedback_object *obj);
-   void (*BeginTransformFeedback)(GLcontext *ctx, GLenum mode,
+   void (*BeginTransformFeedback)(struct gl_context *ctx, GLenum mode,
                                   struct gl_transform_feedback_object *obj);
-   void (*EndTransformFeedback)(GLcontext *ctx,
+   void (*EndTransformFeedback)(struct gl_context *ctx,
                                 struct gl_transform_feedback_object *obj);
-   void (*PauseTransformFeedback)(GLcontext *ctx,
+   void (*PauseTransformFeedback)(struct gl_context *ctx,
                                   struct gl_transform_feedback_object *obj);
-   void (*ResumeTransformFeedback)(GLcontext *ctx,
+   void (*ResumeTransformFeedback)(struct gl_context *ctx,
                                    struct gl_transform_feedback_object *obj);
-   void (*DrawTransformFeedback)(GLcontext *ctx, GLenum mode,
+   void (*DrawTransformFeedback)(struct gl_context *ctx, GLenum mode,
                                  struct gl_transform_feedback_object *obj);
 };
 
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 526145aeccf..a7e65f8d3aa 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -85,13 +85,12 @@ void
 _mesa_print_state( const char *msg, GLuint state )
 {
    _mesa_debug(NULL,
-	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
 	   msg,
 	   state,
 	   (state & _NEW_MODELVIEW)       ? "ctx->ModelView, " : "",
 	   (state & _NEW_PROJECTION)      ? "ctx->Projection, " : "",
 	   (state & _NEW_TEXTURE_MATRIX)  ? "ctx->TextureMatrix, " : "",
-	   (state & _NEW_COLOR_MATRIX)    ? "ctx->ColorMatrix, " : "",
 	   (state & _NEW_ACCUM)           ? "ctx->Accum, " : "",
 	   (state & _NEW_COLOR)           ? "ctx->Color, " : "",
 	   (state & _NEW_DEPTH)           ? "ctx->Depth, " : "",
@@ -234,7 +233,7 @@ static void add_debug_flags( const char *debug )
 
 
 void 
-_mesa_init_debug( GLcontext *ctx )
+_mesa_init_debug( struct gl_context *ctx )
 {
    char *c;
 
@@ -579,7 +578,7 @@ _mesa_dump_stencil_buffer(const char *filename)
  * Quick and dirty function to "print" a texture to stdout.
  */
 void
-_mesa_print_texture(GLcontext *ctx, const struct gl_texture_image *img)
+_mesa_print_texture(struct gl_context *ctx, const struct gl_texture_image *img)
 {
 #if CHAN_TYPE != GL_UNSIGNED_BYTE
    _mesa_problem(NULL, "PrintTexture not supported");
diff --git a/src/mesa/main/debug.h b/src/mesa/main/debug.h
index b517cc8259f..e3bb4dfe813 100644
--- a/src/mesa/main/debug.h
+++ b/src/mesa/main/debug.h
@@ -45,7 +45,7 @@ extern void _mesa_print_tri_caps( const char *name, GLuint flags );
 extern void _mesa_print_enable_flags( const char *msg, GLuint flags );
 extern void _mesa_print_state( const char *msg, GLuint state );
 extern void _mesa_print_info( void );
-extern void _mesa_init_debug( GLcontext *ctx );
+extern void _mesa_init_debug( struct gl_context *ctx );
 
 #else
 
@@ -79,6 +79,6 @@ extern void
 _mesa_dump_stencil_buffer(const char *filename);
 
 extern void
-_mesa_print_texture(GLcontext *ctx, const struct gl_texture_image *img);
+_mesa_print_texture(struct gl_context *ctx, const struct gl_texture_image *img);
 
 #endif
diff --git a/src/mesa/main/depth.c b/src/mesa/main/depth.c
index f187205b978..c5a910e144a 100644
--- a/src/mesa/main/depth.c
+++ b/src/mesa/main/depth.c
@@ -153,7 +153,7 @@ _mesa_DepthBoundsEXT( GLclampd zmin, GLclampd zmax )
  * Initialize the depth buffer attribute group in the given context.
  */
 void
-_mesa_init_depth(GLcontext *ctx)
+_mesa_init_depth(struct gl_context *ctx)
 {
    ctx->Depth.Test = GL_FALSE;
    ctx->Depth.Clear = 1.0;
diff --git a/src/mesa/main/depth.h b/src/mesa/main/depth.h
index dcc0b4637a7..d61d3b121ba 100644
--- a/src/mesa/main/depth.h
+++ b/src/mesa/main/depth.h
@@ -50,7 +50,7 @@ extern void GLAPIENTRY
 _mesa_DepthBoundsEXT( GLclampd zmin, GLclampd zmax );
 
 extern void 
-_mesa_init_depth( GLcontext * ctx );
+_mesa_init_depth( struct gl_context * ctx );
 
 #else
 
diff --git a/src/mesa/main/depthstencil.c b/src/mesa/main/depthstencil.c
index dbaa8416457..c5466dc9fcc 100644
--- a/src/mesa/main/depthstencil.c
+++ b/src/mesa/main/depthstencil.c
@@ -46,7 +46,7 @@
 
 
 static void *
-nop_get_pointer(GLcontext *ctx, struct gl_renderbuffer *rb, GLint x, GLint y)
+nop_get_pointer(struct gl_context *ctx, struct gl_renderbuffer *rb, GLint x, GLint y)
 {
    (void) ctx;
    (void) rb;
@@ -73,7 +73,7 @@ delete_wrapper(struct gl_renderbuffer *rb)
  * Realloc storage for wrapper.
  */
 static GLboolean
-alloc_wrapper_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
+alloc_wrapper_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
                       GLenum internalFormat, GLuint width, GLuint height)
 {
    /* just pass this on to the wrapped renderbuffer */
@@ -103,7 +103,7 @@ alloc_wrapper_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
  */
 
 static void
-get_row_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb, GLuint count,
+get_row_z24(struct gl_context *ctx, struct gl_renderbuffer *z24rb, GLuint count,
             GLint x, GLint y, void *values)
 {
    struct gl_renderbuffer *dsrb = z24rb->Wrapped;
@@ -130,7 +130,7 @@ get_row_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb, GLuint count,
 }
 
 static void
-get_values_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb, GLuint count,
+get_values_z24(struct gl_context *ctx, struct gl_renderbuffer *z24rb, GLuint count,
                const GLint x[], const GLint y[], void *values)
 {
    struct gl_renderbuffer *dsrb = z24rb->Wrapped;
@@ -155,7 +155,7 @@ get_values_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb, GLuint count,
 }
 
 static void
-put_row_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb, GLuint count,
+put_row_z24(struct gl_context *ctx, struct gl_renderbuffer *z24rb, GLuint count,
             GLint x, GLint y, const void *values, const GLubyte *mask)
 {
    struct gl_renderbuffer *dsrb = z24rb->Wrapped;
@@ -206,7 +206,7 @@ put_row_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb, GLuint count,
 }
 
 static void
-put_mono_row_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb, GLuint count,
+put_mono_row_z24(struct gl_context *ctx, struct gl_renderbuffer *z24rb, GLuint count,
                  GLint x, GLint y, const void *value, const GLubyte *mask)
 {
    struct gl_renderbuffer *dsrb = z24rb->Wrapped;
@@ -260,7 +260,7 @@ put_mono_row_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb, GLuint count,
 }
 
 static void
-put_values_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb, GLuint count,
+put_values_z24(struct gl_context *ctx, struct gl_renderbuffer *z24rb, GLuint count,
                const GLint x[], const GLint y[],
                const void *values, const GLubyte *mask)
 {
@@ -313,7 +313,7 @@ put_values_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb, GLuint count,
 }
 
 static void
-put_mono_values_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb,
+put_mono_values_z24(struct gl_context *ctx, struct gl_renderbuffer *z24rb,
                     GLuint count, const GLint x[], const GLint y[],
                     const void *value, const GLubyte *mask)
 {
@@ -348,7 +348,7 @@ put_mono_values_z24(GLcontext *ctx, struct gl_renderbuffer *z24rb,
  * \return new depth renderbuffer
  */
 struct gl_renderbuffer *
-_mesa_new_z24_renderbuffer_wrapper(GLcontext *ctx,
+_mesa_new_z24_renderbuffer_wrapper(struct gl_context *ctx,
                                    struct gl_renderbuffer *dsrb)
 {
    struct gl_renderbuffer *z24rb;
@@ -396,7 +396,7 @@ _mesa_new_z24_renderbuffer_wrapper(GLcontext *ctx,
  */
 
 static void
-get_row_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
+get_row_s8(struct gl_context *ctx, struct gl_renderbuffer *s8rb, GLuint count,
            GLint x, GLint y, void *values)
 {
    struct gl_renderbuffer *dsrb = s8rb->Wrapped;
@@ -423,7 +423,7 @@ get_row_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
 }
 
 static void
-get_values_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
+get_values_s8(struct gl_context *ctx, struct gl_renderbuffer *s8rb, GLuint count,
               const GLint x[], const GLint y[], void *values)
 {
    struct gl_renderbuffer *dsrb = s8rb->Wrapped;
@@ -448,7 +448,7 @@ get_values_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
 }
 
 static void
-put_row_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
+put_row_s8(struct gl_context *ctx, struct gl_renderbuffer *s8rb, GLuint count,
            GLint x, GLint y, const void *values, const GLubyte *mask)
 {
    struct gl_renderbuffer *dsrb = s8rb->Wrapped;
@@ -499,7 +499,7 @@ put_row_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
 }
 
 static void
-put_mono_row_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
+put_mono_row_s8(struct gl_context *ctx, struct gl_renderbuffer *s8rb, GLuint count,
                 GLint x, GLint y, const void *value, const GLubyte *mask)
 {
    struct gl_renderbuffer *dsrb = s8rb->Wrapped;
@@ -550,7 +550,7 @@ put_mono_row_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
 }
 
 static void
-put_values_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
+put_values_s8(struct gl_context *ctx, struct gl_renderbuffer *s8rb, GLuint count,
               const GLint x[], const GLint y[],
               const void *values, const GLubyte *mask)
 {
@@ -603,7 +603,7 @@ put_values_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
 }
 
 static void
-put_mono_values_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
+put_mono_values_s8(struct gl_context *ctx, struct gl_renderbuffer *s8rb, GLuint count,
                    const GLint x[], const GLint y[],
                    const void *value, const GLubyte *mask)
 {
@@ -637,7 +637,7 @@ put_mono_values_s8(GLcontext *ctx, struct gl_renderbuffer *s8rb, GLuint count,
  * \return new stencil renderbuffer
  */
 struct gl_renderbuffer *
-_mesa_new_s8_renderbuffer_wrapper(GLcontext *ctx, struct gl_renderbuffer *dsrb)
+_mesa_new_s8_renderbuffer_wrapper(struct gl_context *ctx, struct gl_renderbuffer *dsrb)
 {
    struct gl_renderbuffer *s8rb;
 
@@ -698,7 +698,7 @@ _mesa_new_s8_renderbuffer_wrapper(GLcontext *ctx, struct gl_renderbuffer *dsrb)
  *                   (either 8-bit or 32-bit)
  */
 void
-_mesa_extract_stencil(GLcontext *ctx,
+_mesa_extract_stencil(struct gl_context *ctx,
                       struct gl_renderbuffer *dsRb,
                       struct gl_renderbuffer *stencilRb)
 {
@@ -747,7 +747,7 @@ _mesa_extract_stencil(GLcontext *ctx,
  * \param stencilRb  the source stencil buffer (either 8-bit or 32-bit)
  */
 void
-_mesa_insert_stencil(GLcontext *ctx,
+_mesa_insert_stencil(struct gl_context *ctx,
                      struct gl_renderbuffer *dsRb,
                      struct gl_renderbuffer *stencilRb)
 {
@@ -803,7 +803,7 @@ _mesa_insert_stencil(GLcontext *ctx,
  * \param stencilRb  the stencil renderbuffer to promote
  */
 void
-_mesa_promote_stencil(GLcontext *ctx, struct gl_renderbuffer *stencilRb)
+_mesa_promote_stencil(struct gl_context *ctx, struct gl_renderbuffer *stencilRb)
 {
    const GLsizei width = stencilRb->Width;
    const GLsizei height = stencilRb->Height;
diff --git a/src/mesa/main/depthstencil.h b/src/mesa/main/depthstencil.h
index afbac77f0e2..4db5868263a 100644
--- a/src/mesa/main/depthstencil.h
+++ b/src/mesa/main/depthstencil.h
@@ -29,29 +29,29 @@
 #include "mtypes.h"
 
 extern struct gl_renderbuffer *
-_mesa_new_z24_renderbuffer_wrapper(GLcontext *ctx,
+_mesa_new_z24_renderbuffer_wrapper(struct gl_context *ctx,
                                    struct gl_renderbuffer *dsrb);
 
 
 extern struct gl_renderbuffer *
-_mesa_new_s8_renderbuffer_wrapper(GLcontext *ctx,
+_mesa_new_s8_renderbuffer_wrapper(struct gl_context *ctx,
                                   struct gl_renderbuffer *dsrb);
 
 
 extern void
-_mesa_extract_stencil(GLcontext *ctx,
+_mesa_extract_stencil(struct gl_context *ctx,
                       struct gl_renderbuffer *dsRb,
                       struct gl_renderbuffer *stencilRb);
 
 
 extern void
-_mesa_insert_stencil(GLcontext *ctx,
+_mesa_insert_stencil(struct gl_context *ctx,
                      struct gl_renderbuffer *dsRb,
                      struct gl_renderbuffer *stencilRb);
 
 
 extern void
-_mesa_promote_stencil(GLcontext *ctx, struct gl_renderbuffer *stencilRb);
+_mesa_promote_stencil(struct gl_context *ctx, struct gl_renderbuffer *stencilRb);
 
 
 #endif /* DEPTHSTENCIL_H */
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index d847d4d5d3c..f513f31c56e 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -52,7 +52,6 @@
 #include "hash.h"
 #include "image.h"
 #include "light.h"
-#include "dlist.h"
 #include "macros.h"
 #include "queryobj.h"
 #include "teximage.h"
@@ -78,9 +77,9 @@
 struct gl_list_instruction
 {
    GLuint Size;
-   void (*Execute)( GLcontext *ctx, void *data );
-   void (*Destroy)( GLcontext *ctx, void *data );
-   void (*Print)( GLcontext *ctx, void *data );
+   void (*Execute)( struct gl_context *ctx, void *data );
+   void (*Destroy)( struct gl_context *ctx, void *data );
+   void (*Print)( struct gl_context *ctx, void *data );
 };
 
 
@@ -497,7 +496,7 @@ make_list(GLuint name, GLuint count)
  * Lookup function to just encapsulate casting.
  */
 static INLINE struct gl_display_list *
-lookup_list(GLcontext *ctx, GLuint list)
+lookup_list(struct gl_context *ctx, GLuint list)
 {
    return (struct gl_display_list *)
       _mesa_HashLookup(ctx->Shared->DisplayList, list);
@@ -514,7 +513,7 @@ is_ext_opcode(OpCode opcode)
 
 /** Destroy an extended opcode instruction */
 static GLint
-ext_opcode_destroy(GLcontext *ctx, Node *node)
+ext_opcode_destroy(struct gl_context *ctx, Node *node)
 {
    const GLint i = node[0].opcode - OPCODE_EXT_0;
    GLint step;
@@ -526,7 +525,7 @@ ext_opcode_destroy(GLcontext *ctx, Node *node)
 
 /** Execute an extended opcode instruction */
 static GLint
-ext_opcode_execute(GLcontext *ctx, Node *node)
+ext_opcode_execute(struct gl_context *ctx, Node *node)
 {
    const GLint i = node[0].opcode - OPCODE_EXT_0;
    GLint step;
@@ -538,7 +537,7 @@ ext_opcode_execute(GLcontext *ctx, Node *node)
 
 /** Print an extended opcode instruction */
 static GLint
-ext_opcode_print(GLcontext *ctx, Node *node)
+ext_opcode_print(struct gl_context *ctx, Node *node)
 {
    const GLint i = node[0].opcode - OPCODE_EXT_0;
    GLint step;
@@ -553,7 +552,7 @@ ext_opcode_print(GLcontext *ctx, Node *node)
  * \param dlist - display list pointer
  */
 void
-_mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist)
+_mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist)
 {
    Node *n, *block;
    GLboolean done;
@@ -731,7 +730,7 @@ _mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist)
  * \param list - display list number
  */
 static void
-destroy_list(GLcontext *ctx, GLuint list)
+destroy_list(struct gl_context *ctx, GLuint list)
 {
    struct gl_display_list *dlist;
 
@@ -815,7 +814,7 @@ translate_id(GLsizei n, GLenum type, const GLvoid * list)
  * If we run out of memory, GL_OUT_OF_MEMORY will be recorded.
  */
 static GLvoid *
-unpack_image(GLcontext *ctx, GLuint dimensions,
+unpack_image(struct gl_context *ctx, GLuint dimensions,
              GLsizei width, GLsizei height, GLsizei depth,
              GLenum format, GLenum type, const GLvoid * pixels,
              const struct gl_pixelstore_attrib *unpack)
@@ -867,7 +866,7 @@ unpack_image(GLcontext *ctx, GLuint dimensions,
  * \return pointer to allocated memory (the opcode space)
  */
 static Node *
-dlist_alloc(GLcontext *ctx, OpCode opcode, GLuint bytes)
+dlist_alloc(struct gl_context *ctx, OpCode opcode, GLuint bytes)
 {
    const GLuint numNodes = 1 + (bytes + sizeof(Node) - 1) / sizeof(Node);
    Node *n;
@@ -918,7 +917,7 @@ dlist_alloc(GLcontext *ctx, OpCode opcode, GLuint bytes)
  *         opcode).
  */
 void *
-_mesa_dlist_alloc(GLcontext *ctx, GLuint opcode, GLuint bytes)
+_mesa_dlist_alloc(struct gl_context *ctx, GLuint opcode, GLuint bytes)
 {
    Node *n = dlist_alloc(ctx, (OpCode) opcode, bytes);
    if (n)
@@ -939,11 +938,11 @@ _mesa_dlist_alloc(GLcontext *ctx, GLuint opcode, GLuint bytes)
  * \return  the new opcode number or -1 if error
  */
 GLint
-_mesa_dlist_alloc_opcode(GLcontext *ctx,
+_mesa_dlist_alloc_opcode(struct gl_context *ctx,
                          GLuint size,
-                         void (*execute) (GLcontext *, void *),
-                         void (*destroy) (GLcontext *, void *),
-                         void (*print) (GLcontext *, void *))
+                         void (*execute) (struct gl_context *, void *),
+                         void (*destroy) (struct gl_context *, void *),
+                         void (*print) (struct gl_context *, void *))
 {
    if (ctx->ListExt->NumOpcodes < MAX_DLIST_EXT_OPCODES) {
       const GLuint i = ctx->ListExt->NumOpcodes++;
@@ -968,7 +967,7 @@ _mesa_dlist_alloc_opcode(GLcontext *ctx,
  * \return  pointer to start of instruction space
  */
 static INLINE Node *
-alloc_instruction(GLcontext *ctx, OpCode opcode, GLuint nparams)
+alloc_instruction(struct gl_context *ctx, OpCode opcode, GLuint nparams)
 {
    return dlist_alloc(ctx, opcode, nparams * sizeof(Node));
 }
@@ -1133,7 +1132,7 @@ save_BlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
    }
 }
 
-static void invalidate_saved_current_state( GLcontext *ctx )
+static void invalidate_saved_current_state( struct gl_context *ctx )
 {
    GLint i;
 
@@ -1552,7 +1551,6 @@ save_ColorTableParameterfv(GLenum target, GLenum pname,
       n[3].f = params[0];
       if (pname == GL_COLOR_TABLE_SGI ||
           pname == GL_POST_CONVOLUTION_COLOR_TABLE_SGI ||
-          pname == GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI ||
           pname == GL_TEXTURE_COLOR_TABLE_SGI) {
          n[4].f = params[1];
          n[5].f = params[2];
@@ -1581,7 +1579,6 @@ save_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params)
       n[3].i = params[0];
       if (pname == GL_COLOR_TABLE_SGI ||
           pname == GL_POST_CONVOLUTION_COLOR_TABLE_SGI ||
-          pname == GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI ||
           pname == GL_TEXTURE_COLOR_TABLE_SGI) {
          n[4].i = params[1];
          n[5].i = params[2];
@@ -6798,7 +6795,7 @@ save_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
  * command that provoked the error.  I don't see this as a problem.
  */
 static void
-save_error(GLcontext *ctx, GLenum error, const char *s)
+save_error(struct gl_context *ctx, GLenum error, const char *s)
 {
    Node *n;
    n = alloc_instruction(ctx, OPCODE_ERROR, 2);
@@ -6813,7 +6810,7 @@ save_error(GLcontext *ctx, GLenum error, const char *s)
  * Compile an error into current display list.
  */
 void
-_mesa_compile_error(GLcontext *ctx, GLenum error, const char *s)
+_mesa_compile_error(struct gl_context *ctx, GLenum error, const char *s)
 {
    if (ctx->CompileFlag)
       save_error(ctx, error, s);
@@ -6826,7 +6823,7 @@ _mesa_compile_error(GLcontext *ctx, GLenum error, const char *s)
  * Test if ID names a display list.
  */
 static GLboolean
-islist(GLcontext *ctx, GLuint list)
+islist(struct gl_context *ctx, GLuint list)
 {
    if (list > 0 && lookup_list(ctx, list)) {
       return GL_TRUE;
@@ -6850,7 +6847,7 @@ islist(GLcontext *ctx, GLuint list)
  * \param list - display list number
  */
 static void
-execute_list(GLcontext *ctx, GLuint list)
+execute_list(struct gl_context *ctx, GLuint list)
 {
    struct gl_display_list *dlist;
    Node *n;
@@ -9580,7 +9577,7 @@ enum_string(GLenum k)
  * TODO: many commands aren't handled yet.
  */
 static void GLAPIENTRY
-print_list(GLcontext *ctx, GLuint list)
+print_list(struct gl_context *ctx, GLuint list)
 {
    struct gl_display_list *dlist;
    Node *n;
@@ -9972,7 +9969,7 @@ void _mesa_init_dlist_dispatch(struct _glapi_table *disp)
  * Initialize display list state for given context.
  */
 void
-_mesa_init_display_list(GLcontext *ctx)
+_mesa_init_display_list(struct gl_context *ctx)
 {
    static GLboolean tableInitialized = GL_FALSE;
 
@@ -10002,7 +9999,7 @@ _mesa_init_display_list(GLcontext *ctx)
 
 
 void
-_mesa_free_display_list_data(GLcontext *ctx)
+_mesa_free_display_list_data(struct gl_context *ctx)
 {
    free(ctx->ListExt);
    ctx->ListExt = NULL;
diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h
index 86bb132e56e..24241a4bd4f 100644
--- a/src/mesa/main/dlist.h
+++ b/src/mesa/main/dlist.h
@@ -49,16 +49,16 @@ extern void GLAPIENTRY _mesa_CallList( GLuint list );
 extern void GLAPIENTRY _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists );
 
 
-extern void _mesa_compile_error( GLcontext *ctx, GLenum error, const char *s );
+extern void _mesa_compile_error( struct gl_context *ctx, GLenum error, const char *s );
 
-extern void *_mesa_dlist_alloc(GLcontext *ctx, GLuint opcode, GLuint sz);
+extern void *_mesa_dlist_alloc(struct gl_context *ctx, GLuint opcode, GLuint sz);
 
-extern GLint _mesa_dlist_alloc_opcode( GLcontext *ctx, GLuint sz,
-                                       void (*execute)( GLcontext *, void * ),
-                                       void (*destroy)( GLcontext *, void * ),
-                                       void (*print)( GLcontext *, void * ) );
+extern GLint _mesa_dlist_alloc_opcode( struct gl_context *ctx, GLuint sz,
+                                       void (*execute)( struct gl_context *, void * ),
+                                       void (*destroy)( struct gl_context *, void * ),
+                                       void (*print)( struct gl_context *, void * ) );
 
-extern void _mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist);
+extern void _mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist);
 
 extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt );
 
@@ -76,7 +76,7 @@ extern void _mesa_init_dlist_dispatch(struct _glapi_table *disp);
 #define _MESA_INIT_DLIST_VTXFMT(vfmt, impl) do { } while (0)
 
 static INLINE void
-_mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist)
+_mesa_delete_list(struct gl_context *ctx, struct gl_display_list *dlist)
 {
    /* there should be no list to delete */
    ASSERT_NO_FEATURE();
@@ -95,9 +95,9 @@ _mesa_init_dlist_dispatch(struct _glapi_table *disp)
 
 #endif /* FEATURE_dlist */
 
-extern void _mesa_init_display_list( GLcontext * ctx );
+extern void _mesa_init_display_list( struct gl_context * ctx );
 
-extern void _mesa_free_display_list_data(GLcontext *ctx);
+extern void _mesa_free_display_list_data(struct gl_context *ctx);
 
 
 #endif /* DLIST_H */
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index bf36a7e7a49..ac92a3fb084 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -43,7 +43,7 @@
  * \return GL_TRUE if valid, GL_FALSE otherwise
  */
 static GLboolean
-valid_fragment_program(GLcontext *ctx)
+valid_fragment_program(struct gl_context *ctx)
 {
    return !(ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled);
 }
diff --git a/src/mesa/main/drawtex.c b/src/mesa/main/drawtex.c
index c2ad5f23862..b9afc9974e0 100644
--- a/src/mesa/main/drawtex.c
+++ b/src/mesa/main/drawtex.c
@@ -30,7 +30,7 @@
 
 
 static void
-draw_texture(GLcontext *ctx, GLfloat x, GLfloat y, GLfloat z,
+draw_texture(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
              GLfloat width, GLfloat height)
 {
    if (!ctx->Extensions.OES_draw_texture) {
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index db30123c0fb..5a5b199df32 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -50,7 +50,7 @@
  * Helper to enable/disable client-side state.
  */
 static void
-client_state(GLcontext *ctx, GLenum cap, GLboolean state)
+client_state(struct gl_context *ctx, GLenum cap, GLboolean state)
 {
    struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
    GLuint flag;
@@ -207,7 +207,7 @@ _mesa_DisableClientState( GLenum cap )
  * higher than the number of supported coordinate units.  And we'll return NULL.
  */
 static struct gl_texture_unit *
-get_texcoord_unit(GLcontext *ctx)
+get_texcoord_unit(struct gl_context *ctx)
 {
    if (ctx->Texture.CurrentUnit >= ctx->Const.MaxTextureCoordUnits) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glEnable/Disable(texcoord unit)");
@@ -225,7 +225,7 @@ get_texcoord_unit(GLcontext *ctx)
  * \return GL_TRUE if state is changing or GL_FALSE if no change
  */
 static GLboolean
-enable_texture(GLcontext *ctx, GLboolean state, GLbitfield texBit)
+enable_texture(struct gl_context *ctx, GLboolean state, GLbitfield texBit)
 {
    struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);
    const GLbitfield newenabled = state
@@ -253,7 +253,7 @@ enable_texture(GLcontext *ctx, GLboolean state, GLbitfield texBit)
  * dd_function_table::Enable.
  */
 void
-_mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
+_mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
 {
    if (MESA_VERBOSE & VERBOSE_API)
       _mesa_debug(ctx, "%s %s (newstate is %x)\n",
@@ -335,13 +335,6 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
          FLUSH_VERTICES(ctx, _NEW_POLYGON);
          ctx->Polygon.CullFlag = state;
          break;
-      case GL_CULL_VERTEX_EXT:
-         CHECK_EXTENSION(EXT_cull_vertex, cap);
-         if (ctx->Transform.CullVertexFlag == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-         ctx->Transform.CullVertexFlag = state;
-         break;
       case GL_DEPTH_TEST:
          if (ctx->Depth.Test == state)
             return;
@@ -363,13 +356,6 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
          FLUSH_VERTICES(ctx, _NEW_FOG);
          ctx->Fog.Enabled = state;
          break;
-      case GL_HISTOGRAM:
-         CHECK_EXTENSION(EXT_histogram, cap);
-         if (ctx->Pixel.HistogramEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.HistogramEnabled = state;
-         break;
       case GL_LIGHT0:
       case GL_LIGHT1:
       case GL_LIGHT2:
@@ -534,12 +520,6 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
          FLUSH_VERTICES(ctx, _NEW_EVAL);
          ctx->Eval.Map2Vertex4 = state;
          break;
-      case GL_MINMAX:
-         if (ctx->Pixel.MinMaxEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.MinMaxEnabled = state;
-         break;
       case GL_NORMALIZE:
          if (ctx->Transform.Normalize == state)
             return;
@@ -716,28 +696,7 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
          client_state( ctx, cap, state );
          return;
 
-      /* GL_SGI_color_table */
-      case GL_COLOR_TABLE_SGI:
-         CHECK_EXTENSION(SGI_color_table, cap);
-         if (ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION] == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION] = state;
-         break;
-      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
-         CHECK_EXTENSION(SGI_color_table, cap);
-         if (ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION] == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION] = state;
-         break;
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
-         CHECK_EXTENSION(SGI_color_table, cap);
-         if (ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX] == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX] = state;
-         break;
+      /* GL_SGI_texture_color_table */
       case GL_TEXTURE_COLOR_TABLE_SGI:
          CHECK_EXTENSION(SGI_texture_color_table, cap);
          if (ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled == state)
@@ -746,29 +705,6 @@ _mesa_set_enable(GLcontext *ctx, GLenum cap, GLboolean state)
          ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled = state;
          break;
 
-      /* GL_EXT_convolution */
-      case GL_CONVOLUTION_1D:
-         CHECK_EXTENSION(EXT_convolution, cap);
-         if (ctx->Pixel.Convolution1DEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.Convolution1DEnabled = state;
-         break;
-      case GL_CONVOLUTION_2D:
-         CHECK_EXTENSION(EXT_convolution, cap);
-         if (ctx->Pixel.Convolution2DEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.Convolution2DEnabled = state;
-         break;
-      case GL_SEPARABLE_2D:
-         CHECK_EXTENSION(EXT_convolution, cap);
-         if (ctx->Pixel.Separable2DEnabled == state)
-            return;
-         FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.Separable2DEnabled = state;
-         break;
-
       /* GL_ARB_texture_cube_map */
       case GL_TEXTURE_CUBE_MAP_ARB:
          CHECK_EXTENSION(ARB_texture_cube_map, cap);
@@ -1069,7 +1005,7 @@ _mesa_Disable( GLenum cap )
  * Enable/disable an indexed state var.
  */
 void
-_mesa_set_enablei(GLcontext *ctx, GLenum cap, GLuint index, GLboolean state)
+_mesa_set_enablei(struct gl_context *ctx, GLenum cap, GLuint index, GLboolean state)
 {
    ASSERT(state == 0 || state == 1);
    switch (cap) {
@@ -1159,7 +1095,7 @@ _mesa_IsEnabledIndexed( GLenum cap, GLuint index )
  * Helper function to determine whether a texture target is enabled.
  */
 static GLboolean
-is_texture_enabled(GLcontext *ctx, GLbitfield bit)
+is_texture_enabled(struct gl_context *ctx, GLbitfield bit)
 {
    const struct gl_texture_unit *const texUnit =
        &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
@@ -1356,41 +1292,11 @@ _mesa_IsEnabled( GLenum cap )
          return (ctx->Array.ArrayObj->PointSize.Enabled != 0);
 #endif
 
-      /* GL_EXT_histogram */
-      case GL_HISTOGRAM:
-         CHECK_EXTENSION(EXT_histogram);
-         return ctx->Pixel.HistogramEnabled;
-      case GL_MINMAX:
-         CHECK_EXTENSION(EXT_histogram);
-         return ctx->Pixel.MinMaxEnabled;
-
-      /* GL_SGI_color_table */
-      case GL_COLOR_TABLE_SGI:
-         CHECK_EXTENSION(SGI_color_table);
-         return ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION];
-      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
-         CHECK_EXTENSION(SGI_color_table);
-         return ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION];
-      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
-         CHECK_EXTENSION(SGI_color_table);
-         return ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX];
-
       /* GL_SGI_texture_color_table */
       case GL_TEXTURE_COLOR_TABLE_SGI:
          CHECK_EXTENSION(SGI_texture_color_table);
          return ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled;
 
-      /* GL_EXT_convolution */
-      case GL_CONVOLUTION_1D:
-         CHECK_EXTENSION(EXT_convolution);
-         return ctx->Pixel.Convolution1DEnabled;
-      case GL_CONVOLUTION_2D:
-         CHECK_EXTENSION(EXT_convolution);
-         return ctx->Pixel.Convolution2DEnabled;
-      case GL_SEPARABLE_2D:
-         CHECK_EXTENSION(EXT_convolution);
-         return ctx->Pixel.Separable2DEnabled;
-
       /* GL_ARB_texture_cube_map */
       case GL_TEXTURE_CUBE_MAP_ARB:
          CHECK_EXTENSION(ARB_texture_cube_map);
diff --git a/src/mesa/main/enable.h b/src/mesa/main/enable.h
index 24e3181a8ba..69e52b1cb26 100644
--- a/src/mesa/main/enable.h
+++ b/src/mesa/main/enable.h
@@ -36,7 +36,7 @@
 
 
 extern void
-_mesa_set_enable( GLcontext* ctx, GLenum cap, GLboolean state );
+_mesa_set_enable( struct gl_context* ctx, GLenum cap, GLboolean state );
 
 extern void GLAPIENTRY
 _mesa_Disable( GLenum cap );
@@ -48,7 +48,7 @@ extern GLboolean GLAPIENTRY
 _mesa_IsEnabled( GLenum cap );
 
 extern void
-_mesa_set_enablei(GLcontext *ctx, GLenum cap, GLuint index, GLboolean state);
+_mesa_set_enablei(struct gl_context *ctx, GLenum cap, GLuint index, GLboolean state);
 
 extern void GLAPIENTRY
 _mesa_DisableIndexed( GLenum cap, GLuint index );
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c
index bd2e1177fd2..c607e6a26af 100644
--- a/src/mesa/main/eval.c
+++ b/src/mesa/main/eval.c
@@ -100,7 +100,7 @@ GLuint _mesa_evaluator_components( GLenum target )
  * Return pointer to the gl_1d_map struct for the named target.
  */
 static struct gl_1d_map *
-get_1d_map( GLcontext *ctx, GLenum target )
+get_1d_map( struct gl_context *ctx, GLenum target )
 {
    switch (target) {
       case GL_MAP1_VERTEX_3:
@@ -150,7 +150,7 @@ get_1d_map( GLcontext *ctx, GLenum target )
  * Return pointer to the gl_2d_map struct for the named target.
  */
 static struct gl_2d_map *
-get_2d_map( GLcontext *ctx, GLenum target )
+get_2d_map( struct gl_context *ctx, GLenum target )
 {
    switch (target) {
       case GL_MAP2_VERTEX_3:
@@ -880,7 +880,7 @@ init_2d_map( struct gl_2d_map *map, int n, const float *initial )
 }
 
 
-void _mesa_init_eval( GLcontext *ctx )
+void _mesa_init_eval( struct gl_context *ctx )
 {
    int i;
 
@@ -952,7 +952,7 @@ void _mesa_init_eval( GLcontext *ctx )
 }
 
 
-void _mesa_free_eval_data( GLcontext *ctx )
+void _mesa_free_eval_data( struct gl_context *ctx )
 {
    int i;
 
diff --git a/src/mesa/main/eval.h b/src/mesa/main/eval.h
index ffd1bab76da..bd908f00cdd 100644
--- a/src/mesa/main/eval.h
+++ b/src/mesa/main/eval.h
@@ -57,7 +57,7 @@
 extern GLuint _mesa_evaluator_components( GLenum target );
 
 
-extern void gl_free_control_points( GLcontext *ctx,
+extern void gl_free_control_points( struct gl_context *ctx,
                                     GLenum target, GLfloat *data );
 
 
@@ -103,8 +103,8 @@ _mesa_init_eval_dispatch(struct _glapi_table *disp)
 
 #endif /* FEATURE_evaluators */
 
-extern void _mesa_init_eval( GLcontext *ctx );
-extern void _mesa_free_eval_data( GLcontext *ctx );
+extern void _mesa_init_eval( struct gl_context *ctx );
+extern void _mesa_free_eval_data( struct gl_context *ctx );
 
 
 #endif /* EVAL_H */
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 50b97f51132..bc8cbef1320 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -45,24 +45,23 @@ static const struct {
    int flag_offset;
 } default_extensions[] = {
    { OFF, "GL_ARB_blend_func_extended",        F(ARB_blend_func_extended) },
-   { OFF, "GL_ARB_copy_buffer",                F(ARB_copy_buffer) },
+   { ON,  "GL_ARB_copy_buffer",                F(ARB_copy_buffer) },
    { OFF, "GL_ARB_depth_buffer_float",         F(ARB_depth_buffer_float) },
    { OFF, "GL_ARB_depth_clamp",                F(ARB_depth_clamp) },
    { OFF, "GL_ARB_depth_texture",              F(ARB_depth_texture) },
    { ON,  "GL_ARB_draw_buffers",               F(ARB_draw_buffers) },
    { OFF, "GL_ARB_draw_elements_base_vertex",  F(ARB_draw_elements_base_vertex) },
    { OFF, "GL_ARB_draw_instanced",             F(ARB_draw_instanced) },
+   { OFF, "GL_ARB_explicit_attrib_location",   F(ARB_explicit_attrib_location) },
    { OFF, "GL_ARB_fragment_coord_conventions", F(ARB_fragment_coord_conventions) },
    { OFF, "GL_ARB_fragment_program",           F(ARB_fragment_program) },
    { OFF, "GL_ARB_fragment_program_shadow",    F(ARB_fragment_program_shadow) },
    { OFF, "GL_ARB_fragment_shader",            F(ARB_fragment_shader) },
    { OFF, "GL_ARB_framebuffer_object",         F(ARB_framebuffer_object) },
-   { OFF, "GL_ARB_explicit_attrib_location",   F(ARB_explicit_attrib_location) },
    /* TODO: reenable this when the new GLSL compiler actually supports them */
    /* { OFF, "GL_ARB_geometry_shader4",           F(ARB_geometry_shader4) }, */
    { OFF, "GL_ARB_half_float_pixel",           F(ARB_half_float_pixel) },
    { OFF, "GL_ARB_half_float_vertex",          F(ARB_half_float_vertex) },
-   { OFF, "GL_ARB_imaging",                    F(ARB_imaging) },
    { OFF, "GL_ARB_instanced_arrays",           F(ARB_instanced_arrays) },
    { OFF, "GL_ARB_map_buffer_range",           F(ARB_map_buffer_range) },
    { ON,  "GL_ARB_multisample",                F(ARB_multisample) },
@@ -76,14 +75,15 @@ static const struct {
    { OFF, "GL_ARB_sampler_objects",            F(ARB_sampler_objects) },
    { OFF, "GL_ARB_seamless_cube_map",          F(ARB_seamless_cube_map) },
    { OFF, "GL_ARB_shader_objects",             F(ARB_shader_objects) },
+   { OFF, "GL_ARB_shader_stencil_export",      F(ARB_shader_stencil_export) },
    { OFF, "GL_ARB_shading_language_100",       F(ARB_shading_language_100) },
-   { OFF, "GL_ARB_shading_language_120",       F(ARB_shading_language_120) },
    { OFF, "GL_ARB_shadow",                     F(ARB_shadow) },
    { OFF, "GL_ARB_shadow_ambient",             F(ARB_shadow_ambient) },
    { OFF, "GL_ARB_sync",                       F(ARB_sync) },
    { OFF, "GL_ARB_texture_border_clamp",       F(ARB_texture_border_clamp) },
    { OFF, "GL_ARB_texture_buffer_object",      F(ARB_texture_buffer_object) },
    { ON,  "GL_ARB_texture_compression",        F(ARB_texture_compression) },
+   { OFF, "GL_ARB_texture_compression_rgtc",   F(ARB_texture_compression_rgtc) },
    { OFF, "GL_ARB_texture_cube_map",           F(ARB_texture_cube_map) },
    { OFF, "GL_ARB_texture_env_add",            F(EXT_texture_env_add) },
    { OFF, "GL_ARB_texture_env_combine",        F(ARB_texture_env_combine) },
@@ -116,9 +116,7 @@ static const struct {
    { OFF, "GL_EXT_blend_minmax",               F(EXT_blend_minmax) },
    { OFF, "GL_EXT_blend_subtract",             F(EXT_blend_subtract) },
    { OFF, "GL_EXT_clip_volume_hint",           F(EXT_clip_volume_hint) },
-   { OFF, "GL_EXT_cull_vertex",                F(EXT_cull_vertex) },
    { ON,  "GL_EXT_compiled_vertex_array",      F(EXT_compiled_vertex_array) },
-   { OFF, "GL_EXT_convolution",                F(EXT_convolution) },
    { ON,  "GL_EXT_copy_texture",               F(EXT_copy_texture) },
    { OFF, "GL_EXT_depth_bounds_test",          F(EXT_depth_bounds_test) },
    { OFF, "GL_EXT_draw_buffers2",              F(EXT_draw_buffers2) },
@@ -130,7 +128,6 @@ static const struct {
    { OFF, "GL_EXT_framebuffer_sRGB",           F(EXT_framebuffer_sRGB) },
    { OFF, "GL_EXT_fog_coord",                  F(EXT_fog_coord) },
    { OFF, "GL_EXT_gpu_program_parameters",     F(EXT_gpu_program_parameters) },
-   { OFF, "GL_EXT_histogram",                  F(EXT_histogram) },
    { ON,  "GL_EXT_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
    { OFF, "GL_EXT_packed_depth_stencil",       F(EXT_packed_depth_stencil) },
    { OFF, "GL_EXT_packed_float",               F(EXT_packed_float) },
@@ -152,7 +149,7 @@ static const struct {
    { ON,  "GL_EXT_texture3D",                  F(EXT_texture3D) },
    { OFF, "GL_EXT_texture_array",              F(EXT_texture_array) },
    { OFF, "GL_EXT_texture_compression_s3tc",   F(EXT_texture_compression_s3tc) },
-   { OFF, "GL_EXT_texture_compression_rgtc",   F(EXT_texture_compression_rgtc) },
+   { OFF, "GL_EXT_texture_compression_rgtc",   F(ARB_texture_compression_rgtc) },
    { OFF, "GL_EXT_texture_cube_map",           F(ARB_texture_cube_map) },
    { ON,  "GL_EXT_texture_edge_clamp",         F(SGIS_texture_edge_clamp) },
    { OFF, "GL_EXT_texture_env_add",            F(EXT_texture_env_add) },
@@ -188,7 +185,6 @@ static const struct {
    { OFF, "GL_IBM_texture_mirrored_repeat",    F(ARB_texture_mirrored_repeat)},
    { OFF, "GL_INGR_blend_func_separate",       F(EXT_blend_func_separate) },
    { OFF, "GL_MESA_pack_invert",               F(MESA_pack_invert) },
-   { OFF, "GL_MESA_packed_depth_stencil",      F(MESA_packed_depth_stencil) },
    { OFF, "GL_MESA_resize_buffers",            F(MESA_resize_buffers) },
    { OFF, "GL_MESA_texture_array",             F(MESA_texture_array) },
    { OFF, "GL_MESA_texture_signed_rgba",       F(MESA_texture_signed_rgba) },
@@ -209,15 +205,14 @@ static const struct {
    { OFF, "GL_NV_vertex_program",              F(NV_vertex_program) },
    { OFF, "GL_NV_vertex_program1_1",           F(NV_vertex_program1_1) },
    { ON,  "GL_OES_read_format",                F(OES_read_format) },
-   { OFF, "GL_SGI_color_matrix",               F(SGI_color_matrix) },
-   { OFF, "GL_SGI_color_table",                F(SGI_color_table) },
    { OFF, "GL_SGI_texture_color_table",        F(SGI_texture_color_table) },
-   { OFF, "GL_SGIS_generate_mipmap",           F(SGIS_generate_mipmap) },
+   { ON,  "GL_SGIS_generate_mipmap",           F(SGIS_generate_mipmap) },
    { OFF, "GL_SGIS_texture_border_clamp",      F(ARB_texture_border_clamp) },
    { ON,  "GL_SGIS_texture_edge_clamp",        F(SGIS_texture_edge_clamp) },
    { ON,  "GL_SGIS_texture_lod",               F(SGIS_texture_lod) },
    { ON,  "GL_SUN_multi_draw_arrays",          F(EXT_multi_draw_arrays) },
    { OFF, "GL_S3_s3tc",                        F(S3_s3tc) },
+   { OFF, "GL_EXT_texture_format_BGRA8888",    F(EXT_texture_format_BGRA8888) },
 #if FEATURE_OES_EGL_image
    { OFF, "GL_OES_EGL_image",                  F(OES_EGL_image) },
 #endif
@@ -233,13 +228,14 @@ static const struct {
  * This is a convenience function used by the XMesa, OSMesa, GGI drivers, etc.
  */
 void
-_mesa_enable_sw_extensions(GLcontext *ctx)
+_mesa_enable_sw_extensions(struct gl_context *ctx)
 {
-   ctx->Extensions.ARB_copy_buffer = GL_TRUE;
+   /*ctx->Extensions.ARB_copy_buffer = GL_TRUE;*/
    ctx->Extensions.ARB_depth_clamp = GL_TRUE;
    ctx->Extensions.ARB_depth_texture = GL_TRUE;
    /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/
    ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE;
+   ctx->Extensions.ARB_explicit_attrib_location = GL_TRUE;
    ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;
 #if FEATURE_ARB_fragment_program
    ctx->Extensions.ARB_fragment_program = GL_TRUE;
@@ -256,7 +252,6 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 #endif
    ctx->Extensions.ARB_half_float_pixel = GL_TRUE;
    ctx->Extensions.ARB_half_float_vertex = GL_TRUE;
-   ctx->Extensions.ARB_imaging = GL_TRUE;
    ctx->Extensions.ARB_map_buffer_range = GL_TRUE;
    ctx->Extensions.ARB_multitexture = GL_TRUE;
 #if FEATURE_queryobj
@@ -269,9 +264,6 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 #if FEATURE_ARB_shading_language_100
    ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
 #endif
-#if FEATURE_ARB_shading_language_120
-   ctx->Extensions.ARB_shading_language_120 = GL_TRUE;
-#endif
    ctx->Extensions.ARB_shadow = GL_TRUE;
    ctx->Extensions.ARB_shadow_ambient = GL_TRUE;
    ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
@@ -282,6 +274,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    /*ctx->Extensions.ARB_texture_float = GL_TRUE;*/
    ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;
    ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
+   ctx->Extensions.ARB_texture_rg = GL_TRUE;
    ctx->Extensions.ARB_vertex_array_object = GL_TRUE;
 #if FEATURE_ARB_vertex_program
    ctx->Extensions.ARB_vertex_program = GL_TRUE;
@@ -312,7 +305,6 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
    ctx->Extensions.EXT_blend_minmax = GL_TRUE;
    ctx->Extensions.EXT_blend_subtract = GL_TRUE;
-   ctx->Extensions.EXT_convolution = GL_TRUE;
    ctx->Extensions.EXT_depth_bounds_test = GL_TRUE;
    ctx->Extensions.EXT_draw_buffers2 = GL_TRUE;
    ctx->Extensions.EXT_fog_coord = GL_TRUE;
@@ -325,7 +317,6 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 #if FEATURE_ARB_framebuffer_object
    ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;
 #endif
-   ctx->Extensions.EXT_histogram = GL_TRUE;
    /*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/
    ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;
    ctx->Extensions.EXT_paletted_texture = GL_TRUE;
@@ -375,10 +366,8 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 #if FEATURE_NV_fragment_program && FEATURE_ARB_fragment_program
    ctx->Extensions.NV_fragment_program_option = GL_TRUE;
 #endif
-   ctx->Extensions.SGI_color_matrix = GL_TRUE;
-   ctx->Extensions.SGI_color_table = GL_TRUE;
    ctx->Extensions.SGI_texture_color_table = GL_TRUE;
-   ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;
+   /*ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;*/
    ctx->Extensions.SGIS_texture_edge_clamp = GL_TRUE;
 #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
    ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;
@@ -396,20 +385,15 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 
 
 /**
- * Enable GL_ARB_imaging and all the EXT extensions that are subsets of it.
+ * Enable common EXT extensions in the ARB_imaging subset.
  */
 void
-_mesa_enable_imaging_extensions(GLcontext *ctx)
+_mesa_enable_imaging_extensions(struct gl_context *ctx)
 {
-   ctx->Extensions.ARB_imaging = GL_TRUE;
    ctx->Extensions.EXT_blend_color = GL_TRUE;
    ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
    ctx->Extensions.EXT_blend_minmax = GL_TRUE;
    ctx->Extensions.EXT_blend_subtract = GL_TRUE;
-   ctx->Extensions.EXT_convolution = GL_TRUE;
-   ctx->Extensions.EXT_histogram = GL_TRUE;
-   ctx->Extensions.SGI_color_matrix = GL_TRUE;
-   ctx->Extensions.SGI_color_table = GL_TRUE;
 }
 
 
@@ -419,7 +403,7 @@ _mesa_enable_imaging_extensions(GLcontext *ctx)
  * A convenience function to be called by drivers.
  */
 void
-_mesa_enable_1_3_extensions(GLcontext *ctx)
+_mesa_enable_1_3_extensions(struct gl_context *ctx)
 {
    /*ctx->Extensions.ARB_multisample = GL_TRUE;*/
    ctx->Extensions.ARB_multitexture = GL_TRUE;
@@ -439,7 +423,7 @@ _mesa_enable_1_3_extensions(GLcontext *ctx)
  * A convenience function to be called by drivers.
  */
 void
-_mesa_enable_1_4_extensions(GLcontext *ctx)
+_mesa_enable_1_4_extensions(struct gl_context *ctx)
 {
    ctx->Extensions.ARB_depth_texture = GL_TRUE;
    ctx->Extensions.ARB_shadow = GL_TRUE;
@@ -456,7 +440,7 @@ _mesa_enable_1_4_extensions(GLcontext *ctx)
    ctx->Extensions.EXT_secondary_color = GL_TRUE;
    ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
    ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;
-   ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;
+   /*ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;*/
 }
 
 
@@ -465,7 +449,7 @@ _mesa_enable_1_4_extensions(GLcontext *ctx)
  * A convenience function to be called by drivers.
  */
 void
-_mesa_enable_1_5_extensions(GLcontext *ctx)
+_mesa_enable_1_5_extensions(struct gl_context *ctx)
 {
    ctx->Extensions.ARB_occlusion_query = GL_TRUE;
    /*ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;*/
@@ -478,7 +462,7 @@ _mesa_enable_1_5_extensions(GLcontext *ctx)
  * A convenience function to be called by drivers.
  */
 void
-_mesa_enable_2_0_extensions(GLcontext *ctx)
+_mesa_enable_2_0_extensions(struct gl_context *ctx)
 {
    /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/
 #if FEATURE_ARB_fragment_shader
@@ -505,7 +489,7 @@ _mesa_enable_2_0_extensions(GLcontext *ctx)
  * A convenience function to be called by drivers.
  */
 void
-_mesa_enable_2_1_extensions(GLcontext *ctx)
+_mesa_enable_2_1_extensions(struct gl_context *ctx)
 {
 #if FEATURE_EXT_pixel_buffer_object
    ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
@@ -513,9 +497,6 @@ _mesa_enable_2_1_extensions(GLcontext *ctx)
 #if FEATURE_EXT_texture_sRGB
    ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
 #endif
-#if FEATURE_ARB_shading_language_120
-   ctx->Extensions.ARB_shading_language_120 = GL_TRUE;
-#endif
 }
 
 
@@ -524,7 +505,7 @@ _mesa_enable_2_1_extensions(GLcontext *ctx)
  * \return GL_TRUE for success, GL_FALSE if invalid extension name
  */
 static GLboolean
-set_extension( GLcontext *ctx, const char *name, GLboolean state )
+set_extension( struct gl_context *ctx, const char *name, GLboolean state )
 {
    GLboolean *base = (GLboolean *) &ctx->Extensions;
    GLuint i;
@@ -553,7 +534,7 @@ set_extension( GLcontext *ctx, const char *name, GLboolean state )
  * Typically called by drivers.
  */
 void
-_mesa_enable_extension( GLcontext *ctx, const char *name )
+_mesa_enable_extension( struct gl_context *ctx, const char *name )
 {
    if (!set_extension(ctx, name, GL_TRUE))
       _mesa_problem(ctx, "Trying to enable unknown extension: %s", name);
@@ -565,7 +546,7 @@ _mesa_enable_extension( GLcontext *ctx, const char *name )
  * XXX is this really needed???
  */
 void
-_mesa_disable_extension( GLcontext *ctx, const char *name )
+_mesa_disable_extension( struct gl_context *ctx, const char *name )
 {
    if (!set_extension(ctx, name, GL_FALSE))
       _mesa_problem(ctx, "Trying to disable unknown extension: %s", name);
@@ -576,7 +557,7 @@ _mesa_disable_extension( GLcontext *ctx, const char *name )
  * Check if the i-th extension is enabled.
  */
 static GLboolean
-extension_enabled(GLcontext *ctx, GLuint index)
+extension_enabled(struct gl_context *ctx, GLuint index)
 {
    const GLboolean *base = (const GLboolean *) &ctx->Extensions;
    if (!default_extensions[index].flag_offset ||
@@ -593,7 +574,7 @@ extension_enabled(GLcontext *ctx, GLuint index)
  * Test if the named extension is enabled in this context.
  */
 GLboolean
-_mesa_extension_is_enabled( GLcontext *ctx, const char *name )
+_mesa_extension_is_enabled( struct gl_context *ctx, const char *name )
 {
    GLuint i;
 
@@ -635,7 +616,7 @@ append(const char *a, const char *b)
  * Return a string of the unknown/leftover names.
  */
 static const char *
-get_extension_override( GLcontext *ctx )
+get_extension_override( struct gl_context *ctx )
 {
    const char *envExt = _mesa_getenv("MESA_EXTENSION_OVERRIDE");
    char *extraExt = NULL;
@@ -686,7 +667,7 @@ get_extension_override( GLcontext *ctx )
  * To be called during context initialization.
  */
 void
-_mesa_init_extensions( GLcontext *ctx )
+_mesa_init_extensions( struct gl_context *ctx )
 {
    GLboolean *base = (GLboolean *) &ctx->Extensions;
    GLuint i;
@@ -705,7 +686,7 @@ _mesa_init_extensions( GLcontext *ctx )
  * glGetString(GL_EXTENSIONS) is called.
  */
 static GLubyte *
-compute_extensions( GLcontext *ctx )
+compute_extensions( struct gl_context *ctx )
 {
    const char *extraExt = get_extension_override(ctx);
    GLuint extStrLen = 0;
@@ -772,7 +753,7 @@ append_extension(GLubyte **str, const char *ext)
 
 
 static size_t
-make_extension_string_es1(const GLcontext *ctx, GLubyte *str)
+make_extension_string_es1(const struct gl_context *ctx, GLubyte *str)
 {
    size_t len = 0;
 
@@ -854,7 +835,7 @@ make_extension_string_es1(const GLcontext *ctx, GLubyte *str)
 
 
 static GLubyte *
-compute_extensions_es1(const GLcontext *ctx)
+compute_extensions_es1(const struct gl_context *ctx)
 {
    GLubyte *s;
    unsigned int len;
@@ -869,7 +850,7 @@ compute_extensions_es1(const GLcontext *ctx)
 }
 
 static size_t
-make_extension_string_es2(const GLcontext *ctx, GLubyte *str)
+make_extension_string_es2(const struct gl_context *ctx, GLubyte *str)
 {
    size_t len = 0;
 
@@ -916,11 +897,14 @@ make_extension_string_es2(const GLcontext *ctx, GLubyte *str)
       len += append_extension(&str, "GL_OES_EGL_image");
 #endif
 
+   if (ctx->Extensions.EXT_texture_format_BGRA8888)
+      len += append_extension(&str, "GL_EXT_texture_format_BGRA8888");
+
    return len;
 }
 
 static GLubyte *
-compute_extensions_es2(GLcontext *ctx)
+compute_extensions_es2(struct gl_context *ctx)
 {
    GLubyte *s;
    unsigned int len;
@@ -936,7 +920,7 @@ compute_extensions_es2(GLcontext *ctx)
 
 
 GLubyte *
-_mesa_make_extension_string(GLcontext *ctx)
+_mesa_make_extension_string(struct gl_context *ctx)
 {
    switch (ctx->API) {
    case API_OPENGL:
@@ -955,7 +939,7 @@ _mesa_make_extension_string(GLcontext *ctx)
  * Return number of enabled extensions.
  */
 GLuint
-_mesa_get_extension_count(GLcontext *ctx)
+_mesa_get_extension_count(struct gl_context *ctx)
 {
    GLuint i;
 
@@ -980,7 +964,7 @@ _mesa_get_extension_count(GLcontext *ctx)
  * Return name of i-th enabled extension
  */
 const GLubyte *
-_mesa_get_enabled_extension(GLcontext *ctx, GLuint index)
+_mesa_get_enabled_extension(struct gl_context *ctx, GLuint index)
 {
    GLuint i;
 
diff --git a/src/mesa/main/extensions.h b/src/mesa/main/extensions.h
index a25472440d6..6eb85393965 100644
--- a/src/mesa/main/extensions.h
+++ b/src/mesa/main/extensions.h
@@ -40,35 +40,35 @@
 
 #if _HAVE_FULL_GL
 
-extern void _mesa_enable_sw_extensions(GLcontext *ctx);
+extern void _mesa_enable_sw_extensions(struct gl_context *ctx);
 
-extern void _mesa_enable_imaging_extensions(GLcontext *ctx);
+extern void _mesa_enable_imaging_extensions(struct gl_context *ctx);
 
-extern void _mesa_enable_1_3_extensions(GLcontext *ctx);
+extern void _mesa_enable_1_3_extensions(struct gl_context *ctx);
 
-extern void _mesa_enable_1_4_extensions(GLcontext *ctx);
+extern void _mesa_enable_1_4_extensions(struct gl_context *ctx);
 
-extern void _mesa_enable_1_5_extensions(GLcontext *ctx);
+extern void _mesa_enable_1_5_extensions(struct gl_context *ctx);
 
-extern void _mesa_enable_2_0_extensions(GLcontext *ctx);
+extern void _mesa_enable_2_0_extensions(struct gl_context *ctx);
 
-extern void _mesa_enable_2_1_extensions(GLcontext *ctx);
+extern void _mesa_enable_2_1_extensions(struct gl_context *ctx);
 
-extern void _mesa_enable_extension(GLcontext *ctx, const char *name);
+extern void _mesa_enable_extension(struct gl_context *ctx, const char *name);
 
-extern void _mesa_disable_extension(GLcontext *ctx, const char *name);
+extern void _mesa_disable_extension(struct gl_context *ctx, const char *name);
 
-extern GLboolean _mesa_extension_is_enabled(GLcontext *ctx, const char *name);
+extern GLboolean _mesa_extension_is_enabled(struct gl_context *ctx, const char *name);
 
-extern void _mesa_init_extensions(GLcontext *ctx);
+extern void _mesa_init_extensions(struct gl_context *ctx);
 
-extern GLubyte *_mesa_make_extension_string(GLcontext *ctx);
+extern GLubyte *_mesa_make_extension_string(struct gl_context *ctx);
 
 extern GLuint
-_mesa_get_extension_count(GLcontext *ctx);
+_mesa_get_extension_count(struct gl_context *ctx);
 
 extern const GLubyte *
-_mesa_get_enabled_extension(GLcontext *ctx, GLuint index);
+_mesa_get_enabled_extension(struct gl_context *ctx, GLuint index);
 
 
 #else
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 5201f502527..3dc78f2bf53 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -95,7 +95,7 @@ delete_dummy_framebuffer(struct gl_framebuffer *fb)
 
 
 void
-_mesa_init_fbobjects(GLcontext *ctx)
+_mesa_init_fbobjects(struct gl_context *ctx)
 {
    _glthread_INIT_MUTEX(DummyFramebuffer.Mutex);
    _glthread_INIT_MUTEX(DummyRenderbuffer.Mutex);
@@ -115,7 +115,7 @@ _mesa_get_incomplete_framebuffer(void)
  * Helper routine for getting a gl_renderbuffer.
  */
 struct gl_renderbuffer *
-_mesa_lookup_renderbuffer(GLcontext *ctx, GLuint id)
+_mesa_lookup_renderbuffer(struct gl_context *ctx, GLuint id)
 {
    struct gl_renderbuffer *rb;
 
@@ -132,7 +132,7 @@ _mesa_lookup_renderbuffer(GLcontext *ctx, GLuint id)
  * Helper routine for getting a gl_framebuffer.
  */
 struct gl_framebuffer *
-_mesa_lookup_framebuffer(GLcontext *ctx, GLuint id)
+_mesa_lookup_framebuffer(struct gl_context *ctx, GLuint id)
 {
    struct gl_framebuffer *fb;
 
@@ -166,7 +166,7 @@ invalidate_framebuffer(struct gl_framebuffer *fb)
  * the depth buffer attachment point.
  */
 struct gl_renderbuffer_attachment *
-_mesa_get_attachment(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_get_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
                      GLenum attachment)
 {
    GLuint i;
@@ -216,7 +216,7 @@ _mesa_get_attachment(GLcontext *ctx, struct gl_framebuffer *fb,
  * window-system framebuffer (not user-created framebuffer objects).
  */
 static struct gl_renderbuffer_attachment *
-_mesa_get_fb0_attachment(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_get_fb0_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
                          GLenum attachment)
 {
    assert(fb->Name == 0);
@@ -255,7 +255,7 @@ _mesa_get_fb0_attachment(GLcontext *ctx, struct gl_framebuffer *fb,
  * point.  Update reference counts, etc.
  */
 void
-_mesa_remove_attachment(GLcontext *ctx, struct gl_renderbuffer_attachment *att)
+_mesa_remove_attachment(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
 {
    if (att->Type == GL_TEXTURE) {
       ASSERT(att->Texture);
@@ -281,7 +281,7 @@ _mesa_remove_attachment(GLcontext *ctx, struct gl_renderbuffer_attachment *att)
  * The previous binding, if any, will be removed first.
  */
 void
-_mesa_set_texture_attachment(GLcontext *ctx,
+_mesa_set_texture_attachment(struct gl_context *ctx,
                              struct gl_framebuffer *fb,
                              struct gl_renderbuffer_attachment *att,
                              struct gl_texture_object *texObj,
@@ -322,7 +322,7 @@ _mesa_set_texture_attachment(GLcontext *ctx,
  * The previous binding, if any, will be removed first.
  */
 void
-_mesa_set_renderbuffer_attachment(GLcontext *ctx,
+_mesa_set_renderbuffer_attachment(struct gl_context *ctx,
                                   struct gl_renderbuffer_attachment *att,
                                   struct gl_renderbuffer *rb)
 {
@@ -340,7 +340,7 @@ _mesa_set_renderbuffer_attachment(GLcontext *ctx,
  * Attach a renderbuffer object to a framebuffer object.
  */
 void
-_mesa_framebuffer_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_framebuffer_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
                                GLenum attachment, struct gl_renderbuffer *rb)
 {
    struct gl_renderbuffer_attachment *att;
@@ -406,7 +406,7 @@ fbo_incomplete(const char *msg, int index)
  *               if GL_STENCIL, this is a stencil component attachment point.
  */
 static void
-test_attachment_completeness(const GLcontext *ctx, GLenum format,
+test_attachment_completeness(const struct gl_context *ctx, GLenum format,
                              struct gl_renderbuffer_attachment *att)
 {
    assert(format == GL_COLOR || format == GL_DEPTH || format == GL_STENCIL);
@@ -451,7 +451,11 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
          if (baseFormat != GL_RGB &&
              baseFormat != GL_RGBA &&
 	     (!ctx->Extensions.ARB_framebuffer_object ||
-	      baseFormat != GL_ALPHA)) {
+	      baseFormat != GL_ALPHA) &&
+	     (!ctx->Extensions.ARB_texture_rg ||
+	      baseFormat != GL_RED) &&
+	     (!ctx->Extensions.ARB_texture_rg ||
+	      baseFormat != GL_RG)) {
             att_incomplete("bad format");
             att->Complete = GL_FALSE;
             return;
@@ -559,7 +563,7 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
  * framebuffer is complete.
  */
 void
-_mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
+_mesa_test_framebuffer_completeness(struct gl_context *ctx, struct gl_framebuffer *fb)
 {
    GLuint numImages;
    GLenum intFormat = GL_NONE; /* color buffers' internal format */
@@ -631,7 +635,9 @@ _mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb)
          numImages++;
          if (f != GL_RGB && f != GL_RGBA && f != GL_DEPTH_COMPONENT
              && f != GL_DEPTH_STENCIL_EXT
-	     && (!ctx->Extensions.ARB_framebuffer_object || f != GL_ALPHA)) {
+	     && (!ctx->Extensions.ARB_framebuffer_object || f != GL_ALPHA)
+	     && (!ctx->Extensions.ARB_texture_rg || f != GL_RED)
+	     && (!ctx->Extensions.ARB_texture_rg || f != GL_RG)) {
             fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT;
             fbo_incomplete("texture attachment incomplete", -1);
             return;
@@ -827,7 +833,7 @@ _mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer)
  * The spec calls for unbinding.
  */
 static void
-detach_renderbuffer(GLcontext *ctx,
+detach_renderbuffer(struct gl_context *ctx,
                     struct gl_framebuffer *fb,
                     struct gl_renderbuffer *rb)
 {
@@ -928,7 +934,7 @@ _mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers)
  * we'll also return GL_RED and GL_RG.
  */
 GLenum
-_mesa_base_fbo_format(GLcontext *ctx, GLenum internalFormat)
+_mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat)
 {
    switch (internalFormat) {
    case GL_ALPHA:
@@ -1281,7 +1287,7 @@ _mesa_IsFramebufferEXT(GLuint framebuffer)
  * attachments.
  */
 static void
-check_begin_texture_render(GLcontext *ctx, struct gl_framebuffer *fb)
+check_begin_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
 {
    GLuint i;
    ASSERT(ctx->Driver.RenderTexture);
@@ -1306,7 +1312,7 @@ check_begin_texture_render(GLcontext *ctx, struct gl_framebuffer *fb)
  * notify the device driver that the texture image may have changed.
  */
 static void
-check_end_texture_render(GLcontext *ctx, struct gl_framebuffer *fb)
+check_end_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
 {
    if (fb->Name == 0)
       return; /* can't render to texture with winsys framebuffers */
@@ -1600,7 +1606,7 @@ _mesa_CheckFramebufferStatusEXT(GLenum target)
  * Common code called by glFramebufferTexture1D/2D/3DEXT().
  */
 static void
-framebuffer_texture(GLcontext *ctx, const char *caller, GLenum target, 
+framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target, 
                     GLenum attachment, GLenum textarget, GLuint texture,
                     GLint level, GLint zoffset)
 {
diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 9850ee9aa23..9e18e538a6f 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -29,47 +29,47 @@
 #include "mtypes.h"
 
 extern void
-_mesa_init_fbobjects(GLcontext *ctx);
+_mesa_init_fbobjects(struct gl_context *ctx);
 
 extern struct gl_framebuffer *
 _mesa_get_incomplete_framebuffer(void);
 
 extern struct gl_renderbuffer *
-_mesa_lookup_renderbuffer(GLcontext *ctx, GLuint id);
+_mesa_lookup_renderbuffer(struct gl_context *ctx, GLuint id);
 
 extern struct gl_framebuffer *
-_mesa_lookup_framebuffer(GLcontext *ctx, GLuint id);
+_mesa_lookup_framebuffer(struct gl_context *ctx, GLuint id);
 
 extern struct gl_renderbuffer_attachment *
-_mesa_get_attachment(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_get_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
                      GLenum attachment);
 
 
 extern void
-_mesa_remove_attachment(GLcontext *ctx,
+_mesa_remove_attachment(struct gl_context *ctx,
                         struct gl_renderbuffer_attachment *att);
 
 extern void
-_mesa_set_texture_attachment(GLcontext *ctx,
+_mesa_set_texture_attachment(struct gl_context *ctx,
                              struct gl_framebuffer *fb,
                              struct gl_renderbuffer_attachment *att,
                              struct gl_texture_object *texObj,
                              GLenum texTarget, GLuint level, GLuint zoffset);
 
 extern void
-_mesa_set_renderbuffer_attachment(GLcontext *ctx,
+_mesa_set_renderbuffer_attachment(struct gl_context *ctx,
                                   struct gl_renderbuffer_attachment *att,
                                   struct gl_renderbuffer *rb);
 
 extern void
-_mesa_framebuffer_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_framebuffer_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
                                GLenum attachment, struct gl_renderbuffer *rb);
 
 extern void
-_mesa_test_framebuffer_completeness(GLcontext *ctx, struct gl_framebuffer *fb);
+_mesa_test_framebuffer_completeness(struct gl_context *ctx, struct gl_framebuffer *fb);
 
 extern GLenum
-_mesa_base_fbo_format(GLcontext *ctx, GLenum internalFormat);
+_mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat);
 
 extern GLboolean GLAPIENTRY
 _mesa_IsRenderbufferEXT(GLuint renderbuffer);
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index c72b91280ed..ffdecaecc29 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -116,7 +116,7 @@ _mesa_PassThrough( GLfloat token )
  * Put a vertex into the feedback buffer.
  */
 void
-_mesa_feedback_vertex(GLcontext *ctx,
+_mesa_feedback_vertex(struct gl_context *ctx,
                       const GLfloat win[4],
                       const GLfloat color[4],
                       const GLfloat texcoord[4])
@@ -159,7 +159,7 @@ _mesa_feedback_vertex(GLcontext *ctx,
  * \note this function can't be put in a display list.
  * 
  * Verifies we're not in selection mode, flushes the vertices and initialize
- * the fields in __GLcontextRec::Select with the given buffer.
+ * the fields in __struct gl_contextRec::Select with the given buffer.
  */
 static void GLAPIENTRY
 _mesa_SelectBuffer( GLsizei size, GLuint *buffer )
@@ -192,7 +192,7 @@ _mesa_SelectBuffer( GLsizei size, GLuint *buffer )
  * increments the pointer.
  */
 static INLINE void
-write_record(GLcontext *ctx, GLuint value)
+write_record(struct gl_context *ctx, GLuint value)
 {
    if (ctx->Select.BufferCount < ctx->Select.BufferSize) {
       ctx->Select.Buffer[ctx->Select.BufferCount] = value;
@@ -211,7 +211,7 @@ write_record(GLcontext *ctx, GLuint value)
  * gl_selection::HitMaxZ.
  */
 void
-_mesa_update_hitflag(GLcontext *ctx, GLfloat z)
+_mesa_update_hitflag(struct gl_context *ctx, GLfloat z)
 {
    ctx->Select.HitFlag = GL_TRUE;
    if (z < ctx->Select.HitMinZ) {
@@ -235,7 +235,7 @@ _mesa_update_hitflag(GLcontext *ctx, GLfloat z)
  * \sa gl_selection.
  */
 static void
-write_hit_record(GLcontext *ctx)
+write_hit_record(struct gl_context *ctx)
 {
    GLuint i;
    GLuint zmin, zmax, zscale = (~0u);
@@ -266,7 +266,7 @@ write_hit_record(GLcontext *ctx)
  *
  * Verifies we are in select mode and resets the name stack depth and resets
  * the hit record data in gl_selection. Marks new render mode in
- * __GLcontextRec::NewState.
+ * __struct gl_contextRec::NewState.
  */
 static void GLAPIENTRY
 _mesa_InitNames( void )
@@ -297,7 +297,7 @@ _mesa_InitNames( void )
  * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
  * and replace the top-most name in the stack.
  *
- * sa __GLcontextRec::Select.
+ * sa __struct gl_contextRec::Select.
  */
 static void GLAPIENTRY
 _mesa_LoadName( GLuint name )
@@ -336,7 +336,7 @@ _mesa_LoadName( GLuint name )
  * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
  * and adds the name to the top of the name stack.
  *
- * sa __GLcontextRec::Select.
+ * sa __struct gl_contextRec::Select.
  */
 static void GLAPIENTRY
 _mesa_PushName( GLuint name )
@@ -367,7 +367,7 @@ _mesa_PushName( GLuint name )
  * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
  * and removes top-most name in the name stack.
  *
- * sa __GLcontextRec::Select.
+ * sa __struct gl_contextRec::Select.
  */
 static void GLAPIENTRY
 _mesa_PopName( void )
@@ -409,7 +409,7 @@ _mesa_PopName( void )
  * Flushes the vertices and do the necessary cleanup according to the previous
  * rasterization mode, such as writing the hit record or resent the select
  * buffer index when exiting the select mode. Updates
- * __GLcontextRec::RenderMode and notifies the driver via the
+ * __struct gl_contextRec::RenderMode and notifies the driver via the
  * dd_function_table::RenderMode callback.
  */
 static GLint GLAPIENTRY
@@ -519,7 +519,7 @@ _mesa_init_feedback_dispatch(struct _glapi_table *disp)
 /**
  * Initialize context feedback data.
  */
-void _mesa_init_feedback( GLcontext * ctx )
+void _mesa_init_feedback( struct gl_context * ctx )
 {
    /* Feedback */
    ctx->Feedback.Type = GL_2D;   /* TODO: verify */
diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index c6354b97bcd..f9fbbce70b9 100644
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -33,14 +33,14 @@
 #if FEATURE_feedback
 
 extern void
-_mesa_feedback_vertex( GLcontext *ctx,
+_mesa_feedback_vertex( struct gl_context *ctx,
                        const GLfloat win[4],
                        const GLfloat color[4],
                        const GLfloat texcoord[4] );
 
 
 static INLINE void
-_mesa_feedback_token( GLcontext *ctx, GLfloat token )
+_mesa_feedback_token( struct gl_context *ctx, GLfloat token )
 {
    if (ctx->Feedback.Count < ctx->Feedback.BufferSize) {
       ctx->Feedback.Buffer[ctx->Feedback.Count] = token;
@@ -50,7 +50,7 @@ _mesa_feedback_token( GLcontext *ctx, GLfloat token )
 
 
 extern void
-_mesa_update_hitflag( GLcontext *ctx, GLfloat z );
+_mesa_update_hitflag( struct gl_context *ctx, GLfloat z );
 
 
 extern void
@@ -61,7 +61,7 @@ _mesa_init_feedback_dispatch(struct _glapi_table *disp);
 #include "main/compiler.h"
 
 static INLINE void
-_mesa_feedback_vertex( GLcontext *ctx,
+_mesa_feedback_vertex( struct gl_context *ctx,
                        const GLfloat win[4],
                        const GLfloat color[4],
                        const GLfloat texcoord[4] )
@@ -72,14 +72,14 @@ _mesa_feedback_vertex( GLcontext *ctx,
 
 
 static INLINE void
-_mesa_feedback_token( GLcontext *ctx, GLfloat token )
+_mesa_feedback_token( struct gl_context *ctx, GLfloat token )
 {
    /* render mode is always GL_RENDER */
    ASSERT_NO_FEATURE();
 }
 
 static INLINE void
-_mesa_update_hitflag( GLcontext *ctx, GLfloat z )
+_mesa_update_hitflag( struct gl_context *ctx, GLfloat z )
 {
    /* render mode is always GL_RENDER */
    ASSERT_NO_FEATURE();
@@ -93,6 +93,6 @@ _mesa_init_feedback_dispatch(struct _glapi_table *disp)
 #endif /* FEATURE_feedback */
 
 extern void
-_mesa_init_feedback( GLcontext *ctx );
+_mesa_init_feedback( struct gl_context *ctx );
 
 #endif /* FEEDBACK_H */
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 92fec09bad0..0f2c313c819 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -109,7 +109,7 @@ static GLuint translate_texgen( GLboolean enabled, GLenum mode )
 
 
 
-static GLboolean check_active_shininess( GLcontext *ctx,
+static GLboolean check_active_shininess( struct gl_context *ctx,
                                          const struct state_key *key,
                                          GLuint side )
 {
@@ -129,7 +129,7 @@ static GLboolean check_active_shininess( GLcontext *ctx,
 }
 
 
-static void make_state_key( GLcontext *ctx, struct state_key *key )
+static void make_state_key( struct gl_context *ctx, struct state_key *key )
 {
    const struct gl_fragment_program *fp;
    GLuint i;
@@ -1638,7 +1638,7 @@ create_new_program( const struct state_key *key,
  * XXX move this into core mesa (main/)
  */
 struct gl_vertex_program *
-_mesa_get_fixed_func_vertex_program(GLcontext *ctx)
+_mesa_get_fixed_func_vertex_program(struct gl_context *ctx)
 {
    struct gl_vertex_program *prog;
    struct state_key key;
diff --git a/src/mesa/main/ffvertex_prog.h b/src/mesa/main/ffvertex_prog.h
index 38dc5fbb8d3..72cd6ea115d 100644
--- a/src/mesa/main/ffvertex_prog.h
+++ b/src/mesa/main/ffvertex_prog.h
@@ -33,7 +33,7 @@
 #include "main/mtypes.h"
 
 struct gl_vertex_program *
-_mesa_get_fixed_func_vertex_program(GLcontext *ctx);
+_mesa_get_fixed_func_vertex_program(struct gl_context *ctx);
 
 
 
diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c
index 9f26c012d66..fd64bd1fd89 100644
--- a/src/mesa/main/fog.c
+++ b/src/mesa/main/fog.c
@@ -178,7 +178,7 @@ _mesa_Fogfv( GLenum pname, const GLfloat *params )
 /*****                      Initialization                        *****/
 /**********************************************************************/
 
-void _mesa_init_fog( GLcontext * ctx )
+void _mesa_init_fog( struct gl_context * ctx )
 {
    /* Fog group */
    ctx->Fog.Enabled = GL_FALSE;
diff --git a/src/mesa/main/fog.h b/src/mesa/main/fog.h
index a14d19cdb39..7df4f0b6735 100644
--- a/src/mesa/main/fog.h
+++ b/src/mesa/main/fog.h
@@ -54,7 +54,7 @@ _mesa_Fogfv(GLenum pname, const GLfloat *params );
 extern void GLAPIENTRY
 _mesa_Fogiv(GLenum pname, const GLint *params );
 
-extern void _mesa_init_fog( GLcontext * ctx );
+extern void _mesa_init_fog( struct gl_context * ctx );
 
 #else
 
diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 9db9f1c56ea..654ea038a55 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -321,6 +321,60 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 2                      /* BlockWidth/Height,Bytes */
    },
    {
+      MESA_FORMAT_R8,
+      "MESA_FORMAT_R8",
+      GL_RED,
+      GL_UNSIGNED_NORMALIZED,
+      8, 0, 0, 0,
+      0, 0, 0, 0, 0,
+      1, 1, 1
+   },
+   {
+      MESA_FORMAT_RG88,
+      "MESA_FORMAT_RG88",
+      GL_RG,
+      GL_UNSIGNED_NORMALIZED,
+      8, 8, 0, 0,
+      0, 0, 0, 0, 0,
+      1, 1, 2
+   },
+   {
+      MESA_FORMAT_RG88_REV,
+      "MESA_FORMAT_RG88_REV",
+      GL_RG,
+      GL_UNSIGNED_NORMALIZED,
+      8, 8, 0, 0,
+      0, 0, 0, 0, 0,
+      1, 1, 2
+   },
+   {
+      MESA_FORMAT_R16,
+      "MESA_FORMAT_R16",
+      GL_RED,
+      GL_UNSIGNED_NORMALIZED,
+      16, 0, 0, 0,
+      0, 0, 0, 0, 0,
+      1, 1, 2
+   },
+   {
+      MESA_FORMAT_RG1616,
+      "MESA_FORMAT_RG1616",
+      GL_RG,
+      GL_UNSIGNED_NORMALIZED,
+      16, 16, 0, 0,
+      0, 0, 0, 0, 0,
+      1, 1, 4
+   },
+   {
+      MESA_FORMAT_RG1616_REV,
+      "MESA_FORMAT_RG1616_REV",
+      GL_RG,
+      GL_UNSIGNED_NORMALIZED,
+      16, 16, 0, 0,
+      0, 0, 0, 0, 0,
+      1, 1, 4
+   },
+   {
       MESA_FORMAT_Z24_S8,          /* Name */
       "MESA_FORMAT_Z24_S8",        /* StrName */
       GL_DEPTH_STENCIL,            /* BaseFormat */
@@ -1073,6 +1127,22 @@ _mesa_test_formats(void)
          assert(info->LuminanceBits == 0);
          assert(info->IntensityBits == 0);
       }
+      else if (info->BaseFormat == GL_RG) {
+         assert(info->RedBits > 0);
+         assert(info->GreenBits > 0);
+         assert(info->BlueBits == 0);
+         assert(info->AlphaBits == 0);
+         assert(info->LuminanceBits == 0);
+         assert(info->IntensityBits == 0);
+      }
+      else if (info->BaseFormat == GL_RED) {
+         assert(info->RedBits > 0);
+         assert(info->GreenBits == 0);
+         assert(info->BlueBits == 0);
+         assert(info->AlphaBits == 0);
+         assert(info->LuminanceBits == 0);
+         assert(info->IntensityBits == 0);
+      }
       else if (info->BaseFormat == GL_LUMINANCE) {
          assert(info->RedBits == 0);
          assert(info->GreenBits == 0);
@@ -1137,16 +1207,25 @@ _mesa_format_to_type_and_comps(gl_format format,
 
    case MESA_FORMAT_AL88:
    case MESA_FORMAT_AL88_REV:
+   case MESA_FORMAT_RG88:
+   case MESA_FORMAT_RG88_REV:
       *datatype = GL_UNSIGNED_BYTE;
       *comps = 2;
       return;
 
    case MESA_FORMAT_AL1616:
    case MESA_FORMAT_AL1616_REV:
+   case MESA_FORMAT_RG1616:
+   case MESA_FORMAT_RG1616_REV:
       *datatype = GL_UNSIGNED_SHORT;
       *comps = 2;
       return;
 
+   case MESA_FORMAT_R16:
+      *datatype = GL_UNSIGNED_SHORT;
+      *comps = 1;
+      return;
+
    case MESA_FORMAT_RGB332:
       *datatype = GL_UNSIGNED_BYTE_3_3_2;
       *comps = 3;
@@ -1156,6 +1235,7 @@ _mesa_format_to_type_and_comps(gl_format format,
    case MESA_FORMAT_L8:
    case MESA_FORMAT_I8:
    case MESA_FORMAT_CI8:
+   case MESA_FORMAT_R8:
       *datatype = GL_UNSIGNED_BYTE;
       *comps = 1;
       return;
@@ -1259,11 +1339,11 @@ _mesa_format_to_type_and_comps(gl_format format,
    case MESA_FORMAT_SRGBA_DXT3:
    case MESA_FORMAT_SRGBA_DXT5:
 #endif
+#endif
       /* XXX generate error instead? */
       *datatype = GL_UNSIGNED_BYTE;
       *comps = 0;
       return;
-#endif
 
    case MESA_FORMAT_RGBA_FLOAT32:
       *datatype = GL_FLOAT;
diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h
index e9467f486bf..7674d8eaa4e 100644
--- a/src/mesa/main/formats.h
+++ b/src/mesa/main/formats.h
@@ -76,6 +76,12 @@ typedef enum
    MESA_FORMAT_CI8,		/*                               CCCC CCCC */
    MESA_FORMAT_YCBCR,		/*                     YYYY YYYY UorV UorV */
    MESA_FORMAT_YCBCR_REV,	/*                     UorV UorV YYYY YYYY */
+   MESA_FORMAT_R8,		/*                               RRRR RRRR */
+   MESA_FORMAT_RG88,		/*                     RRRR RRRR GGGG GGGG */
+   MESA_FORMAT_RG88_REV,	/*                     GGGG GGGG RRRR RRRR */
+   MESA_FORMAT_R16,		/*                     RRRR RRRR RRRR RRRR */
+   MESA_FORMAT_RG1616,		/* RRRR RRRR RRRR RRRR GGGG GGGG GGGG GGGG */
+   MESA_FORMAT_RG1616_REV,	/* GGGG GGGG GGGG GGGG RRRR RRRR RRRR RRRR */
    MESA_FORMAT_Z24_S8,          /* ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ SSSS SSSS */
    MESA_FORMAT_S8_Z24,          /* SSSS SSSS ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ ZZZZ */
    MESA_FORMAT_Z16,             /*                     ZZZZ ZZZZ ZZZZ ZZZZ */
diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index a98c09cfbf3..af3b5dfcf9b 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -83,7 +83,7 @@ compute_depth_max(struct gl_framebuffer *fb)
  * \sa _mesa_new_framebuffer
  */
 struct gl_framebuffer *
-_mesa_create_framebuffer(const GLvisual *visual)
+_mesa_create_framebuffer(const struct gl_config *visual)
 {
    struct gl_framebuffer *fb = CALLOC_STRUCT(gl_framebuffer);
    assert(visual);
@@ -102,7 +102,7 @@ _mesa_create_framebuffer(const GLvisual *visual)
  * \sa _mesa_create_framebuffer
  */
 struct gl_framebuffer *
-_mesa_new_framebuffer(GLcontext *ctx, GLuint name)
+_mesa_new_framebuffer(struct gl_context *ctx, GLuint name)
 {
    struct gl_framebuffer *fb;
    (void) ctx;
@@ -122,7 +122,7 @@ _mesa_new_framebuffer(GLcontext *ctx, GLuint name)
  */
 void
 _mesa_initialize_window_framebuffer(struct gl_framebuffer *fb,
-				     const GLvisual *visual)
+				     const struct gl_config *visual)
 {
    assert(fb);
    assert(visual);
@@ -281,7 +281,7 @@ _mesa_reference_framebuffer(struct gl_framebuffer **ptr,
  * without a currently bound rendering context.
  */
 void
-_mesa_resize_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_resize_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
                          GLuint width, GLuint height)
 {
    GLuint i;
@@ -359,7 +359,7 @@ _mesa_resize_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb,
  * from device drivers (as was done in the past).
  */
 void
-_mesa_resizebuffers( GLcontext *ctx )
+_mesa_resizebuffers( struct gl_context *ctx )
 {
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH( ctx );
 
@@ -372,7 +372,7 @@ _mesa_resizebuffers( GLcontext *ctx )
 
    if (ctx->WinSysDrawBuffer) {
       GLuint newWidth, newHeight;
-      GLframebuffer *buffer = ctx->WinSysDrawBuffer;
+      struct gl_framebuffer *buffer = ctx->WinSysDrawBuffer;
 
       assert(buffer->Name == 0);
 
@@ -389,7 +389,7 @@ _mesa_resizebuffers( GLcontext *ctx )
    if (ctx->WinSysReadBuffer
        && ctx->WinSysReadBuffer != ctx->WinSysDrawBuffer) {
       GLuint newWidth, newHeight;
-      GLframebuffer *buffer = ctx->WinSysReadBuffer;
+      struct gl_framebuffer *buffer = ctx->WinSysReadBuffer;
 
       assert(buffer->Name == 0);
 
@@ -429,7 +429,7 @@ _mesa_ResizeBuffersMESA( void )
  * window-system framebuffes.
  */
 static void
-update_framebuffer_size(GLcontext *ctx, struct gl_framebuffer *fb)
+update_framebuffer_size(struct gl_context *ctx, struct gl_framebuffer *fb)
 {
    GLuint minWidth = ~0, minHeight = ~0;
    GLuint i;
@@ -464,7 +464,7 @@ update_framebuffer_size(GLcontext *ctx, struct gl_framebuffer *fb)
  * \param ctx  the GL context.
  */
 void
-_mesa_update_draw_buffer_bounds(GLcontext *ctx)
+_mesa_update_draw_buffer_bounds(struct gl_context *ctx)
 {
    struct gl_framebuffer *buffer = ctx->DrawBuffer;
 
@@ -600,7 +600,7 @@ _mesa_update_framebuffer_visual(struct gl_framebuffer *fb)
  * \param attIndex  indicates the renderbuffer to possibly wrap
  */
 void
-_mesa_update_depth_buffer(GLcontext *ctx,
+_mesa_update_depth_buffer(struct gl_context *ctx,
                           struct gl_framebuffer *fb,
                           GLuint attIndex)
 {
@@ -641,7 +641,7 @@ _mesa_update_depth_buffer(GLcontext *ctx,
  * \param attIndex  indicates the renderbuffer to possibly wrap
  */
 void
-_mesa_update_stencil_buffer(GLcontext *ctx,
+_mesa_update_stencil_buffer(struct gl_context *ctx,
                             struct gl_framebuffer *fb,
                             GLuint attIndex)
 {
@@ -722,7 +722,7 @@ _mesa_update_stencil_buffer(GLcontext *ctx,
  * writing colors.
  */
 static void
-update_color_draw_buffers(GLcontext *ctx, struct gl_framebuffer *fb)
+update_color_draw_buffers(struct gl_context *ctx, struct gl_framebuffer *fb)
 {
    GLuint output;
 
@@ -746,7 +746,7 @@ update_color_draw_buffers(GLcontext *ctx, struct gl_framebuffer *fb)
  * Unlike the DrawBuffer, we can only read from one (or zero) color buffers.
  */
 static void
-update_color_read_buffer(GLcontext *ctx, struct gl_framebuffer *fb)
+update_color_read_buffer(struct gl_context *ctx, struct gl_framebuffer *fb)
 {
    (void) ctx;
    if (fb->_ColorReadBufferIndex == -1 ||
@@ -781,7 +781,7 @@ update_color_read_buffer(GLcontext *ctx, struct gl_framebuffer *fb)
  * glRenderbufferStorageEXT.
  */
 static void
-update_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb)
+update_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
 {
    if (fb->Name == 0) {
       /* This is a window-system framebuffer */
@@ -823,7 +823,7 @@ update_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb)
  * Update state related to the current draw/read framebuffers.
  */
 void
-_mesa_update_framebuffer(GLcontext *ctx)
+_mesa_update_framebuffer(struct gl_context *ctx)
 {
    struct gl_framebuffer *drawFb;
    struct gl_framebuffer *readFb;
@@ -846,7 +846,7 @@ _mesa_update_framebuffer(GLcontext *ctx)
  * \return GL_TRUE if buffer exists, GL_FALSE otherwise
  */
 GLboolean
-_mesa_source_buffer_exists(GLcontext *ctx, GLenum format)
+_mesa_source_buffer_exists(struct gl_context *ctx, GLenum format)
 {
    const struct gl_renderbuffer_attachment *att = ctx->ReadBuffer->Attachment;
 
@@ -922,7 +922,7 @@ _mesa_source_buffer_exists(GLcontext *ctx, GLenum format)
  * XXX could do some code merging w/ above function.
  */
 GLboolean
-_mesa_dest_buffer_exists(GLcontext *ctx, GLenum format)
+_mesa_dest_buffer_exists(struct gl_context *ctx, GLenum format)
 {
    const struct gl_renderbuffer_attachment *att = ctx->DrawBuffer->Attachment;
 
@@ -993,7 +993,7 @@ _mesa_dest_buffer_exists(GLcontext *ctx, GLenum format)
  * Used to answer the GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES query.
  */
 GLenum
-_mesa_get_color_read_format(GLcontext *ctx)
+_mesa_get_color_read_format(struct gl_context *ctx)
 {
    switch (ctx->ReadBuffer->_ColorReadBuffer->Format) {
    case MESA_FORMAT_ARGB8888:
@@ -1010,7 +1010,7 @@ _mesa_get_color_read_format(GLcontext *ctx)
  * Used to answer the GL_IMPLEMENTATION_COLOR_READ_TYPE_OES query.
  */
 GLenum
-_mesa_get_color_read_type(GLcontext *ctx)
+_mesa_get_color_read_type(struct gl_context *ctx)
 {
    switch (ctx->ReadBuffer->_ColorReadBuffer->Format) {
    case MESA_FORMAT_ARGB8888:
diff --git a/src/mesa/main/framebuffer.h b/src/mesa/main/framebuffer.h
index 2e9844282f8..13722ea457a 100644
--- a/src/mesa/main/framebuffer.h
+++ b/src/mesa/main/framebuffer.h
@@ -29,14 +29,14 @@
 #include "mtypes.h"
 
 extern struct gl_framebuffer *
-_mesa_create_framebuffer(const GLvisual *visual);
+_mesa_create_framebuffer(const struct gl_config *visual);
 
 extern struct gl_framebuffer *
-_mesa_new_framebuffer(GLcontext *ctx, GLuint name);
+_mesa_new_framebuffer(struct gl_context *ctx, GLuint name);
 
 extern void
 _mesa_initialize_window_framebuffer(struct gl_framebuffer *fb,
-				     const GLvisual *visual);
+				     const struct gl_config *visual);
 
 extern void
 _mesa_initialize_user_framebuffer(struct gl_framebuffer *fb, GLuint name);
@@ -52,45 +52,45 @@ _mesa_reference_framebuffer(struct gl_framebuffer **ptr,
                             struct gl_framebuffer *fb);
 
 extern void
-_mesa_resize_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_resize_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
                          GLuint width, GLuint height);
 
 
 extern void
-_mesa_resizebuffers( GLcontext *ctx );
+_mesa_resizebuffers( struct gl_context *ctx );
 
 extern void GLAPIENTRY
 _mesa_ResizeBuffersMESA( void );
 
 
 extern void 
-_mesa_update_draw_buffer_bounds(GLcontext *ctx);
+_mesa_update_draw_buffer_bounds(struct gl_context *ctx);
 
 extern void
 _mesa_update_framebuffer_visual(struct gl_framebuffer *fb);
 
 extern void
-_mesa_update_depth_buffer(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_update_depth_buffer(struct gl_context *ctx, struct gl_framebuffer *fb,
                             GLuint attIndex);
 
 extern void
-_mesa_update_stencil_buffer(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_update_stencil_buffer(struct gl_context *ctx, struct gl_framebuffer *fb,
                             GLuint attIndex);
 
 extern void
-_mesa_update_framebuffer(GLcontext *ctx);
+_mesa_update_framebuffer(struct gl_context *ctx);
 
 extern GLboolean
-_mesa_source_buffer_exists(GLcontext *ctx, GLenum format);
+_mesa_source_buffer_exists(struct gl_context *ctx, GLenum format);
 
 extern GLboolean
-_mesa_dest_buffer_exists(GLcontext *ctx, GLenum format);
+_mesa_dest_buffer_exists(struct gl_context *ctx, GLenum format);
 
 extern GLenum
-_mesa_get_color_read_type(GLcontext *ctx);
+_mesa_get_color_read_type(struct gl_context *ctx);
 
 extern GLenum
-_mesa_get_color_read_format(GLcontext *ctx);
+_mesa_get_color_read_format(struct gl_context *ctx);
 
 extern void
 _mesa_print_framebuffer(const struct gl_framebuffer *fb);
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 2062134a390..8224c15627c 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -36,17 +36,17 @@
 
 /* This is a table driven implemetation of the glGet*v() functions.
  * The basic idea is that most getters just look up an int somewhere
- * in GLcontext and then convert it to a bool or float according to
+ * in struct gl_context and then convert it to a bool or float according to
  * which of glGetIntegerv() glGetBooleanv() etc is being called.
  * Instead of generating code to do this, we can just record the enum
- * value and the offset into GLcontext in an array of structs.  Then
+ * value and the offset into struct gl_context in an array of structs.  Then
  * in glGet*(), we lookup the struct for the enum in question, and use
  * the offset to get the int we need.
  *
  * Sometimes we need to look up a float, a boolean, a bit in a
  * bitfield, a matrix or other types instead, so we need to track the
- * type of the value in GLcontext.  And sometimes the value isn't in
- * GLcontext but in the drawbuffer, the array object, current texture
+ * type of the value in struct gl_context.  And sometimes the value isn't in
+ * struct gl_context but in the drawbuffer, the array object, current texture
  * unit, or maybe it's a computed value.  So we need to also track
  * where or how to find the value.  Finally, we sometimes need to
  * check that one of a number of extensions are enabled, the GL
@@ -165,7 +165,7 @@ union value {
 #define BUFFER_FIELD(field, type) \
    LOC_BUFFER, type, offsetof(struct gl_framebuffer, field)
 #define CONTEXT_FIELD(field, type) \
-   LOC_CONTEXT, type, offsetof(GLcontext, field)
+   LOC_CONTEXT, type, offsetof(struct gl_context, field)
 #define ARRAY_FIELD(field, type) \
    LOC_ARRAY, type, offsetof(struct gl_array_object, field)
 #define CONST(value) \
@@ -276,9 +276,6 @@ EXTRA_EXT(NV_fragment_program);
 EXTRA_EXT(NV_texture_rectangle);
 EXTRA_EXT(EXT_stencil_two_side);
 EXTRA_EXT(NV_light_max_exponent);
-EXTRA_EXT(EXT_convolution);
-EXTRA_EXT(EXT_histogram);
-EXTRA_EXT(SGI_color_table);
 EXTRA_EXT(SGI_texture_color_table);
 EXTRA_EXT(EXT_depth_bounds_test);
 EXTRA_EXT(ARB_depth_clamp);
@@ -374,7 +371,7 @@ static const struct value_desc values[] = {
    { GL_MAX_ELEMENTS_VERTICES, CONTEXT_INT(Const.MaxArrayLockSize), NO_EXTRA },
    { GL_MAX_ELEMENTS_INDICES, CONTEXT_INT(Const.MaxArrayLockSize), NO_EXTRA },
    { GL_MAX_TEXTURE_SIZE, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, Const.MaxTextureLevels), NO_EXTRA },
+     offsetof(struct gl_context, Const.MaxTextureLevels), NO_EXTRA },
    { GL_MAX_VIEWPORT_DIMS, CONTEXT_INT2(Const.MaxViewportWidth), NO_EXTRA },
    { GL_PACK_ALIGNMENT, CONTEXT_INT(Pack.Alignment), NO_EXTRA },
    { GL_ALIASED_POINT_SIZE_RANGE, CONTEXT_FLOAT2(Const.MinPointSize), NO_EXTRA },
@@ -413,7 +410,7 @@ static const struct value_desc values[] = {
    { GL_TEXTURE_BINDING_CUBE_MAP_ARB, LOC_CUSTOM, TYPE_INT,
      TEXTURE_CUBE_INDEX, extra_ARB_texture_cube_map },
    { GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, Const.MaxCubeTextureLevels),
+     offsetof(struct gl_context, Const.MaxCubeTextureLevels),
      extra_ARB_texture_cube_map }, /* XXX: OES_texture_cube_map */
 
    /* XXX: OES_blend_subtract */
@@ -525,7 +522,7 @@ static const struct value_desc values[] = {
    { GL_MAX_TEXTURE_STACK_DEPTH, CONST(MAX_TEXTURE_STACK_DEPTH), NO_EXTRA },
    { GL_MODELVIEW_MATRIX, CONTEXT_MATRIX(ModelviewMatrixStack.Top), NO_EXTRA },
    { GL_MODELVIEW_STACK_DEPTH, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, ModelviewMatrixStack.Depth), NO_EXTRA },
+     offsetof(struct gl_context, ModelviewMatrixStack.Depth), NO_EXTRA },
    { GL_NORMALIZE, CONTEXT_BOOL(Transform.Normalize), NO_EXTRA },
    { GL_PACK_SKIP_IMAGES_EXT, CONTEXT_INT(Pack.SkipImages), NO_EXTRA },
    { GL_PERSPECTIVE_CORRECTION_HINT, CONTEXT_ENUM(Hint.PerspectiveCorrection), NO_EXTRA },
@@ -538,7 +535,7 @@ static const struct value_desc values[] = {
    { GL_POINT_FADE_THRESHOLD_SIZE_EXT, CONTEXT_FLOAT(Point.Threshold), NO_EXTRA },
    { GL_PROJECTION_MATRIX, CONTEXT_MATRIX(ProjectionMatrixStack.Top), NO_EXTRA },
    { GL_PROJECTION_STACK_DEPTH, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, ProjectionMatrixStack.Depth), NO_EXTRA },
+     offsetof(struct gl_context, ProjectionMatrixStack.Depth), NO_EXTRA },
    { GL_RESCALE_NORMAL, CONTEXT_BOOL(Transform.RescaleNormals), NO_EXTRA },
    { GL_SHADE_MODEL, CONTEXT_ENUM(Light.ShadeModel), NO_EXTRA },
    { GL_TEXTURE_2D, LOC_CUSTOM, TYPE_BOOLEAN, 0, NO_EXTRA },
@@ -675,7 +672,7 @@ static const struct value_desc values[] = {
    /* OES_texture_3D */
    { GL_TEXTURE_BINDING_3D, LOC_CUSTOM, TYPE_INT, TEXTURE_3D_INDEX, NO_EXTRA },
    { GL_MAX_3D_TEXTURE_SIZE, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, Const.Max3DTextureLevels), NO_EXTRA },
+     offsetof(struct gl_context, Const.Max3DTextureLevels), NO_EXTRA },
 
    /* GL_ARB_fragment_program/OES_standard_derivatives */
    { GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB,
@@ -686,11 +683,11 @@ static const struct value_desc values[] = {
    /* Enums unique to OpenGL ES 2.0 */
    { 0, 0, TYPE_API_MASK, API_OPENGLES2_BIT, NO_EXTRA },
    { GL_MAX_FRAGMENT_UNIFORM_VECTORS, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, Const.FragmentProgram.MaxUniformComponents), NO_EXTRA },
+     offsetof(struct gl_context, Const.FragmentProgram.MaxUniformComponents), NO_EXTRA },
    { GL_MAX_VARYING_VECTORS, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, Const.MaxVarying), NO_EXTRA },
+     offsetof(struct gl_context, Const.MaxVarying), NO_EXTRA },
    { GL_MAX_VERTEX_UNIFORM_VECTORS, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, Const.VertexProgram.MaxUniformComponents), NO_EXTRA },
+     offsetof(struct gl_context, Const.VertexProgram.MaxUniformComponents), NO_EXTRA },
    { GL_SHADER_COMPILER, CONST(1), NO_EXTRA },
    /* OES_get_program_binary */
    { GL_NUM_SHADER_BINARY_FORMATS, CONST(0), NO_EXTRA },
@@ -876,84 +873,12 @@ static const struct value_desc values[] = {
      extra_EXT_compiled_vertex_array },
 
    /* GL_ARB_transpose_matrix */
-   { GL_TRANSPOSE_COLOR_MATRIX_ARB, CONTEXT_MATRIX_T(ColorMatrixStack.Top), NO_EXTRA },
    { GL_TRANSPOSE_MODELVIEW_MATRIX_ARB,
      CONTEXT_MATRIX_T(ModelviewMatrixStack), NO_EXTRA },
    { GL_TRANSPOSE_PROJECTION_MATRIX_ARB,
      CONTEXT_MATRIX_T(ProjectionMatrixStack.Top), NO_EXTRA },
    { GL_TRANSPOSE_TEXTURE_MATRIX_ARB, CONTEXT_MATRIX_T(TextureMatrixStack), NO_EXTRA },
 
-   /* GL_SGI_color_matrix (also in 1.2 imaging) */
-   { GL_COLOR_MATRIX_SGI, CONTEXT_MATRIX(ColorMatrixStack.Top), NO_EXTRA },
-   { GL_COLOR_MATRIX_STACK_DEPTH_SGI, LOC_CUSTOM, TYPE_INT,
-     offsetof(GLcontext, ColorMatrixStack.Depth), NO_EXTRA },
-   { GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI,
-     CONST(MAX_COLOR_STACK_DEPTH), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_RED_SCALE_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixScale[0]), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixScale[1]), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixScale[2]), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixScale[3]), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_RED_BIAS_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixBias[0]), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixBias[1]), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixBias[2]), NO_EXTRA },
-   { GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI,
-     CONTEXT_FLOAT(Pixel.PostColorMatrixBias[3]), NO_EXTRA },
-
-   /* GL_EXT_convolution (also in 1.2 imaging) */
-   { GL_CONVOLUTION_1D_EXT, CONTEXT_BOOL(Pixel.Convolution1DEnabled),
-     extra_EXT_convolution },
-   { GL_CONVOLUTION_2D_EXT, CONTEXT_BOOL(Pixel.Convolution2DEnabled),
-     extra_EXT_convolution },
-   { GL_SEPARABLE_2D_EXT, CONTEXT_BOOL(Pixel.Separable2DEnabled),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_RED_SCALE_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionScale[0]),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_GREEN_SCALE_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionScale[1]),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_BLUE_SCALE_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionScale[2]),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_ALPHA_SCALE_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionScale[3]),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_RED_BIAS_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionBias[0]),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_GREEN_BIAS_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionBias[1]),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_BLUE_BIAS_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionBias[2]),
-     extra_EXT_convolution },
-   { GL_POST_CONVOLUTION_ALPHA_BIAS_EXT,
-     CONTEXT_FLOAT(Pixel.PostConvolutionBias[3]),
-     extra_EXT_convolution },
-
-   /* GL_EXT_histogram / GL_ARB_imaging */
-   { GL_HISTOGRAM, CONTEXT_BOOL(Pixel.HistogramEnabled),
-     extra_EXT_histogram },
-   { GL_MINMAX, CONTEXT_BOOL(Pixel.MinMaxEnabled), extra_EXT_histogram },
-
-   /* GL_SGI_color_table / GL_ARB_imaging */
-   { GL_COLOR_TABLE_SGI,
-     CONTEXT_BOOL(Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION]),
-     extra_SGI_color_table },
-   { GL_POST_CONVOLUTION_COLOR_TABLE_SGI,
-     CONTEXT_BOOL(Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION]),
-     extra_SGI_color_table },
-   { GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI,
-     CONTEXT_BOOL(Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX]),
-     extra_SGI_color_table },
-
    /* GL_SGI_texture_color_table */
    { GL_TEXTURE_COLOR_TABLE_SGI, LOC_TEXUNIT, TYPE_BOOLEAN,
      offsetof(struct gl_texture_unit, ColorTableEnabled),
@@ -1331,7 +1256,7 @@ print_table_stats(void)
  *
  * \param the current context, for determining the API in question
  */
-void _mesa_init_get_hash(GLcontext *ctx)
+void _mesa_init_get_hash(struct gl_context *ctx)
 {
    int i, hash, index, mask;
    int api_mask = 0, api_bit;
@@ -1380,7 +1305,7 @@ void _mesa_init_get_hash(GLcontext *ctx)
  * \param v pointer to the tmp declared in the calling glGet*v() function
  */
 static void
-find_custom_value(GLcontext *ctx, const struct value_desc *d, union value *v)
+find_custom_value(struct gl_context *ctx, const struct value_desc *d, union value *v)
 {
    struct gl_buffer_object *buffer_obj;
    struct gl_client_array *array;
@@ -1467,7 +1392,6 @@ find_custom_value(GLcontext *ctx, const struct value_desc *d, union value *v)
 
    case GL_MODELVIEW_STACK_DEPTH:
    case GL_PROJECTION_STACK_DEPTH:
-   case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
       v->value_int = *(GLint *) ((char *) ctx + d->offset) + 1;
       break;
 
@@ -1659,7 +1583,7 @@ find_custom_value(GLcontext *ctx, const struct value_desc *d, union value *v)
  *     otherwise GL_TRUE.
  */
 static GLboolean
-check_extra(GLcontext *ctx, const char *func, const struct value_desc *d)
+check_extra(struct gl_context *ctx, const char *func, const struct value_desc *d)
 {
    const GLuint version = ctx->VersionMajor * 10 + ctx->VersionMinor;
    int total, enabled;
diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c
index 5e4fcd599c3..bfa283f6a30 100644
--- a/src/mesa/main/getstring.c
+++ b/src/mesa/main/getstring.c
@@ -30,26 +30,42 @@
 #include "enums.h"
 #include "extensions.h"
 
+
+/**
+ * Return the string for a glGetString(GL_SHADING_LANGUAGE_VERSION) query.
+ */
 static const GLubyte *
-shading_language_version(GLcontext *ctx)
+shading_language_version(struct gl_context *ctx)
 {
    switch (ctx->API) {
-#if FEATURE_ARB_shading_language_100
    case API_OPENGL:
-      if (ctx->Extensions.ARB_shading_language_120)
-	 return (const GLubyte *) "1.20";
-      else if (ctx->Extensions.ARB_shading_language_100)
-	 return (const GLubyte *) "1.10";
-      goto error;
-#endif
+      if (!ctx->Extensions.ARB_shader_objects) {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetString");
+         return (const GLubyte *) 0;
+      }
+
+      switch (ctx->Const.GLSLVersion) {
+      case 110:
+         return (const GLubyte *) "1.10";
+      case 120:
+         return (const GLubyte *) "1.20";
+      case 130:
+         return (const GLubyte *) "1.30";
+      default:
+         _mesa_problem(ctx,
+                       "Invalid GLSL version in shading_language_version()");
+         return (const GLubyte *) 0;
+      }
+      break;
 
    case API_OPENGLES2:
       return (const GLubyte *) "OpenGL ES GLSL ES 1.0.16";
 
    case API_OPENGLES:
+      /* fall-through */
+
    default:
-   error:
-      _mesa_error( ctx, GL_INVALID_ENUM, "glGetString" );
+      _mesa_problem(ctx, "Unexpected API value in shading_language_version()");
       return (const GLubyte *) 0;
    }
 }
@@ -217,7 +233,7 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params )
  * Returns the current GL error code, or GL_NO_ERROR.
  * \return current error code
  *
- * Returns __GLcontextRec::ErrorValue.
+ * Returns __struct gl_contextRec::ErrorValue.
  */
 GLenum GLAPIENTRY
 _mesa_GetError( void )
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 45f7b55ad2a..08ad5f32018 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -52,7 +52,6 @@
 #define GL_GLEXT_PROTOTYPES
 #include "GL/gl.h"
 #include "GL/glext.h"
-#include "GL/internal/glcore.h"
 
 
 /**
@@ -140,6 +139,25 @@ typedef void *GLeglImageOES;
  */
 #define MESA_GEOMETRY_PROGRAM 0x8c26
 
-
+/* Several fields of struct gl_config can take these as values.  Since
+ * GLX header files may not be available everywhere they need to be used,
+ * redefine them here.
+ */
+#define GLX_NONE                           0x8000
+#define GLX_SLOW_CONFIG                    0x8001
+#define GLX_TRUE_COLOR                     0x8002
+#define GLX_DIRECT_COLOR                   0x8003
+#define GLX_PSEUDO_COLOR                   0x8004
+#define GLX_STATIC_COLOR                   0x8005
+#define GLX_GRAY_SCALE                     0x8006
+#define GLX_STATIC_GRAY                    0x8007
+#define GLX_TRANSPARENT_RGB                0x8008
+#define GLX_TRANSPARENT_INDEX              0x8009
+#define GLX_NON_CONFORMANT_CONFIG          0x800D
+#define GLX_SWAP_EXCHANGE_OML              0x8061
+#define GLX_SWAP_COPY_OML                  0x8062
+#define GLX_SWAP_UNDEFINED_OML             0x8063
+
+#define GLX_DONT_CARE                      0xFFFFFFFF
 
 #endif /* GLHEADER_H */
diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index b624e6ecac1..72d924dcc38 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -277,7 +277,7 @@ _mesa_HashRemove(struct _mesa_HashTable *table, GLuint key)
  * \param table  the hash table to delete
  * \param callback  the callback function
  * \param userData  arbitrary pointer to pass along to the callback
- *                  (this is typically a GLcontext pointer)
+ *                  (this is typically a struct gl_context pointer)
  */
 void
 _mesa_HashDeleteAll(struct _mesa_HashTable *table,
@@ -313,7 +313,7 @@ _mesa_HashDeleteAll(struct _mesa_HashTable *table,
  * \param table  the hash table to walk
  * \param callback  the callback function
  * \param userData  arbitrary pointer to pass along to the callback
- *                  (this is typically a GLcontext pointer)
+ *                  (this is typically a struct gl_context pointer)
  */
 void
 _mesa_HashWalk(const struct _mesa_HashTable *table,
diff --git a/src/mesa/main/hint.c b/src/mesa/main/hint.c
index e2d4129a382..878f10d4a43 100644
--- a/src/mesa/main/hint.c
+++ b/src/mesa/main/hint.c
@@ -97,10 +97,6 @@ _mesa_Hint( GLenum target, GLenum mode )
 
       /* GL_SGIS_generate_mipmap */
       case GL_GENERATE_MIPMAP_HINT_SGIS:
-         if (!ctx->Extensions.SGIS_generate_mipmap) {
-            _mesa_error(ctx, GL_INVALID_ENUM, "glHint(target)");
-	    return;
-         }
          if (ctx->Hint.GenerateMipmap == mode)
             return;
 	 FLUSH_VERTICES(ctx, _NEW_HINT);
@@ -134,7 +130,7 @@ _mesa_Hint( GLenum target, GLenum mode )
 /*****                      Initialization                        *****/
 /**********************************************************************/
 
-void _mesa_init_hint( GLcontext * ctx )
+void _mesa_init_hint( struct gl_context * ctx )
 {
    /* Hint group */
    ctx->Hint.PerspectiveCorrection = GL_DONT_CARE;
diff --git a/src/mesa/main/hint.h b/src/mesa/main/hint.h
index bfc3887107d..66e78ad6557 100644
--- a/src/mesa/main/hint.h
+++ b/src/mesa/main/hint.h
@@ -45,7 +45,7 @@ extern void GLAPIENTRY
 _mesa_Hint( GLenum target, GLenum mode );
 
 extern void 
-_mesa_init_hint( GLcontext * ctx );
+_mesa_init_hint( struct gl_context * ctx );
 
 #else
 
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index 4e482bcd54b..b98e3219c53 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -26,8 +26,6 @@
 #include "glheader.h"
 #include "bufferobj.h"
 #include "colormac.h"
-#include "context.h"
-#include "image.h"
 #include "histogram.h"
 #include "macros.h"
 #include "main/dispatch.h"
@@ -35,585 +33,6 @@
 
 #if FEATURE_histogram
 
-
-/*
- * XXX the packed pixel formats haven't been tested.
- */
-static void
-pack_histogram( GLcontext *ctx,
-                GLuint n, CONST GLuint rgba[][4],
-                GLenum format, GLenum type, GLvoid *destination,
-                const struct gl_pixelstore_attrib *packing )
-{
-   const GLint comps = _mesa_components_in_format(format);
-   GLuint luminance[MAX_WIDTH];
-
-   if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA) {
-      GLuint i;
-      for (i = 0; i < n; i++) {
-         luminance[i] = rgba[i][RCOMP] + rgba[i][GCOMP] + rgba[i][BCOMP];
-      }
-   }
-
-#define PACK_MACRO(TYPE)					\
-   {								\
-      GLuint i;							\
-      switch (format) {						\
-         case GL_RED:						\
-            for (i=0;i<n;i++)					\
-               dst[i] = (TYPE) rgba[i][RCOMP];			\
-            break;						\
-         case GL_GREEN:						\
-            for (i=0;i<n;i++)					\
-               dst[i] = (TYPE) rgba[i][GCOMP];			\
-            break;						\
-         case GL_BLUE:						\
-            for (i=0;i<n;i++)					\
-               dst[i] = (TYPE) rgba[i][BCOMP];			\
-            break;						\
-         case GL_ALPHA:						\
-            for (i=0;i<n;i++)					\
-               dst[i] = (TYPE) rgba[i][ACOMP];			\
-            break;						\
-         case GL_LUMINANCE:					\
-            for (i=0;i<n;i++)					\
-               dst[i] = (TYPE) luminance[i];			\
-            break;						\
-         case GL_LUMINANCE_ALPHA:				\
-            for (i=0;i<n;i++) {					\
-               dst[i*2+0] = (TYPE) luminance[i];		\
-               dst[i*2+1] = (TYPE) rgba[i][ACOMP];		\
-            }							\
-            break;						\
-         case GL_RGB:						\
-            for (i=0;i<n;i++) {					\
-               dst[i*3+0] = (TYPE) rgba[i][RCOMP];		\
-               dst[i*3+1] = (TYPE) rgba[i][GCOMP];		\
-               dst[i*3+2] = (TYPE) rgba[i][BCOMP];		\
-            }							\
-            break;						\
-         case GL_RGBA:						\
-            for (i=0;i<n;i++) {					\
-               dst[i*4+0] = (TYPE) rgba[i][RCOMP];		\
-               dst[i*4+1] = (TYPE) rgba[i][GCOMP];		\
-               dst[i*4+2] = (TYPE) rgba[i][BCOMP];		\
-               dst[i*4+3] = (TYPE) rgba[i][ACOMP];		\
-            }							\
-            break;						\
-         case GL_BGR:						\
-            for (i=0;i<n;i++) {					\
-               dst[i*3+0] = (TYPE) rgba[i][BCOMP];		\
-               dst[i*3+1] = (TYPE) rgba[i][GCOMP];		\
-               dst[i*3+2] = (TYPE) rgba[i][RCOMP];		\
-            }							\
-            break;						\
-         case GL_BGRA:						\
-            for (i=0;i<n;i++) {					\
-               dst[i*4+0] = (TYPE) rgba[i][BCOMP];		\
-               dst[i*4+1] = (TYPE) rgba[i][GCOMP];		\
-               dst[i*4+2] = (TYPE) rgba[i][RCOMP];		\
-               dst[i*4+3] = (TYPE) rgba[i][ACOMP];		\
-            }							\
-            break;						\
-         case GL_ABGR_EXT:					\
-            for (i=0;i<n;i++) {					\
-               dst[i*4+0] = (TYPE) rgba[i][ACOMP];		\
-               dst[i*4+1] = (TYPE) rgba[i][BCOMP];		\
-               dst[i*4+2] = (TYPE) rgba[i][GCOMP];		\
-               dst[i*4+3] = (TYPE) rgba[i][RCOMP];		\
-            }							\
-            break;						\
-         default:						\
-            _mesa_problem(ctx, "bad format in pack_histogram");	\
-      }								\
-   }
-
-   switch (type) {
-      case GL_UNSIGNED_BYTE:
-         {
-            GLubyte *dst = (GLubyte *) destination;
-            PACK_MACRO(GLubyte);
-         }
-         break;
-      case GL_BYTE:
-         {
-            GLbyte *dst = (GLbyte *) destination;
-            PACK_MACRO(GLbyte);
-         }
-         break;
-      case GL_UNSIGNED_SHORT:
-         {
-            GLushort *dst = (GLushort *) destination;
-            PACK_MACRO(GLushort);
-            if (packing->SwapBytes) {
-               _mesa_swap2(dst, n * comps);
-            }
-         }
-         break;
-      case GL_SHORT:
-         {
-            GLshort *dst = (GLshort *) destination;
-            PACK_MACRO(GLshort);
-            if (packing->SwapBytes) {
-               _mesa_swap2((GLushort *) dst, n * comps);
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT:
-         {
-            GLuint *dst = (GLuint *) destination;
-            PACK_MACRO(GLuint);
-            if (packing->SwapBytes) {
-               _mesa_swap4(dst, n * comps);
-            }
-         }
-         break;
-      case GL_INT:
-         {
-            GLint *dst = (GLint *) destination;
-            PACK_MACRO(GLint);
-            if (packing->SwapBytes) {
-               _mesa_swap4((GLuint *) dst, n * comps);
-            }
-         }
-         break;
-      case GL_FLOAT:
-         {
-            GLfloat *dst = (GLfloat *) destination;
-            PACK_MACRO(GLfloat);
-            if (packing->SwapBytes) {
-               _mesa_swap4((GLuint *) dst, n * comps);
-            }
-         }
-         break;
-      case GL_HALF_FLOAT_ARB:
-         {
-            /* temporarily store as GLuints */
-            GLuint temp[4*HISTOGRAM_TABLE_SIZE];
-            GLuint *dst = temp;
-            GLhalfARB *half = (GLhalfARB *) destination;
-            GLuint i;
-            /* get GLuint values */
-            PACK_MACRO(GLuint);
-            /* convert to GLhalf */
-            for (i = 0; i < n * comps; i++) {
-               half[i] = _mesa_float_to_half((GLfloat) temp[i]);
-            }
-            if (packing->SwapBytes) {
-               _mesa_swap2((GLushort *) half, n * comps);
-            }
-         }
-         break;
-      case GL_UNSIGNED_BYTE_3_3_2:
-         if (format == GL_RGB) {
-            GLubyte *dst = (GLubyte *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x7) << 5)
-                      | ((rgba[i][GCOMP] & 0x7) << 2)
-                      | ((rgba[i][BCOMP] & 0x3)     );
-            }
-         }
-         else {
-            GLubyte *dst = (GLubyte *) destination;
-            GLuint i;
-            ASSERT(format == GL_BGR);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x7) << 5)
-                      | ((rgba[i][GCOMP] & 0x7) << 2)
-                      | ((rgba[i][RCOMP] & 0x3)     );
-            }
-         }
-         break;
-      case GL_UNSIGNED_BYTE_2_3_3_REV:
-         if (format == GL_RGB) {
-            GLubyte *dst = (GLubyte *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x3) << 6)
-                      | ((rgba[i][GCOMP] & 0x7) << 3)
-                      | ((rgba[i][BCOMP] & 0x7)     );
-            }
-         }
-         else {
-            GLubyte *dst = (GLubyte *) destination;
-            GLuint i;
-            ASSERT(format == GL_BGR);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x3) << 6)
-                      | ((rgba[i][GCOMP] & 0x7) << 3)
-                      | ((rgba[i][RCOMP] & 0x7)     );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_6_5:
-         if (format == GL_RGB) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
-                      | ((rgba[i][BCOMP] & 0x1f)      );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_BGR);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
-                      | ((rgba[i][RCOMP] & 0x1f)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_6_5_REV:
-         if (format == GL_RGB) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
-                      | ((rgba[i][RCOMP] & 0x1f)      );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_BGR);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x3f) <<  5)
-                      | ((rgba[i][BCOMP] & 0x1f)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_4_4_4_4:
-         if (format == GL_RGBA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0xf) << 12)
-                      | ((rgba[i][GCOMP] & 0xf) <<  8)
-                      | ((rgba[i][BCOMP] & 0xf) <<  4)
-                      | ((rgba[i][ACOMP] & 0xf)      );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0xf) << 12)
-                      | ((rgba[i][GCOMP] & 0xf) <<  8)
-                      | ((rgba[i][RCOMP] & 0xf) <<  4)
-                      | ((rgba[i][ACOMP] & 0xf)      );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xf) << 12)
-                      | ((rgba[i][BCOMP] & 0xf) <<  8)
-                      | ((rgba[i][GCOMP] & 0xf) <<  4)
-                      | ((rgba[i][RCOMP] & 0xf)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_4_4_4_4_REV:
-         if (format == GL_RGBA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xf) << 12)
-                      | ((rgba[i][BCOMP] & 0xf) <<  8)
-                      | ((rgba[i][GCOMP] & 0xf) <<  4)
-                      | ((rgba[i][RCOMP] & 0xf)      );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xf) << 12)
-                      | ((rgba[i][RCOMP] & 0xf) <<  8)
-                      | ((rgba[i][GCOMP] & 0xf) <<  4)
-                      | ((rgba[i][BCOMP] & 0xf)      );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0xf) << 12)
-                      | ((rgba[i][GCOMP] & 0xf) <<  8)
-                      | ((rgba[i][BCOMP] & 0xf) <<  4)
-                      | ((rgba[i][ACOMP] & 0xf)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_5_5_5_1:
-         if (format == GL_RGBA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][BCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][ACOMP] & 0x1)       );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][RCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][ACOMP] & 0x1)       );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x1f) << 11)
-                      | ((rgba[i][BCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][RCOMP] & 0x1)       );
-            }
-         }
-         break;
-      case GL_UNSIGNED_SHORT_1_5_5_5_REV:
-         if (format == GL_RGBA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x1f) << 11)
-                      | ((rgba[i][BCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][RCOMP] & 0x1)       );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x1f) << 11)
-                      | ((rgba[i][RCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][BCOMP] & 0x1)       );
-            }
-         }
-         else {
-            GLushort *dst = (GLushort *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x1f) << 11)
-                      | ((rgba[i][GCOMP] & 0x1f) <<  6)
-                      | ((rgba[i][BCOMP] & 0x1f) <<  1)
-                      | ((rgba[i][ACOMP] & 0x1)       );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_8_8_8_8:
-         if (format == GL_RGBA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0xff) << 24)
-                      | ((rgba[i][GCOMP] & 0xff) << 16)
-                      | ((rgba[i][BCOMP] & 0xff) <<  8)
-                      | ((rgba[i][ACOMP] & 0xff)      );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0xff) << 24)
-                      | ((rgba[i][GCOMP] & 0xff) << 16)
-                      | ((rgba[i][RCOMP] & 0xff) <<  8)
-                      | ((rgba[i][ACOMP] & 0xff)      );
-            }
-         }
-         else {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xff) << 24)
-                      | ((rgba[i][BCOMP] & 0xff) << 16)
-                      | ((rgba[i][GCOMP] & 0xff) <<  8)
-                      | ((rgba[i][RCOMP] & 0xff)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_8_8_8_8_REV:
-         if (format == GL_RGBA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xff) << 24)
-                      | ((rgba[i][BCOMP] & 0xff) << 16)
-                      | ((rgba[i][GCOMP] & 0xff) <<  8)
-                      | ((rgba[i][RCOMP] & 0xff)      );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0xff) << 24)
-                      | ((rgba[i][RCOMP] & 0xff) << 16)
-                      | ((rgba[i][GCOMP] & 0xff) <<  8)
-                      | ((rgba[i][BCOMP] & 0xff)      );
-            }
-         }
-         else {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0xff) << 24)
-                      | ((rgba[i][GCOMP] & 0xff) << 16)
-                      | ((rgba[i][BCOMP] & 0xff) <<  8)
-                      | ((rgba[i][ACOMP] & 0xff)      );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_10_10_10_2:
-         if (format == GL_RGBA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x3ff) << 22)
-                      | ((rgba[i][GCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][BCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][ACOMP] & 0x3)        );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][BCOMP] & 0x3ff) << 22)
-                      | ((rgba[i][GCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][RCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][ACOMP] & 0x3)        );
-            }
-         }
-         else {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x3ff) << 22)
-                      | ((rgba[i][BCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][GCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][RCOMP] & 0x3)        );
-            }
-         }
-         break;
-      case GL_UNSIGNED_INT_2_10_10_10_REV:
-         if (format == GL_RGBA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x3ff) << 22)
-                      | ((rgba[i][BCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][GCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][RCOMP] & 0x3)        );
-            }
-         }
-         else if (format == GL_BGRA) {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][ACOMP] & 0x3ff) << 22)
-                      | ((rgba[i][RCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][GCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][BCOMP] & 0x3)        );
-            }
-         }
-         else {
-            GLuint *dst = (GLuint *) destination;
-            GLuint i;
-            ASSERT(format == GL_ABGR_EXT);
-            for (i = 0; i < n; i++) {
-               dst[i] = ((rgba[i][RCOMP] & 0x3ff) << 22)
-                      | ((rgba[i][GCOMP] & 0x3ff) << 12)
-                      | ((rgba[i][BCOMP] & 0x3ff) <<  2)
-                      | ((rgba[i][ACOMP] & 0x3)        );
-            }
-         }
-         break;
-      default:
-         _mesa_problem(ctx, "Bad type in pack_histogram");
-   }
-
-#undef PACK_MACRO
-}
-
-
-/*
- * Given an internalFormat token passed to glHistogram or glMinMax,
- * return the corresponding base format.
- * Return -1 if invalid token.
- */
-static GLint
-base_histogram_format( GLenum format )
-{
-   switch (format) {
-      case GL_ALPHA:
-      case GL_ALPHA4:
-      case GL_ALPHA8:
-      case GL_ALPHA12:
-      case GL_ALPHA16:
-         return GL_ALPHA;
-      case GL_LUMINANCE:
-      case GL_LUMINANCE4:
-      case GL_LUMINANCE8:
-      case GL_LUMINANCE12:
-      case GL_LUMINANCE16:
-         return GL_LUMINANCE;
-      case GL_LUMINANCE_ALPHA:
-      case GL_LUMINANCE4_ALPHA4:
-      case GL_LUMINANCE6_ALPHA2:
-      case GL_LUMINANCE8_ALPHA8:
-      case GL_LUMINANCE12_ALPHA4:
-      case GL_LUMINANCE12_ALPHA12:
-      case GL_LUMINANCE16_ALPHA16:
-         return GL_LUMINANCE_ALPHA;
-      case GL_RGB:
-      case GL_R3_G3_B2:
-      case GL_RGB4:
-      case GL_RGB5:
-      case GL_RGB8:
-      case GL_RGB10:
-      case GL_RGB12:
-      case GL_RGB16:
-         return GL_RGB;
-      case GL_RGBA:
-      case GL_RGBA2:
-      case GL_RGBA4:
-      case GL_RGB5_A1:
-      case GL_RGBA8:
-      case GL_RGB10_A2:
-      case GL_RGBA12:
-      case GL_RGBA16:
-         return GL_RGBA;
-      default:
-         return -1;  /* error */
-   }
-}
-
-
-
 /**********************************************************************
  * API functions
  */
@@ -627,62 +46,8 @@ static void GLAPIENTRY
 _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmax");
-      return;
-   }
-
-   if (target != GL_MINMAX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmax(target)");
-      return;
-   }
-
-   if (format != GL_RED &&
-       format != GL_GREEN &&
-       format != GL_BLUE &&
-       format != GL_ALPHA &&
-       format != GL_RGB &&
-       format != GL_BGR &&
-       format != GL_RGBA &&
-       format != GL_BGRA &&
-       format != GL_ABGR_EXT &&
-       format != GL_LUMINANCE &&
-       format != GL_LUMINANCE_ALPHA) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinMax(format)");
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmax(format or type)");
-      return;
-   }
-
 
-   values = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack, 2, 1, 1,
-                                        format, type, values, "glGetMinmax");
-   if (!values)
-      return;
-
-   {
-      GLfloat minmax[2][4];
-      minmax[0][RCOMP] = CLAMP(ctx->MinMax.Min[RCOMP], 0.0F, 1.0F);
-      minmax[0][GCOMP] = CLAMP(ctx->MinMax.Min[GCOMP], 0.0F, 1.0F);
-      minmax[0][BCOMP] = CLAMP(ctx->MinMax.Min[BCOMP], 0.0F, 1.0F);
-      minmax[0][ACOMP] = CLAMP(ctx->MinMax.Min[ACOMP], 0.0F, 1.0F);
-      minmax[1][RCOMP] = CLAMP(ctx->MinMax.Max[RCOMP], 0.0F, 1.0F);
-      minmax[1][GCOMP] = CLAMP(ctx->MinMax.Max[GCOMP], 0.0F, 1.0F);
-      minmax[1][BCOMP] = CLAMP(ctx->MinMax.Max[BCOMP], 0.0F, 1.0F);
-      minmax[1][ACOMP] = CLAMP(ctx->MinMax.Max[ACOMP], 0.0F, 1.0F);
-      _mesa_pack_rgba_span_float(ctx, 2, minmax,
-                                 format, type, values, &ctx->Pack, 0x0);
-   }
-
-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-
-   if (reset) {
-      _mesa_ResetMinmax(GL_MINMAX);
-   }
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmax");
 }
 
 
@@ -690,59 +55,8 @@ static void GLAPIENTRY
 _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogram");
-      return;
-   }
-
-   if (target != GL_HISTOGRAM) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogram(target)");
-      return;
-   }
-
-   if (format != GL_RED &&
-       format != GL_GREEN &&
-       format != GL_BLUE &&
-       format != GL_ALPHA &&
-       format != GL_RGB &&
-       format != GL_BGR &&
-       format != GL_RGBA &&
-       format != GL_BGRA &&
-       format != GL_ABGR_EXT &&
-       format != GL_LUMINANCE &&
-       format != GL_LUMINANCE_ALPHA) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogram(format)");
-   }
-
-   if (!_mesa_is_legal_format_and_type(ctx, format, type)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogram(format or type)");
-      return;
-   }
 
-   values = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack,
-                                        ctx->Histogram.Width, 1, 1,
-                                        format, type, values,
-                                        "glGetHistogram");
-   if (!values)
-      return;
-
-   pack_histogram(ctx, ctx->Histogram.Width,
-                  (CONST GLuint (*)[4]) ctx->Histogram.Count,
-                  format, type, values, &ctx->Pack);
-
-   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
-
-   if (reset) {
-      GLuint i;
-      for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
-         ctx->Histogram.Count[i][0] = 0;
-         ctx->Histogram.Count[i][1] = 0;
-         ctx->Histogram.Count[i][2] = 0;
-         ctx->Histogram.Count[i][3] = 0;
-      }
-   }
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogram");
 }
 
 
@@ -750,46 +64,8 @@ static void GLAPIENTRY
 _mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameterfv");
-      return;
-   }
 
-   if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameterfv(target)");
-      return;
-   }
-
-   switch (pname) {
-      case GL_HISTOGRAM_WIDTH:
-         *params = (GLfloat) ctx->Histogram.Width;
-         break;
-      case GL_HISTOGRAM_FORMAT:
-         *params = (GLfloat) ctx->Histogram.Format;
-         break;
-      case GL_HISTOGRAM_RED_SIZE:
-         *params = (GLfloat) ctx->Histogram.RedSize;
-         break;
-      case GL_HISTOGRAM_GREEN_SIZE:
-         *params = (GLfloat) ctx->Histogram.GreenSize;
-         break;
-      case GL_HISTOGRAM_BLUE_SIZE:
-         *params = (GLfloat) ctx->Histogram.BlueSize;
-         break;
-      case GL_HISTOGRAM_ALPHA_SIZE:
-         *params = (GLfloat) ctx->Histogram.AlphaSize;
-         break;
-      case GL_HISTOGRAM_LUMINANCE_SIZE:
-         *params = (GLfloat) ctx->Histogram.LuminanceSize;
-         break;
-      case GL_HISTOGRAM_SINK:
-         *params = (GLfloat) ctx->Histogram.Sink;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameterfv(pname)");
-   }
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameterfv");
 }
 
 
@@ -797,46 +73,8 @@ static void GLAPIENTRY
 _mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameteriv");
-      return;
-   }
 
-   if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameteriv(target)");
-      return;
-   }
-
-   switch (pname) {
-      case GL_HISTOGRAM_WIDTH:
-         *params = (GLint) ctx->Histogram.Width;
-         break;
-      case GL_HISTOGRAM_FORMAT:
-         *params = (GLint) ctx->Histogram.Format;
-         break;
-      case GL_HISTOGRAM_RED_SIZE:
-         *params = (GLint) ctx->Histogram.RedSize;
-         break;
-      case GL_HISTOGRAM_GREEN_SIZE:
-         *params = (GLint) ctx->Histogram.GreenSize;
-         break;
-      case GL_HISTOGRAM_BLUE_SIZE:
-         *params = (GLint) ctx->Histogram.BlueSize;
-         break;
-      case GL_HISTOGRAM_ALPHA_SIZE:
-         *params = (GLint) ctx->Histogram.AlphaSize;
-         break;
-      case GL_HISTOGRAM_LUMINANCE_SIZE:
-         *params = (GLint) ctx->Histogram.LuminanceSize;
-         break;
-      case GL_HISTOGRAM_SINK:
-         *params = (GLint) ctx->Histogram.Sink;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetHistogramParameteriv(pname)");
-   }
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameteriv");
 }
 
 
@@ -844,25 +82,8 @@ static void GLAPIENTRY
 _mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameterfv");
-      return;
-   }
-   if (target != GL_MINMAX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmaxParameterfv(target)");
-      return;
-   }
-   if (pname == GL_MINMAX_FORMAT) {
-      *params = (GLfloat) ctx->MinMax.Format;
-   }
-   else if (pname == GL_MINMAX_SINK) {
-      *params = (GLfloat) ctx->MinMax.Sink;
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinMaxParameterfv(pname)");
-   }
 }
 
 
@@ -870,108 +91,17 @@ static void GLAPIENTRY
 _mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameteriv");
-      return;
-   }
-   if (target != GL_MINMAX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinmaxParameteriv(target)");
-      return;
-   }
-   if (pname == GL_MINMAX_FORMAT) {
-      *params = (GLint) ctx->MinMax.Format;
-   }
-   else if (pname == GL_MINMAX_SINK) {
-      *params = (GLint) ctx->MinMax.Sink;
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetMinMaxParameteriv(pname)");
-   }
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameteriv");
 }
 
 
 static void GLAPIENTRY
 _mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean sink)
 {
-   GLuint i;
-   GLboolean error = GL_FALSE;
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* sideeffects */
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glHistogram");
-      return;
-   }
 
-   if (target != GL_HISTOGRAM && target != GL_PROXY_HISTOGRAM) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glHistogram(target)");
-      return;
-   }
-
-   if (width < 0 || width > HISTOGRAM_TABLE_SIZE) {
-      if (target == GL_PROXY_HISTOGRAM) {
-         error = GL_TRUE;
-      }
-      else {
-         if (width < 0)
-            _mesa_error(ctx, GL_INVALID_VALUE, "glHistogram(width)");
-         else
-            _mesa_error(ctx, GL_TABLE_TOO_LARGE, "glHistogram(width)");
-         return;
-      }
-   }
-
-   if (width != 0 && !_mesa_is_pow_two(width)) {
-      if (target == GL_PROXY_HISTOGRAM) {
-         error = GL_TRUE;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glHistogram(width)");
-         return;
-      }
-   }
-
-   if (base_histogram_format(internalFormat) < 0) {
-      if (target == GL_PROXY_HISTOGRAM) {
-         error = GL_TRUE;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glHistogram(internalFormat)");
-         return;
-      }
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PIXEL);
-
-   /* reset histograms */
-   for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
-      ctx->Histogram.Count[i][0] = 0;
-      ctx->Histogram.Count[i][1] = 0;
-      ctx->Histogram.Count[i][2] = 0;
-      ctx->Histogram.Count[i][3] = 0;
-   }
-
-   if (error) {
-      ctx->Histogram.Width = 0;
-      ctx->Histogram.Format = 0;
-      ctx->Histogram.RedSize       = 0;
-      ctx->Histogram.GreenSize     = 0;
-      ctx->Histogram.BlueSize      = 0;
-      ctx->Histogram.AlphaSize     = 0;
-      ctx->Histogram.LuminanceSize = 0;
-   }
-   else {
-      ctx->Histogram.Width = width;
-      ctx->Histogram.Format = internalFormat;
-      ctx->Histogram.Sink = sink;
-      ctx->Histogram.RedSize       = 8 * sizeof(GLuint);
-      ctx->Histogram.GreenSize     = 8 * sizeof(GLuint);
-      ctx->Histogram.BlueSize      = 8 * sizeof(GLuint);
-      ctx->Histogram.AlphaSize     = 8 * sizeof(GLuint);
-      ctx->Histogram.LuminanceSize = 8 * sizeof(GLuint);
-   }
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glHistogram");
 }
 
 
@@ -979,53 +109,17 @@ static void GLAPIENTRY
 _mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glMinmax");
-      return;
-   }
 
-   if (target != GL_MINMAX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glMinMax(target)");
-      return;
-   }
-
-   if (base_histogram_format(internalFormat) < 0) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glMinMax(internalFormat)");
-      return;
-   }
-
-   if (ctx->MinMax.Sink == sink)
-      return;
-   FLUSH_VERTICES(ctx, _NEW_PIXEL);
-   ctx->MinMax.Sink = sink;
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glMinmax");
 }
 
 
 static void GLAPIENTRY
 _mesa_ResetHistogram(GLenum target)
 {
-   GLuint i;
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); /* sideeffects */
-
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glResetHistogram");
-      return;
-   }
-
-   if (target != GL_HISTOGRAM) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glResetHistogram(target)");
-      return;
-   }
 
-   for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
-      ctx->Histogram.Count[i][0] = 0;
-      ctx->Histogram.Count[i][1] = 0;
-      ctx->Histogram.Count[i][2] = 0;
-      ctx->Histogram.Count[i][3] = 0;
-   }
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glResetHistogram");
 }
 
 
@@ -1033,22 +127,8 @@ static void GLAPIENTRY
 _mesa_ResetMinmax(GLenum target)
 {
    GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glResetMinmax");
-      return;
-   }
-
-   if (target != GL_MINMAX) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glResetMinMax(target)");
-      return;
-   }
-
-   ctx->MinMax.Min[RCOMP] = 1000;    ctx->MinMax.Max[RCOMP] = -1000;
-   ctx->MinMax.Min[GCOMP] = 1000;    ctx->MinMax.Max[GCOMP] = -1000;
-   ctx->MinMax.Min[BCOMP] = 1000;    ctx->MinMax.Max[BCOMP] = -1000;
-   ctx->MinMax.Min[ACOMP] = 1000;    ctx->MinMax.Max[ACOMP] = -1000;
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glResetMinmax");
 }
 
 
@@ -1067,39 +147,4 @@ _mesa_init_histogram_dispatch(struct _glapi_table *disp)
    SET_ResetMinmax(disp, _mesa_ResetMinmax);
 }
 
-
 #endif /* FEATURE_histogram */
-
-
-/**********************************************************************/
-/*****                      Initialization                        *****/
-/**********************************************************************/
-
-void _mesa_init_histogram( GLcontext * ctx )
-{
-   int i;
-
-   /* Histogram group */
-   ctx->Histogram.Width = 0;
-   ctx->Histogram.Format = GL_RGBA;
-   ctx->Histogram.Sink = GL_FALSE;
-   ctx->Histogram.RedSize       = 0;
-   ctx->Histogram.GreenSize     = 0;
-   ctx->Histogram.BlueSize      = 0;
-   ctx->Histogram.AlphaSize     = 0;
-   ctx->Histogram.LuminanceSize = 0;
-   for (i = 0; i < HISTOGRAM_TABLE_SIZE; i++) {
-      ctx->Histogram.Count[i][0] = 0;
-      ctx->Histogram.Count[i][1] = 0;
-      ctx->Histogram.Count[i][2] = 0;
-      ctx->Histogram.Count[i][3] = 0;
-   }
-
-   /* Min/Max group */
-   ctx->MinMax.Format = GL_RGBA;
-   ctx->MinMax.Sink = GL_FALSE;
-   ctx->MinMax.Min[RCOMP] = 1000;    ctx->MinMax.Max[RCOMP] = -1000;
-   ctx->MinMax.Min[GCOMP] = 1000;    ctx->MinMax.Max[GCOMP] = -1000;
-   ctx->MinMax.Min[BCOMP] = 1000;    ctx->MinMax.Max[BCOMP] = -1000;
-   ctx->MinMax.Min[ACOMP] = 1000;    ctx->MinMax.Max[ACOMP] = -1000;
-}
diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h
index dbae1bbd06b..240087141b3 100644
--- a/src/mesa/main/histogram.h
+++ b/src/mesa/main/histogram.h
@@ -52,6 +52,4 @@ _mesa_init_histogram_dispatch(struct _glapi_table *disp)
 
 #endif /* FEATURE_histogram */
 
-extern void _mesa_init_histogram( GLcontext * ctx );
-
 #endif /* HISTOGRAM_H */
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 86aa6d0d702..2c3af332c0c 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -286,6 +286,7 @@ _mesa_components_in_format( GLenum format )
          return 1;
       case GL_LUMINANCE_ALPHA:
       case GL_LUMINANCE_ALPHA_INTEGER_EXT:
+      case GL_RG:
 	 return 2;
       case GL_RGB:
       case GL_RGB_INTEGER_EXT:
@@ -398,7 +399,7 @@ _mesa_bytes_per_pixel( GLenum format, GLenum type )
  * otherwise.
  */
 GLboolean
-_mesa_is_legal_format_and_type( GLcontext *ctx, GLenum format, GLenum type )
+_mesa_is_legal_format_and_type( struct gl_context *ctx, GLenum format, GLenum type )
 {
    switch (format) {
       case GL_COLOR_INDEX:
@@ -442,6 +443,24 @@ _mesa_is_legal_format_and_type( GLcontext *ctx, GLenum format, GLenum type )
             default:
                return GL_FALSE;
          }
+      case GL_RG:
+	 if (!ctx->Extensions.ARB_texture_rg)
+	    return GL_FALSE;
+
+         switch (type) {
+            case GL_BYTE:
+            case GL_UNSIGNED_BYTE:
+            case GL_SHORT:
+            case GL_UNSIGNED_SHORT:
+            case GL_INT:
+            case GL_UNSIGNED_INT:
+            case GL_FLOAT:
+               return GL_TRUE;
+            case GL_HALF_FLOAT_ARB:
+               return ctx->Extensions.ARB_half_float_pixel;
+            default:
+               return GL_FALSE;
+         }
       case GL_RGB:
          switch (type) {
             case GL_BYTE:
@@ -596,6 +615,11 @@ _mesa_is_color_format(GLenum format)
       case GL_INTENSITY8:
       case GL_INTENSITY12:
       case GL_INTENSITY16:
+      case GL_R8:
+      case GL_R16:
+      case GL_RG:
+      case GL_RG8:
+      case GL_RG16:
       case 3:
       case GL_RGB:
       case GL_BGR:
@@ -626,6 +650,10 @@ _mesa_is_color_format(GLenum format)
       case GL_LUMINANCE_ALPHA32F_ARB:
       case GL_INTENSITY16F_ARB:
       case GL_INTENSITY32F_ARB:
+      case GL_R16F:
+      case GL_R32F:
+      case GL_RG16F:
+      case GL_RG32F:
       case GL_RGB16F_ARB:
       case GL_RGB32F_ARB:
       case GL_RGBA16F_ARB:
@@ -635,6 +663,8 @@ _mesa_is_color_format(GLenum format)
       case GL_COMPRESSED_LUMINANCE:
       case GL_COMPRESSED_LUMINANCE_ALPHA:
       case GL_COMPRESSED_INTENSITY:
+      case GL_COMPRESSED_RED:
+      case GL_COMPRESSED_RG:
       case GL_COMPRESSED_RGB:
       case GL_COMPRESSED_RGBA:
       case GL_RGB_S3TC:
@@ -665,6 +695,10 @@ _mesa_is_color_format(GLenum format)
       case GL_COMPRESSED_SLUMINANCE_EXT:
       case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT:
 #endif /* FEATURE_EXT_texture_sRGB */
+      case GL_COMPRESSED_RED_RGTC1:
+      case GL_COMPRESSED_SIGNED_RED_RGTC1:
+      case GL_COMPRESSED_RG_RGTC2:
+      case GL_COMPRESSED_SIGNED_RG_RGTC2:
          return GL_TRUE;
       /* signed texture formats */
       case GL_RGBA_SNORM:
@@ -835,7 +869,7 @@ _mesa_is_integer_format(GLenum format)
  * \return GL_TRUE if compressed, GL_FALSE if uncompressed
  */
 GLboolean
-_mesa_is_compressed_format(GLcontext *ctx, GLenum format)
+_mesa_is_compressed_format(struct gl_context *ctx, GLenum format)
 {
    switch (format) {
    case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
@@ -857,6 +891,11 @@ _mesa_is_compressed_format(GLcontext *ctx, GLenum format)
    case GL_COMPRESSED_RGB_FXT1_3DFX:
    case GL_COMPRESSED_RGBA_FXT1_3DFX:
       return ctx->Extensions.TDFX_texture_compression_FXT1;
+   case GL_COMPRESSED_RED_RGTC1:
+   case GL_COMPRESSED_SIGNED_RED_RGTC1:
+   case GL_COMPRESSED_RG_RGTC2:
+   case GL_COMPRESSED_SIGNED_RG_RGTC2:
+      return ctx->Extensions.ARB_texture_compression_rgtc;
    default:
       return GL_FALSE;
    }
@@ -1502,7 +1541,7 @@ _mesa_scale_and_bias_rgba(GLuint n, GLfloat rgba[][4],
  * Apply pixel mapping to an array of floating point RGBA pixels.
  */
 void
-_mesa_map_rgba( const GLcontext *ctx, GLuint n, GLfloat rgba[][4] )
+_mesa_map_rgba( const struct gl_context *ctx, GLuint n, GLfloat rgba[][4] )
 {
    const GLfloat rscale = (GLfloat) (ctx->PixelMaps.RtoR.Size - 1);
    const GLfloat gscale = (GLfloat) (ctx->PixelMaps.GtoG.Size - 1);
@@ -1525,36 +1564,6 @@ _mesa_map_rgba( const GLcontext *ctx, GLuint n, GLfloat rgba[][4] )
    }
 }
 
-
-/*
- * Apply the color matrix and post color matrix scaling and biasing.
- */
-void
-_mesa_transform_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4])
-{
-   const GLfloat rs = ctx->Pixel.PostColorMatrixScale[0];
-   const GLfloat rb = ctx->Pixel.PostColorMatrixBias[0];
-   const GLfloat gs = ctx->Pixel.PostColorMatrixScale[1];
-   const GLfloat gb = ctx->Pixel.PostColorMatrixBias[1];
-   const GLfloat bs = ctx->Pixel.PostColorMatrixScale[2];
-   const GLfloat bb = ctx->Pixel.PostColorMatrixBias[2];
-   const GLfloat as = ctx->Pixel.PostColorMatrixScale[3];
-   const GLfloat ab = ctx->Pixel.PostColorMatrixBias[3];
-   const GLfloat *m = ctx->ColorMatrixStack.Top->m;
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      const GLfloat r = rgba[i][RCOMP];
-      const GLfloat g = rgba[i][GCOMP];
-      const GLfloat b = rgba[i][BCOMP];
-      const GLfloat a = rgba[i][ACOMP];
-      rgba[i][RCOMP] = (m[0] * r + m[4] * g + m[ 8] * b + m[12] * a) * rs + rb;
-      rgba[i][GCOMP] = (m[1] * r + m[5] * g + m[ 9] * b + m[13] * a) * gs + gb;
-      rgba[i][BCOMP] = (m[2] * r + m[6] * g + m[10] * b + m[14] * a) * bs + bb;
-      rgba[i][ACOMP] = (m[3] * r + m[7] * g + m[11] * b + m[15] * a) * as + ab;
-   }
-}
-
-
 /**
  * Apply a color table lookup to an array of floating point RGBA colors.
  */
@@ -1615,6 +1624,25 @@ _mesa_lookup_rgba_float(const struct gl_color_table *table,
             rgba[i][ACOMP] = alpha;;
          }
          break;
+      case GL_RED:
+         /* replace RGB with RGB */
+         for (i = 0; i < n; i++) {
+            GLint jR = IROUND(rgba[i][RCOMP] * scale);
+            jR = CLAMP(jR, 0, max);
+            rgba[i][RCOMP] = lut[jR * 3 + 0];
+         }
+         break;
+      case GL_RG:
+         /* replace RG with RG */
+         for (i = 0; i < n; i++) {
+            GLint jR = IROUND(rgba[i][RCOMP] * scale);
+            GLint jG = IROUND(rgba[i][GCOMP] * scale);
+            jR = CLAMP(jR, 0, max);
+            jG = CLAMP(jG, 0, max);
+            rgba[i][RCOMP] = lut[jR * 3 + 0];
+            rgba[i][GCOMP] = lut[jG * 3 + 1];
+         }
+         break;
       case GL_RGB:
          /* replace RGB with RGB */
          for (i = 0; i < n; i++) {
@@ -1801,7 +1829,7 @@ _mesa_lookup_rgba_ubyte(const struct gl_color_table *table,
  * Map color indexes to float rgba values.
  */
 void
-_mesa_map_ci_to_rgba( const GLcontext *ctx, GLuint n,
+_mesa_map_ci_to_rgba( const struct gl_context *ctx, GLuint n,
                       const GLuint index[], GLfloat rgba[][4] )
 {
    GLuint rmask = ctx->PixelMaps.ItoR.Size - 1;
@@ -1826,7 +1854,7 @@ _mesa_map_ci_to_rgba( const GLcontext *ctx, GLuint n,
  * Map ubyte color indexes to ubyte/RGBA values.
  */
 void
-_mesa_map_ci8_to_rgba8(const GLcontext *ctx, GLuint n, const GLubyte index[],
+_mesa_map_ci8_to_rgba8(const struct gl_context *ctx, GLuint n, const GLubyte index[],
                        GLubyte rgba[][4])
 {
    GLuint rmask = ctx->PixelMaps.ItoR.Size - 1;
@@ -1848,7 +1876,7 @@ _mesa_map_ci8_to_rgba8(const GLcontext *ctx, GLuint n, const GLubyte index[],
 
 
 void
-_mesa_scale_and_bias_depth(const GLcontext *ctx, GLuint n,
+_mesa_scale_and_bias_depth(const struct gl_context *ctx, GLuint n,
                            GLfloat depthValues[])
 {
    const GLfloat scale = ctx->Pixel.DepthScale;
@@ -1862,7 +1890,7 @@ _mesa_scale_and_bias_depth(const GLcontext *ctx, GLuint n,
 
 
 void
-_mesa_scale_and_bias_depth_uint(const GLcontext *ctx, GLuint n,
+_mesa_scale_and_bias_depth_uint(const struct gl_context *ctx, GLuint n,
                                 GLuint depthValues[])
 {
    const GLdouble max = (double) 0xffffffff;
@@ -1876,75 +1904,12 @@ _mesa_scale_and_bias_depth_uint(const GLcontext *ctx, GLuint n,
    }
 }
 
-
-
-/*
- * Update the min/max values from an array of fragment colors.
- */
-static void
-update_minmax(GLcontext *ctx, GLuint n, const GLfloat rgba[][4])
-{
-   GLuint i;
-   for (i = 0; i < n; i++) {
-      /* update mins */
-      if (rgba[i][RCOMP] < ctx->MinMax.Min[RCOMP])
-         ctx->MinMax.Min[RCOMP] = rgba[i][RCOMP];
-      if (rgba[i][GCOMP] < ctx->MinMax.Min[GCOMP])
-         ctx->MinMax.Min[GCOMP] = rgba[i][GCOMP];
-      if (rgba[i][BCOMP] < ctx->MinMax.Min[BCOMP])
-         ctx->MinMax.Min[BCOMP] = rgba[i][BCOMP];
-      if (rgba[i][ACOMP] < ctx->MinMax.Min[ACOMP])
-         ctx->MinMax.Min[ACOMP] = rgba[i][ACOMP];
-
-      /* update maxs */
-      if (rgba[i][RCOMP] > ctx->MinMax.Max[RCOMP])
-         ctx->MinMax.Max[RCOMP] = rgba[i][RCOMP];
-      if (rgba[i][GCOMP] > ctx->MinMax.Max[GCOMP])
-         ctx->MinMax.Max[GCOMP] = rgba[i][GCOMP];
-      if (rgba[i][BCOMP] > ctx->MinMax.Max[BCOMP])
-         ctx->MinMax.Max[BCOMP] = rgba[i][BCOMP];
-      if (rgba[i][ACOMP] > ctx->MinMax.Max[ACOMP])
-         ctx->MinMax.Max[ACOMP] = rgba[i][ACOMP];
-   }
-}
-
-
-/*
- * Update the histogram values from an array of fragment colors.
- */
-static void
-update_histogram(GLcontext *ctx, GLuint n, const GLfloat rgba[][4])
-{
-   const GLint max = ctx->Histogram.Width - 1;
-   GLfloat w = (GLfloat) max;
-   GLuint i;
-
-   if (ctx->Histogram.Width == 0)
-      return;
-
-   for (i = 0; i < n; i++) {
-      GLint ri = IROUND(rgba[i][RCOMP] * w);
-      GLint gi = IROUND(rgba[i][GCOMP] * w);
-      GLint bi = IROUND(rgba[i][BCOMP] * w);
-      GLint ai = IROUND(rgba[i][ACOMP] * w);
-      ri = CLAMP(ri, 0, max);
-      gi = CLAMP(gi, 0, max);
-      bi = CLAMP(bi, 0, max);
-      ai = CLAMP(ai, 0, max);
-      ctx->Histogram.Count[ri][RCOMP]++;
-      ctx->Histogram.Count[gi][GCOMP]++;
-      ctx->Histogram.Count[bi][BCOMP]++;
-      ctx->Histogram.Count[ai][ACOMP]++;
-   }
-}
-
-
 /**
  * Apply various pixel transfer operations to an array of RGBA pixels
  * as indicated by the transferOps bitmask
  */
 void
-_mesa_apply_rgba_transfer_ops(GLcontext *ctx, GLbitfield transferOps,
+_mesa_apply_rgba_transfer_ops(struct gl_context *ctx, GLbitfield transferOps,
                               GLuint n, GLfloat rgba[][4])
 {
    /* scale & bias */
@@ -1959,47 +1924,7 @@ _mesa_apply_rgba_transfer_ops(GLcontext *ctx, GLbitfield transferOps,
    if (transferOps & IMAGE_MAP_COLOR_BIT) {
       _mesa_map_rgba( ctx, n, rgba );
    }
-   /* GL_COLOR_TABLE lookup */
-   if (transferOps & IMAGE_COLOR_TABLE_BIT) {
-      _mesa_lookup_rgba_float(&ctx->ColorTable[COLORTABLE_PRECONVOLUTION], n, rgba);
-   }
-   /* convolution */
-   if (transferOps & IMAGE_CONVOLUTION_BIT) {
-      /* this has to be done in the calling code */
-      _mesa_problem(ctx, "IMAGE_CONVOLUTION_BIT set in _mesa_apply_transfer_ops");
-   }
-   /* GL_POST_CONVOLUTION_RED/GREEN/BLUE/ALPHA_SCALE/BIAS */
-   if (transferOps & IMAGE_POST_CONVOLUTION_SCALE_BIAS) {
-      _mesa_scale_and_bias_rgba(n, rgba,
-                                ctx->Pixel.PostConvolutionScale[RCOMP],
-                                ctx->Pixel.PostConvolutionScale[GCOMP],
-                                ctx->Pixel.PostConvolutionScale[BCOMP],
-                                ctx->Pixel.PostConvolutionScale[ACOMP],
-                                ctx->Pixel.PostConvolutionBias[RCOMP],
-                                ctx->Pixel.PostConvolutionBias[GCOMP],
-                                ctx->Pixel.PostConvolutionBias[BCOMP],
-                                ctx->Pixel.PostConvolutionBias[ACOMP]);
-   }
-   /* GL_POST_CONVOLUTION_COLOR_TABLE lookup */
-   if (transferOps & IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT) {
-      _mesa_lookup_rgba_float(&ctx->ColorTable[COLORTABLE_POSTCONVOLUTION], n, rgba);
-   }
-   /* color matrix transform */
-   if (transferOps & IMAGE_COLOR_MATRIX_BIT) {
-      _mesa_transform_rgba(ctx, n, rgba);
-   }
-   /* GL_POST_COLOR_MATRIX_COLOR_TABLE lookup */
-   if (transferOps & IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT) {
-      _mesa_lookup_rgba_float(&ctx->ColorTable[COLORTABLE_POSTCOLORMATRIX], n, rgba);
-   }
-   /* update histogram count */
-   if (transferOps & IMAGE_HISTOGRAM_BIT) {
-      update_histogram(ctx, n, (CONST GLfloat (*)[4]) rgba);
-   }
-   /* update min/max values */
-   if (transferOps & IMAGE_MIN_MAX_BIT) {
-      update_minmax(ctx, n, (CONST GLfloat (*)[4]) rgba);
-   }
+
    /* clamping to [0,1] */
    if (transferOps & IMAGE_CLAMP_BIT) {
       GLuint i;
@@ -2017,7 +1942,7 @@ _mesa_apply_rgba_transfer_ops(GLcontext *ctx, GLbitfield transferOps,
  * Apply color index shift and offset to an array of pixels.
  */
 static void
-shift_and_offset_ci( const GLcontext *ctx, GLuint n, GLuint indexes[] )
+shift_and_offset_ci( const struct gl_context *ctx, GLuint n, GLuint indexes[] )
 {
    GLint shift = ctx->Pixel.IndexShift;
    GLint offset = ctx->Pixel.IndexOffset;
@@ -2047,7 +1972,7 @@ shift_and_offset_ci( const GLcontext *ctx, GLuint n, GLuint indexes[] )
  * of color indexes;
  */
 void
-_mesa_apply_ci_transfer_ops(const GLcontext *ctx, GLbitfield transferOps,
+_mesa_apply_ci_transfer_ops(const struct gl_context *ctx, GLbitfield transferOps,
                             GLuint n, GLuint indexes[])
 {
    if (transferOps & IMAGE_SHIFT_OFFSET_BIT) {
@@ -2069,7 +1994,7 @@ _mesa_apply_ci_transfer_ops(const GLcontext *ctx, GLbitfield transferOps,
  * of stencil values.
  */
 void
-_mesa_apply_stencil_transfer_ops(const GLcontext *ctx, GLuint n,
+_mesa_apply_stencil_transfer_ops(const struct gl_context *ctx, GLuint n,
                                  GLstencil stencil[])
 {
    if (ctx->Pixel.IndexShift != 0 || ctx->Pixel.IndexOffset != 0) {
@@ -2105,13 +2030,12 @@ _mesa_apply_stencil_transfer_ops(const GLcontext *ctx, GLuint n,
 
 /**
  * Used to pack an array [][4] of RGBA float colors as specified
- * by the dstFormat, dstType and dstPacking.  Used by glReadPixels,
- * glGetConvolutionFilter(), etc.
+ * by the dstFormat, dstType and dstPacking.  Used by glReadPixels.
  * Note: the rgba values will be modified by this function when any pixel
  * transfer ops are enabled.
  */
 void
-_mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
+_mesa_pack_rgba_span_float(struct gl_context *ctx, GLuint n, GLfloat rgba[][4],
                            GLenum dstFormat, GLenum dstType,
                            GLvoid *dstAddr,
                            const struct gl_pixelstore_attrib *dstPacking,
@@ -2132,9 +2056,6 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
 
    if (transferOps) {
       _mesa_apply_rgba_transfer_ops(ctx, transferOps, n, rgba);
-      if ((transferOps & IMAGE_MIN_MAX_BIT) && ctx->MinMax.Sink) {
-         return;
-      }
    }
 
    if (dstFormat == GL_LUMINANCE || dstFormat == GL_LUMINANCE_ALPHA) {
@@ -3338,6 +3259,7 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
           srcFormat == GL_LUMINANCE ||
           srcFormat == GL_LUMINANCE_ALPHA ||
           srcFormat == GL_INTENSITY ||
+          srcFormat == GL_RG ||
           srcFormat == GL_RGB ||
           srcFormat == GL_BGR ||
           srcFormat == GL_RGBA ||
@@ -3420,6 +3342,18 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
          redIndex = greenIndex = blueIndex = alphaIndex = 0;
          stride = 1;
          break;
+      case GL_RG:
+      case GL_RG_INTEGER:
+         redIndex = 0;
+         greenIndex = 1;
+         blueIndex = -1;
+         alphaIndex = -1;
+         rComp = 0;
+         gComp = 1;
+         bComp = 2;
+         aComp = 3;
+         stride = 2;
+         break;
       case GL_RGB:
       case GL_RGB_INTEGER:
          redIndex = 0;
@@ -3978,7 +3912,7 @@ extract_float_rgba(GLuint n, GLfloat rgba[][4],
  * XXX perhaps expand this to process whole images someday.
  */
 void
-_mesa_unpack_color_span_chan( GLcontext *ctx,
+_mesa_unpack_color_span_chan( struct gl_context *ctx,
                               GLuint n, GLenum dstFormat, GLchan dest[],
                               GLenum srcFormat, GLenum srcType,
                               const GLvoid *source,
@@ -3989,6 +3923,8 @@ _mesa_unpack_color_span_chan( GLcontext *ctx,
           dstFormat == GL_LUMINANCE ||
           dstFormat == GL_LUMINANCE_ALPHA ||
           dstFormat == GL_INTENSITY ||
+          dstFormat == GL_RED ||
+          dstFormat == GL_RG ||
           dstFormat == GL_RGB ||
           dstFormat == GL_RGBA ||
           dstFormat == GL_COLOR_INDEX);
@@ -4000,6 +3936,7 @@ _mesa_unpack_color_span_chan( GLcontext *ctx,
           srcFormat == GL_LUMINANCE ||
           srcFormat == GL_LUMINANCE_ALPHA ||
           srcFormat == GL_INTENSITY ||
+          srcFormat == GL_RG ||
           srcFormat == GL_RGB ||
           srcFormat == GL_BGR ||
           srcFormat == GL_RGBA ||
@@ -4227,6 +4164,17 @@ _mesa_unpack_color_span_chan( GLcontext *ctx,
             dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
             dstLuminanceIndex = -1;
             break;
+         case GL_RED:
+            dstRedIndex = 0;
+            dstGreenIndex = dstBlueIndex = -1;
+            dstAlphaIndex = dstLuminanceIndex = dstIntensityIndex = -1;
+            break;
+         case GL_RG:
+            dstRedIndex = 0;
+            dstGreenIndex = 1;
+            dstBlueIndex = -1;
+            dstAlphaIndex = dstLuminanceIndex = dstIntensityIndex = -1;
+            break;
          case GL_RGB:
             dstRedIndex = 0;
             dstGreenIndex = 1;
@@ -4314,7 +4262,7 @@ _mesa_unpack_color_span_chan( GLcontext *ctx,
  * instead of GLchan.
  */
 void
-_mesa_unpack_color_span_float( GLcontext *ctx,
+_mesa_unpack_color_span_float( struct gl_context *ctx,
                                GLuint n, GLenum dstFormat, GLfloat dest[],
                                GLenum srcFormat, GLenum srcType,
                                const GLvoid *source,
@@ -4325,6 +4273,8 @@ _mesa_unpack_color_span_float( GLcontext *ctx,
           dstFormat == GL_LUMINANCE ||
           dstFormat == GL_LUMINANCE_ALPHA ||
           dstFormat == GL_INTENSITY ||
+          dstFormat == GL_RED ||
+          dstFormat == GL_RG ||
           dstFormat == GL_RGB ||
           dstFormat == GL_RGBA ||
           dstFormat == GL_COLOR_INDEX);
@@ -4336,6 +4286,7 @@ _mesa_unpack_color_span_float( GLcontext *ctx,
           srcFormat == GL_LUMINANCE ||
           srcFormat == GL_LUMINANCE_ALPHA ||
           srcFormat == GL_INTENSITY ||
+          srcFormat == GL_RG ||
           srcFormat == GL_RGB ||
           srcFormat == GL_BGR ||
           srcFormat == GL_RGBA ||
@@ -4452,6 +4403,17 @@ _mesa_unpack_color_span_float( GLcontext *ctx,
             dstRedIndex = dstGreenIndex = dstBlueIndex = dstAlphaIndex = -1;
             dstLuminanceIndex = -1;
             break;
+         case GL_RED:
+            dstRedIndex = 0;
+            dstGreenIndex = dstBlueIndex = -1;
+            dstAlphaIndex = dstLuminanceIndex = dstIntensityIndex = -1;
+            break;
+         case GL_RG:
+            dstRedIndex = 0;
+            dstGreenIndex = 1;
+            dstBlueIndex = -1;
+            dstAlphaIndex = dstLuminanceIndex = dstIntensityIndex = -1;
+            break;
          case GL_RGB:
             dstRedIndex = 0;
             dstGreenIndex = 1;
@@ -4536,7 +4498,7 @@ _mesa_unpack_color_span_float( GLcontext *ctx,
  * directly return GLbyte data, no transfer ops apply.
  */
 void
-_mesa_unpack_dudv_span_byte( GLcontext *ctx,
+_mesa_unpack_dudv_span_byte( struct gl_context *ctx,
                              GLuint n, GLenum dstFormat, GLbyte dest[],
                              GLenum srcFormat, GLenum srcType,
                              const GLvoid *source,
@@ -4603,7 +4565,7 @@ _mesa_unpack_dudv_span_byte( GLcontext *ctx,
  *        transferOps - the pixel transfer operations to apply
  */
 void
-_mesa_unpack_index_span( const GLcontext *ctx, GLuint n,
+_mesa_unpack_index_span( const struct gl_context *ctx, GLuint n,
                          GLenum dstType, GLvoid *dest,
                          GLenum srcType, const GLvoid *source,
                          const struct gl_pixelstore_attrib *srcPacking,
@@ -4681,7 +4643,7 @@ _mesa_unpack_index_span( const GLcontext *ctx, GLuint n,
 
 
 void
-_mesa_pack_index_span( const GLcontext *ctx, GLuint n,
+_mesa_pack_index_span( const struct gl_context *ctx, GLuint n,
                        GLenum dstType, GLvoid *dest, const GLuint *source,
                        const struct gl_pixelstore_attrib *dstPacking,
                        GLbitfield transferOps )
@@ -4811,7 +4773,7 @@ _mesa_pack_index_span( const GLcontext *ctx, GLuint n,
  *        transferOps - apply offset/bias/lookup ops?
  */
 void
-_mesa_unpack_stencil_span( const GLcontext *ctx, GLuint n,
+_mesa_unpack_stencil_span( const struct gl_context *ctx, GLuint n,
                            GLenum dstType, GLvoid *dest,
                            GLenum srcType, const GLvoid *source,
                            const struct gl_pixelstore_attrib *srcPacking,
@@ -4906,7 +4868,7 @@ _mesa_unpack_stencil_span( const GLcontext *ctx, GLuint n,
 
 
 void
-_mesa_pack_stencil_span( const GLcontext *ctx, GLuint n,
+_mesa_pack_stencil_span( const struct gl_context *ctx, GLuint n,
                          GLenum dstType, GLvoid *dest, const GLstencil *source,
                          const struct gl_pixelstore_attrib *dstPacking )
 {
@@ -5081,7 +5043,7 @@ _mesa_pack_stencil_span( const GLcontext *ctx, GLuint n,
  *                  (ignored for GLfloat).
  */
 void
-_mesa_unpack_depth_span( const GLcontext *ctx, GLuint n,
+_mesa_unpack_depth_span( const struct gl_context *ctx, GLuint n,
                          GLenum dstType, GLvoid *dest, GLuint depthMax,
                          GLenum srcType, const GLvoid *source,
                          const struct gl_pixelstore_attrib *srcPacking )
@@ -5280,7 +5242,7 @@ _mesa_unpack_depth_span( const GLcontext *ctx, GLuint n,
  * Pack an array of depth values.  The values are floats in [0,1].
  */
 void
-_mesa_pack_depth_span( const GLcontext *ctx, GLuint n, GLvoid *dest,
+_mesa_pack_depth_span( const struct gl_context *ctx, GLuint n, GLvoid *dest,
                        GLenum dstType, const GLfloat *depthSpan,
                        const struct gl_pixelstore_attrib *dstPacking )
 {
@@ -5396,7 +5358,7 @@ _mesa_pack_depth_span( const GLcontext *ctx, GLuint n, GLvoid *dest,
  * Pack depth and stencil values as GL_DEPTH_STENCIL/GL_UNSIGNED_INT_24_8.
  */
 void
-_mesa_pack_depth_stencil_span(const GLcontext *ctx, GLuint n, GLuint *dest,
+_mesa_pack_depth_stencil_span(const struct gl_context *ctx, GLuint n, GLuint *dest,
                               const GLfloat *depthVals,
                               const GLstencil *stencilVals,
                               const struct gl_pixelstore_attrib *dstPacking)
@@ -5711,12 +5673,12 @@ _mesa_convert_colors(GLenum srcType, const GLvoid *src,
  *          GL_FALSE if image was completely clipped away (draw nothing)
  */
 GLboolean
-_mesa_clip_drawpixels(const GLcontext *ctx,
+_mesa_clip_drawpixels(const struct gl_context *ctx,
                       GLint *destX, GLint *destY,
                       GLsizei *width, GLsizei *height,
                       struct gl_pixelstore_attrib *unpack)
 {
-   const GLframebuffer *buffer = ctx->DrawBuffer;
+   const struct gl_framebuffer *buffer = ctx->DrawBuffer;
 
    if (unpack->RowLength == 0) {
       unpack->RowLength = *width;
@@ -5782,12 +5744,12 @@ _mesa_clip_drawpixels(const GLcontext *ctx,
  *          GL_FALSE if image was completely clipped away (draw nothing)
  */
 GLboolean
-_mesa_clip_readpixels(const GLcontext *ctx,
+_mesa_clip_readpixels(const struct gl_context *ctx,
                       GLint *srcX, GLint *srcY,
                       GLsizei *width, GLsizei *height,
                       struct gl_pixelstore_attrib *pack)
 {
-   const GLframebuffer *buffer = ctx->ReadBuffer;
+   const struct gl_framebuffer *buffer = ctx->ReadBuffer;
 
    if (pack->RowLength == 0) {
       pack->RowLength = *width;
@@ -5832,7 +5794,7 @@ _mesa_clip_readpixels(const GLcontext *ctx,
  * \return GL_FALSE if region is totally clipped, GL_TRUE otherwise.
  */
 GLboolean
-_mesa_clip_copytexsubimage(const GLcontext *ctx,
+_mesa_clip_copytexsubimage(const struct gl_context *ctx,
                            GLint *destX, GLint *destY,
                            GLint *srcX, GLint *srcY,
                            GLsizei *width, GLsizei *height)
@@ -5975,7 +5937,7 @@ clip_left_or_bottom(GLint *srcX0, GLint *srcX1,
  * \return GL_TRUE if anything is left to draw, GL_FALSE if totally clipped
  */
 GLboolean
-_mesa_clip_blit(GLcontext *ctx,
+_mesa_clip_blit(struct gl_context *ctx,
                 GLint *srcX0, GLint *srcY0, GLint *srcX1, GLint *srcY1,
                 GLint *dstX0, GLint *dstY0, GLint *dstX1, GLint *dstY1)
 {
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index 8b180d6bfe6..ed5ffa368c5 100644
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -52,7 +52,7 @@ extern GLint
 _mesa_bytes_per_pixel( GLenum format, GLenum type );
 
 extern GLboolean
-_mesa_is_legal_format_and_type( GLcontext *ctx, GLenum format, GLenum type );
+_mesa_is_legal_format_and_type( struct gl_context *ctx, GLenum format, GLenum type );
 
 extern GLboolean
 _mesa_is_color_format(GLenum format);
@@ -82,7 +82,7 @@ extern GLboolean
 _mesa_is_integer_format(GLenum format);
 
 extern GLboolean
-_mesa_is_compressed_format(GLcontext *ctx, GLenum format);
+_mesa_is_compressed_format(struct gl_context *ctx, GLenum format);
 
 extern GLvoid *
 _mesa_image_address( GLuint dimensions,
@@ -161,12 +161,7 @@ _mesa_scale_and_bias_rgba(GLuint n, GLfloat rgba[][4],
                           GLfloat bBias, GLfloat aBias);
 
 extern void
-_mesa_map_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
-
-
-extern void
-_mesa_transform_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
-
+_mesa_map_rgba(const struct gl_context *ctx, GLuint n, GLfloat rgba[][4]);
 
 extern void
 _mesa_lookup_rgba_float(const struct gl_color_table *table,
@@ -178,47 +173,47 @@ _mesa_lookup_rgba_ubyte(const struct gl_color_table *table,
 
 
 extern void
-_mesa_map_ci_to_rgba(const GLcontext *ctx,
+_mesa_map_ci_to_rgba(const struct gl_context *ctx,
                      GLuint n, const GLuint index[], GLfloat rgba[][4]);
 
 
 extern void
-_mesa_map_ci8_to_rgba8(const GLcontext *ctx, GLuint n, const GLubyte index[],
+_mesa_map_ci8_to_rgba8(const struct gl_context *ctx, GLuint n, const GLubyte index[],
                        GLubyte rgba[][4]);
 
 
 extern void
-_mesa_scale_and_bias_depth(const GLcontext *ctx, GLuint n,
+_mesa_scale_and_bias_depth(const struct gl_context *ctx, GLuint n,
                            GLfloat depthValues[]);
 
 extern void
-_mesa_scale_and_bias_depth_uint(const GLcontext *ctx, GLuint n,
+_mesa_scale_and_bias_depth_uint(const struct gl_context *ctx, GLuint n,
                                 GLuint depthValues[]);
 
 extern void
-_mesa_apply_rgba_transfer_ops(GLcontext *ctx, GLbitfield transferOps,
+_mesa_apply_rgba_transfer_ops(struct gl_context *ctx, GLbitfield transferOps,
                               GLuint n, GLfloat rgba[][4]);
 
 
 extern void
-_mesa_apply_ci_transfer_ops(const GLcontext *ctx, GLbitfield transferOps,
+_mesa_apply_ci_transfer_ops(const struct gl_context *ctx, GLbitfield transferOps,
                             GLuint n, GLuint indexes[]);
 
 
 extern void
-_mesa_apply_stencil_transfer_ops(const GLcontext *ctx, GLuint n,
+_mesa_apply_stencil_transfer_ops(const struct gl_context *ctx, GLuint n,
                                  GLstencil stencil[]);
 
 
 extern void
-_mesa_pack_rgba_span_float( GLcontext *ctx, GLuint n, GLfloat rgba[][4],
+_mesa_pack_rgba_span_float( struct gl_context *ctx, GLuint n, GLfloat rgba[][4],
                             GLenum dstFormat, GLenum dstType, GLvoid *dstAddr,
                             const struct gl_pixelstore_attrib *dstPacking,
                             GLbitfield transferOps );
 
 
 extern void
-_mesa_unpack_color_span_chan( GLcontext *ctx,
+_mesa_unpack_color_span_chan( struct gl_context *ctx,
                               GLuint n, GLenum dstFormat, GLchan dest[],
                               GLenum srcFormat, GLenum srcType,
                               const GLvoid *source,
@@ -227,7 +222,7 @@ _mesa_unpack_color_span_chan( GLcontext *ctx,
 
 
 extern void
-_mesa_unpack_color_span_float( GLcontext *ctx,
+_mesa_unpack_color_span_float( struct gl_context *ctx,
                                GLuint n, GLenum dstFormat, GLfloat dest[],
                                GLenum srcFormat, GLenum srcType,
                                const GLvoid *source,
@@ -235,7 +230,7 @@ _mesa_unpack_color_span_float( GLcontext *ctx,
                                GLbitfield transferOps );
 
 extern void
-_mesa_unpack_dudv_span_byte( GLcontext *ctx,
+_mesa_unpack_dudv_span_byte( struct gl_context *ctx,
                              GLuint n, GLenum dstFormat, GLbyte dest[],
                              GLenum srcFormat, GLenum srcType,
                              const GLvoid *source,
@@ -243,7 +238,7 @@ _mesa_unpack_dudv_span_byte( GLcontext *ctx,
                              GLbitfield transferOps );
 
 extern void
-_mesa_unpack_index_span( const GLcontext *ctx, GLuint n,
+_mesa_unpack_index_span( const struct gl_context *ctx, GLuint n,
                          GLenum dstType, GLvoid *dest,
                          GLenum srcType, const GLvoid *source,
                          const struct gl_pixelstore_attrib *srcPacking,
@@ -251,39 +246,39 @@ _mesa_unpack_index_span( const GLcontext *ctx, GLuint n,
 
 
 extern void
-_mesa_pack_index_span( const GLcontext *ctx, GLuint n,
+_mesa_pack_index_span( const struct gl_context *ctx, GLuint n,
                        GLenum dstType, GLvoid *dest, const GLuint *source,
                        const struct gl_pixelstore_attrib *dstPacking,
                        GLbitfield transferOps );
 
 
 extern void
-_mesa_unpack_stencil_span( const GLcontext *ctx, GLuint n,
+_mesa_unpack_stencil_span( const struct gl_context *ctx, GLuint n,
                            GLenum dstType, GLvoid *dest,
                            GLenum srcType, const GLvoid *source,
                            const struct gl_pixelstore_attrib *srcPacking,
                            GLbitfield transferOps );
 
 extern void
-_mesa_pack_stencil_span( const GLcontext *ctx, GLuint n,
+_mesa_pack_stencil_span( const struct gl_context *ctx, GLuint n,
                          GLenum dstType, GLvoid *dest, const GLstencil *source,
                          const struct gl_pixelstore_attrib *dstPacking );
 
 
 extern void
-_mesa_unpack_depth_span( const GLcontext *ctx, GLuint n,
+_mesa_unpack_depth_span( const struct gl_context *ctx, GLuint n,
                          GLenum dstType, GLvoid *dest, GLuint depthMax,
                          GLenum srcType, const GLvoid *source,
                          const struct gl_pixelstore_attrib *srcPacking );
 
 extern void
-_mesa_pack_depth_span( const GLcontext *ctx, GLuint n, GLvoid *dest,
+_mesa_pack_depth_span( const struct gl_context *ctx, GLuint n, GLvoid *dest,
                        GLenum dstType, const GLfloat *depthSpan,
                        const struct gl_pixelstore_attrib *dstPacking );
 
 
 extern void
-_mesa_pack_depth_stencil_span(const GLcontext *ctx, GLuint n, GLuint *dest,
+_mesa_pack_depth_stencil_span(const struct gl_context *ctx, GLuint n, GLuint *dest,
                               const GLfloat *depthVals,
                               const GLstencil *stencilVals,
                               const struct gl_pixelstore_attrib *dstPacking);
@@ -303,20 +298,20 @@ _mesa_convert_colors(GLenum srcType, const GLvoid *src,
 
 
 extern GLboolean
-_mesa_clip_drawpixels(const GLcontext *ctx,
+_mesa_clip_drawpixels(const struct gl_context *ctx,
                       GLint *destX, GLint *destY,
                       GLsizei *width, GLsizei *height,
                       struct gl_pixelstore_attrib *unpack);
 
 
 extern GLboolean
-_mesa_clip_readpixels(const GLcontext *ctx,
+_mesa_clip_readpixels(const struct gl_context *ctx,
                       GLint *srcX, GLint *srcY,
                       GLsizei *width, GLsizei *height,
                       struct gl_pixelstore_attrib *pack);
 
 extern GLboolean
-_mesa_clip_copytexsubimage(const GLcontext *ctx,
+_mesa_clip_copytexsubimage(const struct gl_context *ctx,
                            GLint *destX, GLint *destY,
                            GLint *srcX, GLint *srcY,
                            GLsizei *width, GLsizei *height);
@@ -328,7 +323,7 @@ _mesa_clip_to_region(GLint xmin, GLint ymin,
                      GLsizei *width, GLsizei *height );
 
 extern GLboolean
-_mesa_clip_blit(GLcontext *ctx,
+_mesa_clip_blit(struct gl_context *ctx,
                 GLint *srcX0, GLint *srcY0, GLint *srcX1, GLint *srcY1,
                 GLint *dstX0, GLint *dstY0, GLint *dstX1, GLint *dstY1);
 
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 46e5c932d0f..bcca4edc1aa 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -882,7 +882,7 @@ error_string( GLenum error )
  * previous errors which were accumulated.
  */
 static void
-flush_delayed_errors( GLcontext *ctx )
+flush_delayed_errors( struct gl_context *ctx )
 {
    char s[MAXSTRING];
 
@@ -906,7 +906,7 @@ flush_delayed_errors( GLcontext *ctx )
  * \param fmtString printf()-like format string.
  */
 void
-_mesa_warning( GLcontext *ctx, const char *fmtString, ... )
+_mesa_warning( struct gl_context *ctx, const char *fmtString, ... )
 {
    char str[MAXSTRING];
    va_list args;
@@ -929,7 +929,7 @@ _mesa_warning( GLcontext *ctx, const char *fmtString, ... )
  * \param fmtString problem description string.
  */
 void
-_mesa_problem( const GLcontext *ctx, const char *fmtString, ... )
+_mesa_problem( const struct gl_context *ctx, const char *fmtString, ... )
 {
    va_list args;
    char str[MAXSTRING];
@@ -957,7 +957,7 @@ _mesa_problem( const GLcontext *ctx, const char *fmtString, ... )
  * \param fmtString printf() style format string, followed by optional args
  */
 void
-_mesa_error( GLcontext *ctx, GLenum error, const char *fmtString, ... )
+_mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... )
 {
    static GLint debug = -1;
 
@@ -1014,7 +1014,7 @@ _mesa_error( GLcontext *ctx, GLenum error, const char *fmtString, ... )
  * \param fmtString printf()-style format string, followed by optional args.
  */
 void
-_mesa_debug( const GLcontext *ctx, const char *fmtString, ... )
+_mesa_debug( const struct gl_context *ctx, const char *fmtString, ... )
 {
 #ifdef DEBUG
    char s[MAXSTRING];
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 751f2065011..30fc152389d 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -568,17 +568,19 @@ _mesa_str_checksum(const char *str);
 extern int
 _mesa_snprintf( char *str, size_t size, const char *fmt, ... ) PRINTFLIKE(3, 4);
 
+struct gl_context;
+
 extern void
-_mesa_warning( __GLcontext *gc, const char *fmtString, ... ) PRINTFLIKE(2, 3);
+_mesa_warning( struct gl_context *gc, const char *fmtString, ... ) PRINTFLIKE(2, 3);
 
 extern void
-_mesa_problem( const __GLcontext *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);
+_mesa_problem( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);
 
 extern void
-_mesa_error( __GLcontext *ctx, GLenum error, const char *fmtString, ... ) PRINTFLIKE(3, 4);
+_mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... ) PRINTFLIKE(3, 4);
 
 extern void
-_mesa_debug( const __GLcontext *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);
+_mesa_debug( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);
 
 
 #if defined(_MSC_VER) && !defined(snprintf)
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index 43ae28c25ab..c27cf1dd38b 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -103,7 +103,7 @@ _mesa_ProvokingVertexEXT(GLenum mode)
  * Also, all error checking should have already been done.
  */
 void
-_mesa_light(GLcontext *ctx, GLuint lnum, GLenum pname, const GLfloat *params)
+_mesa_light(struct gl_context *ctx, GLuint lnum, GLenum pname, const GLfloat *params)
 {
    struct gl_light *light;
 
@@ -569,7 +569,7 @@ _mesa_LightModelf( GLenum pname, GLfloat param )
  * of the targeted material values.
  */
 GLuint
-_mesa_material_bitmask( GLcontext *ctx, GLenum face, GLenum pname,
+_mesa_material_bitmask( struct gl_context *ctx, GLenum face, GLenum pname,
                         GLuint legal, const char *where )
 {
    GLuint bitmask = 0;
@@ -643,7 +643,7 @@ _mesa_copy_materials( struct gl_material *dst,
 /* Update derived values following a change in ctx->Light.Material
  */
 void
-_mesa_update_material( GLcontext *ctx, GLuint bitmask )
+_mesa_update_material( struct gl_context *ctx, GLuint bitmask )
 {
    struct gl_light *light, *list = &ctx->Light.EnabledList;
    GLfloat (*mat)[4] = ctx->Light.Material.Attrib;
@@ -728,7 +728,7 @@ _mesa_update_material( GLcontext *ctx, GLuint bitmask )
  * set by glColorMaterial().
  */
 void
-_mesa_update_color_material( GLcontext *ctx, const GLfloat color[4] )
+_mesa_update_color_material( struct gl_context *ctx, const GLfloat color[4] )
 {
    GLuint bitmask = ctx->Light.ColorMaterialBitmask;
    struct gl_material *mat = &ctx->Light.Material;
@@ -972,7 +972,7 @@ validate_spot_exp_table( struct gl_light *l )
  * by keeping a MRU cache of shine tables for various shine values.
  */
 void
-_mesa_invalidate_shine_table( GLcontext *ctx, GLuint side )
+_mesa_invalidate_shine_table( struct gl_context *ctx, GLuint side )
 {
    ASSERT(side < 2);
    if (ctx->_ShineTable[side])
@@ -982,7 +982,7 @@ _mesa_invalidate_shine_table( GLcontext *ctx, GLuint side )
 
 
 static void
-validate_shine_table( GLcontext *ctx, GLuint side, GLfloat shininess )
+validate_shine_table( struct gl_context *ctx, GLuint side, GLfloat shininess )
 {
    struct gl_shine_tab *list = ctx->_ShineTabList;
    struct gl_shine_tab *s;
@@ -1034,7 +1034,7 @@ validate_shine_table( GLcontext *ctx, GLuint side, GLfloat shininess )
 
 
 void
-_mesa_validate_all_lighting_tables( GLcontext *ctx )
+_mesa_validate_all_lighting_tables( struct gl_context *ctx )
 {
    GLuint i;
    GLfloat shininess;
@@ -1060,7 +1060,7 @@ _mesa_validate_all_lighting_tables( GLcontext *ctx )
  * source and material ambient, diffuse and specular coefficients.
  */
 void
-_mesa_update_lighting( GLcontext *ctx )
+_mesa_update_lighting( struct gl_context *ctx )
 {
    struct gl_light *light;
    ctx->Light._NeedEyeCoords = GL_FALSE;
@@ -1123,7 +1123,7 @@ _mesa_update_lighting( GLcontext *ctx )
  * Also update on lighting space changes.
  */
 static void
-compute_light_positions( GLcontext *ctx )
+compute_light_positions( struct gl_context *ctx )
 {
    struct gl_light *light;
    static const GLfloat eye_z[3] = { 0, 0, 1 };
@@ -1210,7 +1210,7 @@ compute_light_positions( GLcontext *ctx )
 
 
 static void
-update_modelview_scale( GLcontext *ctx )
+update_modelview_scale( struct gl_context *ctx )
 {
    ctx->_ModelViewInvScale = 1.0F;
    if (!_math_matrix_is_length_preserving(ctx->ModelviewMatrixStack.Top)) {
@@ -1229,7 +1229,7 @@ update_modelview_scale( GLcontext *ctx )
  * Bring up to date any state that relies on _NeedEyeCoords.
  */
 void
-_mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state )
+_mesa_update_tnl_spaces( struct gl_context *ctx, GLuint new_state )
 {
    const GLuint oldneedeyecoords = ctx->_NeedEyeCoords;
 
@@ -1278,7 +1278,7 @@ _mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state )
  * light-in-modelspace optimization.  It's also useful for debugging.
  */
 void
-_mesa_allow_light_in_model( GLcontext *ctx, GLboolean flag )
+_mesa_allow_light_in_model( struct gl_context *ctx, GLboolean flag )
 {
    ctx->_ForceEyeCoords = !flag;
    ctx->NewState |= _NEW_POINT;	/* one of the bits from
@@ -1370,7 +1370,7 @@ init_material( struct gl_material *m )
  * Initialize all lighting state for the given context.
  */
 void
-_mesa_init_lighting( GLcontext *ctx )
+_mesa_init_lighting( struct gl_context *ctx )
 {
    GLuint i;
 
@@ -1418,7 +1418,7 @@ _mesa_init_lighting( GLcontext *ctx )
  * Deallocate malloc'd lighting state attached to given context.
  */
 void
-_mesa_free_lighting_data( GLcontext *ctx )
+_mesa_free_lighting_data( struct gl_context *ctx )
 {
    struct gl_shine_tab *s, *tmps;
 
diff --git a/src/mesa/main/light.h b/src/mesa/main/light.h
index b3436114d40..021f5ea1939 100644
--- a/src/mesa/main/light.h
+++ b/src/mesa/main/light.h
@@ -79,7 +79,7 @@ _mesa_GetMaterialiv( GLenum face, GLenum pname, GLint *params );
 
 
 extern void
-_mesa_light(GLcontext *ctx, GLuint lnum, GLenum pname, const GLfloat *params);
+_mesa_light(struct gl_context *ctx, GLuint lnum, GLenum pname, const GLfloat *params);
 
 
 /* Lerp between adjacent values in the f(x) lookup table, giving a
@@ -100,36 +100,36 @@ do {									\
 } while (0)
 
 
-extern GLuint _mesa_material_bitmask( GLcontext *ctx,
+extern GLuint _mesa_material_bitmask( struct gl_context *ctx,
                                       GLenum face, GLenum pname,
                                       GLuint legal,
                                       const char * );
 
 extern void _mesa_invalidate_spot_exp_table( struct gl_light *l );
 
-extern void _mesa_invalidate_shine_table( GLcontext *ctx, GLuint i );
+extern void _mesa_invalidate_shine_table( struct gl_context *ctx, GLuint i );
 
-extern void _mesa_validate_all_lighting_tables( GLcontext *ctx );
+extern void _mesa_validate_all_lighting_tables( struct gl_context *ctx );
 
-extern void _mesa_update_lighting( GLcontext *ctx );
+extern void _mesa_update_lighting( struct gl_context *ctx );
 
-extern void _mesa_update_tnl_spaces( GLcontext *ctx, GLuint new_state );
+extern void _mesa_update_tnl_spaces( struct gl_context *ctx, GLuint new_state );
 
-extern void _mesa_update_material( GLcontext *ctx,
+extern void _mesa_update_material( struct gl_context *ctx,
                                    GLuint bitmask );
 
 extern void _mesa_copy_materials( struct gl_material *dst,
 				  const struct gl_material *src,
 				  GLuint bitmask );
 
-extern void _mesa_update_color_material( GLcontext *ctx,
+extern void _mesa_update_color_material( struct gl_context *ctx,
                                          const GLfloat rgba[4] );
 
-extern void _mesa_init_lighting( GLcontext *ctx );
+extern void _mesa_init_lighting( struct gl_context *ctx );
 
-extern void _mesa_free_lighting_data( GLcontext *ctx );
+extern void _mesa_free_lighting_data( struct gl_context *ctx );
 
-extern void _mesa_allow_light_in_model( GLcontext *ctx, GLboolean flag );
+extern void _mesa_allow_light_in_model( struct gl_context *ctx, GLboolean flag );
 
 #else
 #define _mesa_update_color_material( c, r ) ((void)0)
diff --git a/src/mesa/main/lines.c b/src/mesa/main/lines.c
index cc63a759ec0..505f840ba5a 100644
--- a/src/mesa/main/lines.c
+++ b/src/mesa/main/lines.c
@@ -102,11 +102,11 @@ _mesa_LineStipple( GLint factor, GLushort pattern )
  *
  * \param ctx GL context.
  *
- * Initializes __GLcontextRec::Line and line related constants in
- * __GLcontextRec::Const.
+ * Initializes __struct gl_contextRec::Line and line related constants in
+ * __struct gl_contextRec::Const.
  */
 void GLAPIENTRY
-_mesa_init_line( GLcontext * ctx )
+_mesa_init_line( struct gl_context * ctx )
 {
    ctx->Line.SmoothFlag = GL_FALSE;
    ctx->Line.StippleFlag = GL_FALSE;
diff --git a/src/mesa/main/lines.h b/src/mesa/main/lines.h
index 5a47e9858d5..3accdd78004 100644
--- a/src/mesa/main/lines.h
+++ b/src/mesa/main/lines.h
@@ -43,6 +43,6 @@ extern void GLAPIENTRY
 _mesa_LineStipple( GLint factor, GLushort pattern );
 
 extern void GLAPIENTRY 
-_mesa_init_line( GLcontext * ctx );
+_mesa_init_line( struct gl_context * ctx );
 
 #endif
diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c
index 4b8c00b5b63..105d4a327fb 100644
--- a/src/mesa/main/matrix.c
+++ b/src/mesa/main/matrix.c
@@ -59,7 +59,7 @@
  *
  * Flushes vertices and validates parameters. Calls _math_matrix_frustum() with
  * the top matrix of the current matrix stack and sets
- * __GLcontextRec::NewState.
+ * __struct gl_contextRec::NewState.
  */
 void GLAPIENTRY
 _mesa_Frustum( GLdouble left, GLdouble right,
@@ -101,7 +101,7 @@ _mesa_Frustum( GLdouble left, GLdouble right,
  *
  * Flushes vertices and validates parameters. Calls _math_matrix_ortho() with
  * the top matrix of the current matrix stack and sets
- * __GLcontextRec::NewState.
+ * __struct gl_contextRec::NewState.
  */
 void GLAPIENTRY
 _mesa_Ortho( GLdouble left, GLdouble right,
@@ -139,7 +139,7 @@ _mesa_Ortho( GLdouble left, GLdouble right,
  * \sa glMatrixMode().
  *
  * Flushes the vertices, validates the parameter and updates
- * __GLcontextRec::CurrentStack and gl_transform_attrib::MatrixMode with the
+ * __struct gl_contextRec::CurrentStack and gl_transform_attrib::MatrixMode with the
  * specified matrix stack.
  */
 void GLAPIENTRY
@@ -177,9 +177,6 @@ _mesa_MatrixMode( GLenum mode )
       ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->TextureMatrixStack));
       ctx->CurrentStack = &ctx->TextureMatrixStack[ctx->Texture.CurrentUnit];
       break;
-   case GL_COLOR:
-      ctx->CurrentStack = &ctx->ColorMatrixStack;
-      break;
    case GL_MATRIX0_NV:
    case GL_MATRIX1_NV:
    case GL_MATRIX2_NV:
@@ -234,7 +231,7 @@ _mesa_MatrixMode( GLenum mode )
  * \sa glPushMatrix().
  * 
  * Verifies the current matrix stack is not full, and duplicates the top-most
- * matrix in the stack. Marks __GLcontextRec::NewState with the stack dirty
+ * matrix in the stack. Marks __struct gl_contextRec::NewState with the stack dirty
  * flag.
  */
 void GLAPIENTRY
@@ -274,7 +271,7 @@ _mesa_PushMatrix( void )
  * \sa glPopMatrix().
  * 
  * Flushes the vertices, verifies the current matrix stack is not empty, and
- * moves the stack head down. Marks __GLcontextRec::NewState with the dirty
+ * moves the stack head down. Marks __struct gl_contextRec::NewState with the dirty
  * stack flag.
  */
 void GLAPIENTRY
@@ -312,7 +309,7 @@ _mesa_PopMatrix( void )
  * \sa glLoadIdentity().
  *
  * Flushes the vertices and calls _math_matrix_set_identity() with the top-most
- * matrix in the current stack. Marks __GLcontextRec::NewState with the stack
+ * matrix in the current stack. Marks __struct gl_contextRec::NewState with the stack
  * dirty flag.
  */
 void GLAPIENTRY
@@ -337,7 +334,7 @@ _mesa_LoadIdentity( void )
  * \sa glLoadMatrixf().
  *
  * Flushes the vertices and calls _math_matrix_loadf() with the top-most matrix
- * in the current stack and the given matrix. Marks __GLcontextRec::NewState
+ * in the current stack and the given matrix. Marks __struct gl_contextRec::NewState
  * with the dirty stack flag.
  */
 void GLAPIENTRY
@@ -368,7 +365,7 @@ _mesa_LoadMatrixf( const GLfloat *m )
  *
  * Flushes the vertices and calls _math_matrix_mul_floats() with the top-most
  * matrix in the current stack and the given matrix. Marks
- * __GLcontextRec::NewState with the dirty stack flag.
+ * __struct gl_contextRec::NewState with the dirty stack flag.
  */
 void GLAPIENTRY
 _mesa_MultMatrixf( const GLfloat *m )
@@ -400,7 +397,7 @@ _mesa_MultMatrixf( const GLfloat *m )
  *
  * Flushes the vertices and calls _math_matrix_rotate() with the top-most
  * matrix in the current stack and the given parameters. Marks
- * __GLcontextRec::NewState with the dirty stack flag.
+ * __struct gl_contextRec::NewState with the dirty stack flag.
  */
 void GLAPIENTRY
 _mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z )
@@ -425,7 +422,7 @@ _mesa_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z )
  *
  * Flushes the vertices and calls _math_matrix_scale() with the top-most
  * matrix in the current stack and the given parameters. Marks
- * __GLcontextRec::NewState with the dirty stack flag.
+ * __struct gl_contextRec::NewState with the dirty stack flag.
  */
 void GLAPIENTRY
 _mesa_Scalef( GLfloat x, GLfloat y, GLfloat z )
@@ -448,7 +445,7 @@ _mesa_Scalef( GLfloat x, GLfloat y, GLfloat z )
  *
  * Flushes the vertices and calls _math_matrix_translate() with the top-most
  * matrix in the current stack and the given parameters. Marks
- * __GLcontextRec::NewState with the dirty stack flag.
+ * __struct gl_contextRec::NewState with the dirty stack flag.
  */
 void GLAPIENTRY
 _mesa_Translatef( GLfloat x, GLfloat y, GLfloat z )
@@ -562,13 +559,13 @@ _mesa_MultTransposeMatrixdARB( const GLdouble *m )
  * Calls _math_matrix_analyse() with the top-matrix of the projection matrix
  * stack, and recomputes user clip positions if necessary.
  * 
- * \note This routine references __GLcontextRec::Tranform attribute values to
+ * \note This routine references __struct gl_contextRec::Tranform attribute values to
  * compute userclip positions in clip space, but is only called on
  * _NEW_PROJECTION.  The _mesa_ClipPlane() function keeps these values up to
- * date across changes to the __GLcontextRec::Transform attributes.
+ * date across changes to the __struct gl_contextRec::Transform attributes.
  */
 static void
-update_projection( GLcontext *ctx )
+update_projection( struct gl_context *ctx )
 {
    _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
 
@@ -596,11 +593,11 @@ update_projection( GLcontext *ctx )
  * \param ctx GL context.
  *
  * Multiplies the top matrices of the projection and model view stacks into
- * __GLcontextRec::_ModelProjectMatrix via _math_matrix_mul_matrix() and
+ * __struct gl_contextRec::_ModelProjectMatrix via _math_matrix_mul_matrix() and
  * analyzes the resulting matrix via _math_matrix_analyse().
  */
 static void
-calculate_model_project_matrix( GLcontext *ctx )
+calculate_model_project_matrix( struct gl_context *ctx )
 {
    _math_matrix_mul_matrix( &ctx->_ModelProjectMatrix,
                             ctx->ProjectionMatrixStack.Top,
@@ -621,7 +618,7 @@ calculate_model_project_matrix( GLcontext *ctx )
  * calculate_model_project_matrix() to recalculate the modelview-projection
  * matrix.
  */
-void _mesa_update_modelview_project( GLcontext *ctx, GLuint new_state )
+void _mesa_update_modelview_project( struct gl_context *ctx, GLuint new_state )
 {
    if (new_state & _NEW_MODELVIEW) {
       _math_matrix_analyse( ctx->ModelviewMatrixStack.Top );
@@ -715,7 +712,7 @@ free_matrix_stack( struct gl_matrix_stack *stack )
  * Initializes each of the matrix stacks and the combined modelview-projection
  * matrix.
  */
-void _mesa_init_matrix( GLcontext * ctx )
+void _mesa_init_matrix( struct gl_context * ctx )
 {
    GLint i;
 
@@ -724,8 +721,6 @@ void _mesa_init_matrix( GLcontext * ctx )
                      _NEW_MODELVIEW);
    init_matrix_stack(&ctx->ProjectionMatrixStack, MAX_PROJECTION_STACK_DEPTH,
                      _NEW_PROJECTION);
-   init_matrix_stack(&ctx->ColorMatrixStack, MAX_COLOR_STACK_DEPTH,
-                     _NEW_COLOR_MATRIX);
    for (i = 0; i < Elements(ctx->TextureMatrixStack); i++)
       init_matrix_stack(&ctx->TextureMatrixStack[i], MAX_TEXTURE_STACK_DEPTH,
                         _NEW_TEXTURE_MATRIX);
@@ -747,13 +742,12 @@ void _mesa_init_matrix( GLcontext * ctx )
  * Frees each of the matrix stacks and the combined modelview-projection
  * matrix.
  */
-void _mesa_free_matrix_data( GLcontext *ctx )
+void _mesa_free_matrix_data( struct gl_context *ctx )
 {
    GLint i;
 
    free_matrix_stack(&ctx->ModelviewMatrixStack);
    free_matrix_stack(&ctx->ProjectionMatrixStack);
-   free_matrix_stack(&ctx->ColorMatrixStack);
    for (i = 0; i < Elements(ctx->TextureMatrixStack); i++)
       free_matrix_stack(&ctx->TextureMatrixStack[i]);
    for (i = 0; i < Elements(ctx->ProgramMatrixStack); i++)
@@ -771,7 +765,7 @@ void _mesa_free_matrix_data( GLcontext *ctx )
  *
  * \todo Move this to a new file with other 'transform' routines.
  */
-void _mesa_init_transform( GLcontext *ctx )
+void _mesa_init_transform( struct gl_context *ctx )
 {
    GLint i;
 
diff --git a/src/mesa/main/matrix.h b/src/mesa/main/matrix.h
index a53d1045c7d..38fd235b117 100644
--- a/src/mesa/main/matrix.h
+++ b/src/mesa/main/matrix.h
@@ -97,16 +97,16 @@ _mesa_MultTransposeMatrixdARB( const GLdouble *m );
 
 
 extern void 
-_mesa_init_matrix( GLcontext * ctx );
+_mesa_init_matrix( struct gl_context * ctx );
 
 extern void 
-_mesa_init_transform( GLcontext *ctx );
+_mesa_init_transform( struct gl_context *ctx );
 
 extern void
-_mesa_free_matrix_data( GLcontext *ctx );
+_mesa_free_matrix_data( struct gl_context *ctx );
 
 extern void 
-_mesa_update_modelview_project( GLcontext *ctx, GLuint newstate );
+_mesa_update_modelview_project( struct gl_context *ctx, GLuint newstate );
 
 
 #endif
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 92311ef7f0a..9b9b6d0420b 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -100,7 +100,6 @@
 #define FEATURE_drawpix                   FEATURE_GL
 #define FEATURE_evaluators                FEATURE_GL
 #define FEATURE_feedback                  FEATURE_GL
-#define FEATURE_histogram                 FEATURE_GL
 #define FEATURE_pixel_transfer            FEATURE_GL
 #define FEATURE_queryobj                  FEATURE_GL
 #define FEATURE_rastpos                   FEATURE_GL
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 678d17a2a36..d65aecdf3e5 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -415,7 +415,7 @@ do_row(GLenum datatype, GLuint comps, GLint srcWidth,
       GLuint i, j, k;
       const GLuint *rowA = (const GLuint *) srcRowA;
       const GLuint *rowB = (const GLuint *) srcRowB;
-      GLfloat *dst = (GLfloat *) dstRow;
+      GLuint *dst = (GLuint *) dstRow;
       for (i = j = 0, k = k0; i < (GLuint) dstWidth;
            i++, j += colStride, k += colStride) {
          dst[i] = (GLfloat)(rowA[j] / 4 + rowA[k] / 4 + rowB[j] / 4 + rowB[k] / 4);
@@ -1504,7 +1504,7 @@ next_mipmap_level_size(GLenum target, GLint border,
  * GL_TEXTURE_CUBE_MAP_POSITIVE/NEGATIVE_X/Y/Z; never GL_TEXTURE_CUBE_MAP.
  */
 void
-_mesa_generate_mipmap(GLcontext *ctx, GLenum target,
+_mesa_generate_mipmap(struct gl_context *ctx, GLenum target,
                       struct gl_texture_object *texObj)
 {
    const struct gl_texture_image *srcImage;
diff --git a/src/mesa/main/mipmap.h b/src/mesa/main/mipmap.h
index 22094c34372..4c7ee635aee 100644
--- a/src/mesa/main/mipmap.h
+++ b/src/mesa/main/mipmap.h
@@ -42,7 +42,7 @@ _mesa_generate_mipmap_level(GLenum target,
 
 
 extern void
-_mesa_generate_mipmap(GLcontext *ctx, GLenum target,
+_mesa_generate_mipmap(struct gl_context *ctx, GLenum target,
                       struct gl_texture_object *texObj);
 
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index fdf8100c8cd..13aa66fc1e8 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -123,10 +123,8 @@ struct gl_program_cache;
 struct gl_texture_format;
 struct gl_texture_image;
 struct gl_texture_object;
+struct gl_context;
 struct st_context;
-typedef struct __GLcontextRec GLcontext;
-typedef struct __GLcontextModesRec GLvisual;
-typedef struct gl_framebuffer GLframebuffer;
 /*@}*/
 
 
@@ -380,8 +378,9 @@ typedef enum
 typedef enum
 {
    FRAG_RESULT_DEPTH = 0,
-   FRAG_RESULT_COLOR = 1,
-   FRAG_RESULT_DATA0 = 2,
+   FRAG_RESULT_STENCIL = 1,
+   FRAG_RESULT_COLOR = 2,
+   FRAG_RESULT_DATA0 = 3,
    FRAG_RESULT_MAX = (FRAG_RESULT_DATA0 + MAX_DRAW_BUFFERS)
 } gl_frag_result;
 
@@ -454,16 +453,6 @@ typedef enum
                             BUFFER_BIT_COLOR7)
 
 
-/** The pixel transfer path has three color tables: */
-typedef enum
-{
-   COLORTABLE_PRECONVOLUTION,
-   COLORTABLE_POSTCONVOLUTION,
-   COLORTABLE_POSTCOLORMATRIX,
-   COLORTABLE_MAX
-} gl_colortable_index;
-
-
 /**
  * Data structure for color tables
  */
@@ -558,6 +547,60 @@ struct gl_shine_tab
    GLuint refcount;
 };
 
+struct gl_config {
+   GLboolean rgbMode;
+   GLboolean floatMode;
+   GLboolean colorIndexMode;
+   GLuint doubleBufferMode;
+   GLuint stereoMode;
+
+   GLboolean haveAccumBuffer;
+   GLboolean haveDepthBuffer;
+   GLboolean haveStencilBuffer;
+
+   GLint redBits, greenBits, blueBits, alphaBits;	/* bits per comp */
+   GLuint redMask, greenMask, blueMask, alphaMask;
+   GLint rgbBits;		/* total bits for rgb */
+   GLint indexBits;		/* total bits for colorindex */
+
+   GLint accumRedBits, accumGreenBits, accumBlueBits, accumAlphaBits;
+   GLint depthBits;
+   GLint stencilBits;
+
+   GLint numAuxBuffers;
+
+   GLint level;
+
+   /* EXT_visual_rating / GLX 1.2 */
+   GLint visualRating;
+
+   /* EXT_visual_info / GLX 1.2 */
+   GLint transparentPixel;
+   /*    colors are floats scaled to ints */
+   GLint transparentRed, transparentGreen, transparentBlue, transparentAlpha;
+   GLint transparentIndex;
+
+   /* ARB_multisample / SGIS_multisample */
+   GLint sampleBuffers;
+   GLint samples;
+
+   /* SGIX_pbuffer / GLX 1.3 */
+   GLint maxPbufferWidth;
+   GLint maxPbufferHeight;
+   GLint maxPbufferPixels;
+   GLint optimalPbufferWidth;   /* Only for SGIX_pbuffer. */
+   GLint optimalPbufferHeight;  /* Only for SGIX_pbuffer. */
+
+   /* OML_swap_method */
+   GLint swapMethod;
+
+   /* EXT_texture_from_pixmap */
+   GLint bindToTextureRgb;
+   GLint bindToTextureRgba;
+   GLint bindToMipmapTexture;
+   GLint bindToTextureTargets;
+   GLint yInverted;
+};
 
 /**
  * Light source state.
@@ -810,48 +853,6 @@ struct gl_hint_attrib
    GLenum FragmentShaderDerivative; /**< GL_ARB_fragment_shader */
 };
 
-
-/**
- * Histogram attributes.
- */
-struct gl_histogram_attrib
-{
-   GLuint Width;                            /**< number of table entries */
-   GLint Format;                            /**< GL_ALPHA, GL_RGB, etc */
-   GLuint Count[HISTOGRAM_TABLE_SIZE][4];   /**< the histogram */
-   GLboolean Sink;                          /**< terminate image transfer? */
-   GLubyte RedSize;                         /**< Bits per counter */
-   GLubyte GreenSize;
-   GLubyte BlueSize;
-   GLubyte AlphaSize;
-   GLubyte LuminanceSize;
-};
-
-
-/**
- * Color Min/max state.
- */
-struct gl_minmax_attrib
-{
-   GLenum Format;
-   GLboolean Sink;
-   GLfloat Min[4], Max[4];   /**< RGBA */
-};
-
-
-/**
- * Image convolution state.
- */
-struct gl_convolution_attrib
-{
-   GLenum Format;
-   GLenum InternalFormat;
-   GLuint Width;
-   GLuint Height;
-   GLfloat Filter[MAX_CONVOLUTION_WIDTH * MAX_CONVOLUTION_HEIGHT * 4];
-};
-
-
 /**
  * Light state flags.
  */
@@ -992,32 +993,6 @@ struct gl_pixel_attrib
    GLboolean MapColorFlag;
    GLboolean MapStencilFlag;
 
-   /* There are multiple color table stages: */
-   GLboolean ColorTableEnabled[COLORTABLE_MAX];
-   GLfloat ColorTableScale[COLORTABLE_MAX][4];  /**< RGBA */
-   GLfloat ColorTableBias[COLORTABLE_MAX][4];   /**< RGBA */
-
-   /* Convolution (GL_EXT_convolution) */
-   GLboolean Convolution1DEnabled;
-   GLboolean Convolution2DEnabled;
-   GLboolean Separable2DEnabled;
-   GLfloat ConvolutionBorderColor[3][4];  /**< RGBA */
-   GLenum ConvolutionBorderMode[3];
-   GLfloat ConvolutionFilterScale[3][4];  /**< RGBA */
-   GLfloat ConvolutionFilterBias[3][4];   /**< RGBA */
-   GLfloat PostConvolutionScale[4];  /**< RGBA */
-   GLfloat PostConvolutionBias[4];   /**< RGBA */
-
-   /* Color matrix (GL_SGI_color_matrix) */
-   /* Note: the color matrix is not part of this attrib group */
-   GLfloat PostColorMatrixScale[4];  /**< RGBA */
-   GLfloat PostColorMatrixBias[4];   /**< RGBA */
-
-   /* Histogram & minmax (GL_EXT_histogram) */
-   /* Note: histogram and minmax data are not part of this attrib group */
-   GLboolean HistogramEnabled;
-   GLboolean MinMaxEnabled;
-
    /*--- End Pixel Transfer State ---*/
 
    /** glPixelZoom */
@@ -1483,7 +1458,6 @@ struct gl_transform_attrib
    GLboolean RasterPositionUnclipped;           /**< GL_IBM_rasterpos_clip */
    GLboolean DepthClamp;			/**< GL_ARB_depth_clamp */
 
-   GLboolean CullVertexFlag;	/**< True if GL_CULL_VERTEX_EXT is enabled */
    GLfloat CullEyePos[4];
    GLfloat CullObjPos[4];
 };
@@ -2143,11 +2117,12 @@ struct gl_shader_program
 
    /**
     * Per-stage shaders resulting from the first stage of linking.
+    *
+    * Set of linked shaders for this program.  The array is accessed using the
+    * \c MESA_SHADER_* defines.  Entries for non-existent stages will be
+    * \c NULL.
     */
-   /*@{*/
-   GLuint _NumLinkedShaders;
-   struct gl_shader *_LinkedShaders[2];
-   /*@}*/
+   struct gl_shader *_LinkedShaders[MESA_SHADER_TYPES];
 };   
 
 
@@ -2350,38 +2325,38 @@ struct gl_renderbuffer
    void (*Delete)(struct gl_renderbuffer *rb);
 
    /* Allocate new storage for this renderbuffer */
-   GLboolean (*AllocStorage)(GLcontext *ctx, struct gl_renderbuffer *rb,
+   GLboolean (*AllocStorage)(struct gl_context *ctx, struct gl_renderbuffer *rb,
                              GLenum internalFormat,
                              GLuint width, GLuint height);
 
    /* Lock/Unlock are called before/after calling the Get/Put functions.
     * Not sure this is the right place for these yet.
-   void (*Lock)(GLcontext *ctx, struct gl_renderbuffer *rb);
-   void (*Unlock)(GLcontext *ctx, struct gl_renderbuffer *rb);
+   void (*Lock)(struct gl_context *ctx, struct gl_renderbuffer *rb);
+   void (*Unlock)(struct gl_context *ctx, struct gl_renderbuffer *rb);
     */
 
    /* Return a pointer to the element/pixel at (x,y).
     * Should return NULL if the buffer memory can't be directly addressed.
     */
-   void *(*GetPointer)(GLcontext *ctx, struct gl_renderbuffer *rb,
+   void *(*GetPointer)(struct gl_context *ctx, struct gl_renderbuffer *rb,
                        GLint x, GLint y);
 
    /* Get/Read a row of values.
     * The values will be of format _BaseFormat and type DataType.
     */
-   void (*GetRow)(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+   void (*GetRow)(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                   GLint x, GLint y, void *values);
 
    /* Get/Read values at arbitrary locations.
     * The values will be of format _BaseFormat and type DataType.
     */
-   void (*GetValues)(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+   void (*GetValues)(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                      const GLint x[], const GLint y[], void *values);
 
    /* Put/Write a row of values.
     * The values will be of format _BaseFormat and type DataType.
     */
-   void (*PutRow)(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+   void (*PutRow)(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                   GLint x, GLint y, const void *values, const GLubyte *mask);
 
    /* Put/Write a row of RGB values.  This is a special-case routine that's
@@ -2389,26 +2364,26 @@ struct gl_renderbuffer
     * a common case for glDrawPixels and some triangle routines.
     * The values will be of format GL_RGB and type DataType.
     */
-   void (*PutRowRGB)(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+   void (*PutRowRGB)(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                     GLint x, GLint y, const void *values, const GLubyte *mask);
 
 
    /* Put/Write a row of identical values.
     * The values will be of format _BaseFormat and type DataType.
     */
-   void (*PutMonoRow)(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+   void (*PutMonoRow)(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                      GLint x, GLint y, const void *value, const GLubyte *mask);
 
    /* Put/Write values at arbitrary locations.
     * The values will be of format _BaseFormat and type DataType.
     */
-   void (*PutValues)(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+   void (*PutValues)(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                      const GLint x[], const GLint y[], const void *values,
                      const GLubyte *mask);
    /* Put/Write identical values at arbitrary locations.
     * The values will be of format _BaseFormat and type DataType.
     */
-   void (*PutMonoValues)(GLcontext *ctx, struct gl_renderbuffer *rb,
+   void (*PutMonoValues)(struct gl_context *ctx, struct gl_renderbuffer *rb,
                          GLuint count, const GLint x[], const GLint y[],
                          const void *value, const GLubyte *mask);
 };
@@ -2465,7 +2440,7 @@ struct gl_framebuffer
     * The framebuffer's visual. Immutable if this is a window system buffer.
     * Computed from attachments if user-made FBO.
     */
-   GLvisual Visual;
+   struct gl_config Visual;
 
    GLboolean Initialized;
 
@@ -2581,8 +2556,6 @@ struct gl_constants
    GLfloat LineWidthGranularity;
 
    GLuint MaxColorTableSize;
-   GLuint MaxConvolutionWidth;
-   GLuint MaxConvolutionHeight;
 
    GLuint MaxClipPlanes;
    GLuint MaxLights;
@@ -2608,6 +2581,8 @@ struct gl_constants
 
    GLuint MaxVarying;  /**< Number of float[4] varying parameters */
 
+   GLuint GLSLVersion;  /**< GLSL version supported (ex: 120 = 1.20) */
+
    /** Which texture units support GL_ATI_envmap_bumpmap as targets */
    GLbitfield SupportedBumpUnits;
 
@@ -2656,7 +2631,6 @@ struct gl_extensions
    GLboolean ARB_geometry_shader4;
    GLboolean ARB_half_float_pixel;
    GLboolean ARB_half_float_vertex;
-   GLboolean ARB_imaging;
    GLboolean ARB_instanced_arrays;
    GLboolean ARB_map_buffer_range;
    GLboolean ARB_multisample;
@@ -2667,14 +2641,15 @@ struct gl_extensions
    GLboolean ARB_sampler_objects;
    GLboolean ARB_seamless_cube_map;
    GLboolean ARB_shader_objects;
+   GLboolean ARB_shader_stencil_export;
    GLboolean ARB_shading_language_100;
-   GLboolean ARB_shading_language_120;
    GLboolean ARB_shadow;
    GLboolean ARB_shadow_ambient;
    GLboolean ARB_sync;
    GLboolean ARB_texture_border_clamp;
    GLboolean ARB_texture_buffer_object;
    GLboolean ARB_texture_compression;
+   GLboolean ARB_texture_compression_rgtc;
    GLboolean ARB_texture_cube_map;
    GLboolean ARB_texture_env_combine;
    GLboolean ARB_texture_env_crossbar;
@@ -2704,8 +2679,6 @@ struct gl_extensions
    GLboolean EXT_blend_minmax;
    GLboolean EXT_blend_subtract;
    GLboolean EXT_clip_volume_hint;
-   GLboolean EXT_cull_vertex;
-   GLboolean EXT_convolution;
    GLboolean EXT_compiled_vertex_array;
    GLboolean EXT_copy_texture;
    GLboolean EXT_depth_bounds_test;
@@ -2717,7 +2690,6 @@ struct gl_extensions
    GLboolean EXT_framebuffer_object;
    GLboolean EXT_framebuffer_sRGB;
    GLboolean EXT_gpu_program_parameters;
-   GLboolean EXT_histogram;
    GLboolean EXT_multi_draw_arrays;
    GLboolean EXT_paletted_texture;
    GLboolean EXT_packed_depth_stencil;
@@ -2740,7 +2712,6 @@ struct gl_extensions
    GLboolean EXT_texture3D;
    GLboolean EXT_texture_array;
    GLboolean EXT_texture_compression_s3tc;
-   GLboolean EXT_texture_compression_rgtc;
    GLboolean EXT_texture_env_add;
    GLboolean EXT_texture_env_combine;
    GLboolean EXT_texture_env_dot3;
@@ -2769,7 +2740,6 @@ struct gl_extensions
    GLboolean IBM_rasterpos_clip;
    GLboolean IBM_multimode_draw_arrays;
    GLboolean MESA_pack_invert;
-   GLboolean MESA_packed_depth_stencil;
    GLboolean MESA_resize_buffers;
    GLboolean MESA_ycbcr_texture;
    GLboolean MESA_texture_array;
@@ -2787,8 +2757,6 @@ struct gl_extensions
    GLboolean NV_vertex_program;
    GLboolean NV_vertex_program1_1;
    GLboolean OES_read_format;
-   GLboolean SGI_color_matrix;
-   GLboolean SGI_color_table;
    GLboolean SGI_texture_color_table;
    GLboolean SGIS_generate_mipmap;
    GLboolean SGIS_texture_edge_clamp;
@@ -2797,6 +2765,7 @@ struct gl_extensions
    GLboolean S3_s3tc;
    GLboolean OES_EGL_image;
    GLboolean OES_draw_texture;
+   GLboolean EXT_texture_format_BGRA8888;
    /** The extension string */
    const GLubyte *String;
    /** Number of supported extensions */
@@ -2819,38 +2788,19 @@ struct gl_matrix_stack
 
 /**
  * \name Bits for image transfer operations 
- * \sa __GLcontextRec::ImageTransferState.
+ * \sa __struct gl_contextRec::ImageTransferState.
  */
 /*@{*/
 #define IMAGE_SCALE_BIAS_BIT                      0x1
 #define IMAGE_SHIFT_OFFSET_BIT                    0x2
 #define IMAGE_MAP_COLOR_BIT                       0x4
-#define IMAGE_COLOR_TABLE_BIT                     0x8
-#define IMAGE_CONVOLUTION_BIT                     0x10
-#define IMAGE_POST_CONVOLUTION_SCALE_BIAS         0x20
-#define IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT    0x40
-#define IMAGE_COLOR_MATRIX_BIT                    0x80
-#define IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT   0x100
-#define IMAGE_HISTOGRAM_BIT                       0x200
-#define IMAGE_MIN_MAX_BIT                         0x400
 #define IMAGE_CLAMP_BIT                           0x800
 
 
-/** Pixel Transfer ops up to convolution */
-#define IMAGE_PRE_CONVOLUTION_BITS (IMAGE_SCALE_BIAS_BIT |     \
-                                    IMAGE_SHIFT_OFFSET_BIT |   \
-                                    IMAGE_MAP_COLOR_BIT |      \
-                                    IMAGE_COLOR_TABLE_BIT)
-
-/** Pixel transfer ops after convolution */
-#define IMAGE_POST_CONVOLUTION_BITS (IMAGE_POST_CONVOLUTION_SCALE_BIAS |      \
-                                     IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT | \
-                                     IMAGE_COLOR_MATRIX_BIT |                 \
-                                     IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT |\
-                                     IMAGE_HISTOGRAM_BIT |                    \
-                                     IMAGE_MIN_MAX_BIT)
-/*@}*/
-
+/** Pixel Transfer ops */
+#define IMAGE_BITS (IMAGE_SCALE_BIAS_BIT |			\
+		    IMAGE_SHIFT_OFFSET_BIT |			\
+		    IMAGE_MAP_COLOR_BIT)
 
 /**
  * \name Bits to indicate what state has changed.  
@@ -2858,35 +2808,34 @@ struct gl_matrix_stack
  * 4 unused flags.
  */
 /*@{*/
-#define _NEW_MODELVIEW		0x1        /**< __GLcontextRec::ModelView */
-#define _NEW_PROJECTION		0x2        /**< __GLcontextRec::Projection */
-#define _NEW_TEXTURE_MATRIX	0x4        /**< __GLcontextRec::TextureMatrix */
-#define _NEW_COLOR_MATRIX	0x8        /**< __GLcontextRec::ColorMatrix */
-#define _NEW_ACCUM		0x10       /**< __GLcontextRec::Accum */
-#define _NEW_COLOR		0x20       /**< __GLcontextRec::Color */
-#define _NEW_DEPTH		0x40       /**< __GLcontextRec::Depth */
-#define _NEW_EVAL		0x80       /**< __GLcontextRec::Eval, __GLcontextRec::EvalMap */
-#define _NEW_FOG		0x100      /**< __GLcontextRec::Fog */
-#define _NEW_HINT		0x200      /**< __GLcontextRec::Hint */
-#define _NEW_LIGHT		0x400      /**< __GLcontextRec::Light */
-#define _NEW_LINE		0x800      /**< __GLcontextRec::Line */
-#define _NEW_PIXEL		0x1000     /**< __GLcontextRec::Pixel */
-#define _NEW_POINT		0x2000     /**< __GLcontextRec::Point */
-#define _NEW_POLYGON		0x4000     /**< __GLcontextRec::Polygon */
-#define _NEW_POLYGONSTIPPLE	0x8000     /**< __GLcontextRec::PolygonStipple */
-#define _NEW_SCISSOR		0x10000    /**< __GLcontextRec::Scissor */
-#define _NEW_STENCIL		0x20000    /**< __GLcontextRec::Stencil */
-#define _NEW_TEXTURE		0x40000    /**< __GLcontextRec::Texture */
-#define _NEW_TRANSFORM		0x80000    /**< __GLcontextRec::Transform */
-#define _NEW_VIEWPORT		0x100000   /**< __GLcontextRec::Viewport */
-#define _NEW_PACKUNPACK		0x200000   /**< __GLcontextRec::Pack, __GLcontextRec::Unpack */
-#define _NEW_ARRAY	        0x400000   /**< __GLcontextRec::Array */
-#define _NEW_RENDERMODE		0x800000   /**< __GLcontextRec::RenderMode, __GLcontextRec::Feedback, __GLcontextRec::Select */
-#define _NEW_BUFFERS            0x1000000  /**< __GLcontextRec::Visual, __GLcontextRec::DrawBuffer, */
-#define _NEW_MULTISAMPLE        0x2000000  /**< __GLcontextRec::Multisample */
-#define _NEW_TRACK_MATRIX       0x4000000  /**< __GLcontextRec::VertexProgram */
-#define _NEW_PROGRAM            0x8000000  /**< __GLcontextRec::VertexProgram */
-#define _NEW_CURRENT_ATTRIB     0x10000000  /**< __GLcontextRec::Current */
+#define _NEW_MODELVIEW		0x1        /**< __struct gl_contextRec::ModelView */
+#define _NEW_PROJECTION		0x2        /**< __struct gl_contextRec::Projection */
+#define _NEW_TEXTURE_MATRIX	0x4        /**< __struct gl_contextRec::TextureMatrix */
+#define _NEW_ACCUM		0x10       /**< __struct gl_contextRec::Accum */
+#define _NEW_COLOR		0x20       /**< __struct gl_contextRec::Color */
+#define _NEW_DEPTH		0x40       /**< __struct gl_contextRec::Depth */
+#define _NEW_EVAL		0x80       /**< __struct gl_contextRec::Eval, __struct gl_contextRec::EvalMap */
+#define _NEW_FOG		0x100      /**< __struct gl_contextRec::Fog */
+#define _NEW_HINT		0x200      /**< __struct gl_contextRec::Hint */
+#define _NEW_LIGHT		0x400      /**< __struct gl_contextRec::Light */
+#define _NEW_LINE		0x800      /**< __struct gl_contextRec::Line */
+#define _NEW_PIXEL		0x1000     /**< __struct gl_contextRec::Pixel */
+#define _NEW_POINT		0x2000     /**< __struct gl_contextRec::Point */
+#define _NEW_POLYGON		0x4000     /**< __struct gl_contextRec::Polygon */
+#define _NEW_POLYGONSTIPPLE	0x8000     /**< __struct gl_contextRec::PolygonStipple */
+#define _NEW_SCISSOR		0x10000    /**< __struct gl_contextRec::Scissor */
+#define _NEW_STENCIL		0x20000    /**< __struct gl_contextRec::Stencil */
+#define _NEW_TEXTURE		0x40000    /**< __struct gl_contextRec::Texture */
+#define _NEW_TRANSFORM		0x80000    /**< __struct gl_contextRec::Transform */
+#define _NEW_VIEWPORT		0x100000   /**< __struct gl_contextRec::Viewport */
+#define _NEW_PACKUNPACK		0x200000   /**< __struct gl_contextRec::Pack, __struct gl_contextRec::Unpack */
+#define _NEW_ARRAY	        0x400000   /**< __struct gl_contextRec::Array */
+#define _NEW_RENDERMODE		0x800000   /**< __struct gl_contextRec::RenderMode, __struct gl_contextRec::Feedback, __struct gl_contextRec::Select */
+#define _NEW_BUFFERS            0x1000000  /**< __struct gl_contextRec::Visual, __struct gl_contextRec::DrawBuffer, */
+#define _NEW_MULTISAMPLE        0x2000000  /**< __struct gl_contextRec::Multisample */
+#define _NEW_TRACK_MATRIX       0x4000000  /**< __struct gl_contextRec::VertexProgram */
+#define _NEW_PROGRAM            0x8000000  /**< __struct gl_contextRec::VertexProgram */
+#define _NEW_CURRENT_ATTRIB     0x10000000  /**< __struct gl_contextRec::Current */
 #define _NEW_PROGRAM_CONSTANTS  0x20000000
 #define _NEW_BUFFER_OBJECT      0x40000000
 #define _NEW_ALL ~0
@@ -2929,7 +2878,7 @@ struct gl_matrix_stack
 /**
  * \name A bunch of flags that we think might be useful to drivers.
  * 
- * Set in the __GLcontextRec::_TriangleCaps bitfield.
+ * Set in the __struct gl_contextRec::_TriangleCaps bitfield.
  */
 /*@{*/
 #define DD_FLATSHADE                0x1
@@ -2984,8 +2933,7 @@ struct gl_matrix_stack
 #define _MESA_NEW_NEED_NORMALS            (_NEW_LIGHT |		\
                                            _NEW_TEXTURE)
 
-#define _MESA_NEW_TRANSFER_STATE          (_NEW_PIXEL |		\
-                                           _NEW_COLOR_MATRIX)
+#define _MESA_NEW_TRANSFER_STATE          (_NEW_PIXEL)
 /*@}*/
 
 
@@ -2995,32 +2943,6 @@ struct gl_matrix_stack
 #include "dd.h"
 
 
-#define NUM_VERTEX_FORMAT_ENTRIES (sizeof(GLvertexformat) / sizeof(void *))
-
-/**
- * Core Mesa's support for tnl modules:
- */
-struct gl_tnl_module
-{
-   /**
-    * Vertex format to be lazily swapped into current dispatch.
-    */
-   const GLvertexformat *Current;
-
-   /**
-    * \name Record of functions swapped out.  
-    * On restore, only need to swap these functions back in.
-    */
-   /*@{*/
-   struct {
-       _glapi_proc * location;
-       _glapi_proc function;
-   } Swapped[NUM_VERTEX_FORMAT_ENTRIES];
-   GLuint SwapCount;
-   /*@}*/
-};
-
-
 /**
  * Display list flags.
  * Strictly this is a tnl-private concept, but it doesn't seem
@@ -3098,9 +3020,9 @@ typedef enum {
  * Think of this as a base class from which device drivers will derive
  * sub classes.
  *
- * The GLcontext typedef names this structure.
+ * The struct gl_context typedef names this structure.
  */
-struct __GLcontextRec
+struct gl_context
 {
    /** State possibly shared with other contexts in the address space */
    struct gl_shared_state *Shared;
@@ -3113,11 +3035,11 @@ struct __GLcontextRec
    struct _glapi_table *CurrentDispatch;  /**< == Save or Exec !! */
    /*@}*/
 
-   GLvisual Visual;
-   GLframebuffer *DrawBuffer;	/**< buffer for writing */
-   GLframebuffer *ReadBuffer;	/**< buffer for reading */
-   GLframebuffer *WinSysDrawBuffer;  /**< set with MakeCurrent */
-   GLframebuffer *WinSysReadBuffer;  /**< set with MakeCurrent */
+   struct gl_config Visual;
+   struct gl_framebuffer *DrawBuffer;	/**< buffer for writing */
+   struct gl_framebuffer *ReadBuffer;	/**< buffer for reading */
+   struct gl_framebuffer *WinSysDrawBuffer;  /**< set with MakeCurrent */
+   struct gl_framebuffer *WinSysReadBuffer;  /**< set with MakeCurrent */
 
    /**
     * Device driver function pointer table
@@ -3133,7 +3055,6 @@ struct __GLcontextRec
    /*@{*/
    struct gl_matrix_stack ModelviewMatrixStack;
    struct gl_matrix_stack ProjectionMatrixStack;
-   struct gl_matrix_stack ColorMatrixStack;
    struct gl_matrix_stack TextureMatrixStack[MAX_TEXTURE_UNITS];
    struct gl_matrix_stack ProgramMatrixStack[MAX_PROGRAM_MATRICES];
    struct gl_matrix_stack *CurrentStack; /**< Points to one of the above stacks */
@@ -3206,19 +3127,11 @@ struct __GLcontextRec
    /** \name Other assorted state (not pushed/popped on attribute stack) */
    /*@{*/
    struct gl_pixelmaps          PixelMaps;
-   struct gl_histogram_attrib	Histogram;
-   struct gl_minmax_attrib	MinMax;
-   struct gl_convolution_attrib Convolution1D;
-   struct gl_convolution_attrib Convolution2D;
-   struct gl_convolution_attrib Separable2D;
 
    struct gl_evaluators EvalMap;   /**< All evaluators */
    struct gl_feedback   Feedback;  /**< Feedback */
    struct gl_selection  Select;    /**< Selection */
 
-   struct gl_color_table ColorTable[COLORTABLE_MAX];
-   struct gl_color_table ProxyColorTable[COLORTABLE_MAX];
-
    struct gl_program_state Program;  /**< general program state */
    struct gl_vertex_program_state VertexProgram;
    struct gl_fragment_program_state FragmentProgram;
@@ -3293,9 +3206,6 @@ struct __GLcontextRec
     */
    GLboolean mvp_with_dp4;
 
-   /** Core tnl module support */
-   struct gl_tnl_module TnlModule;
-
    /**
     * \name Hooks for module contexts.  
     *
diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index 01b68df7afc..5487d45f56b 100644
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -50,7 +50,7 @@ _mesa_SampleCoverageARB(GLclampf value, GLboolean invert)
  * \param ctx  the GL context.
  */
 void
-_mesa_init_multisample(GLcontext *ctx)
+_mesa_init_multisample(struct gl_context *ctx)
 {
    ctx->Multisample.Enabled = GL_TRUE;
    ctx->Multisample.SampleAlphaToCoverage = GL_FALSE;
diff --git a/src/mesa/main/multisample.h b/src/mesa/main/multisample.h
index 998488ef420..c7cc432daac 100644
--- a/src/mesa/main/multisample.h
+++ b/src/mesa/main/multisample.h
@@ -33,7 +33,7 @@ _mesa_SampleCoverageARB(GLclampf value, GLboolean invert);
 
 
 extern void
-_mesa_init_multisample(GLcontext *ctx);
+_mesa_init_multisample(struct gl_context *ctx);
 
 
 #endif
diff --git a/src/mesa/main/nvprogram.c b/src/mesa/main/nvprogram.c
index 3a570b7dda6..833bf916ecf 100644
--- a/src/mesa/main/nvprogram.c
+++ b/src/mesa/main/nvprogram.c
@@ -511,7 +511,7 @@ _mesa_GetVertexAttribPointervNV(GLuint index, GLenum pname, GLvoid **pointer)
 }
 
 void
-_mesa_emit_nv_temp_initialization(GLcontext *ctx,
+_mesa_emit_nv_temp_initialization(struct gl_context *ctx,
 				  struct gl_program *program)
 {
    struct prog_instruction *inst;
@@ -559,7 +559,7 @@ _mesa_emit_nv_temp_initialization(GLcontext *ctx,
 }
 
 void
-_mesa_setup_nv_temporary_count(GLcontext *ctx, struct gl_program *program)
+_mesa_setup_nv_temporary_count(struct gl_context *ctx, struct gl_program *program)
 {
    GLuint i;
 
diff --git a/src/mesa/main/nvprogram.h b/src/mesa/main/nvprogram.h
index 260a25ba9e9..035f2fe2426 100644
--- a/src/mesa/main/nvprogram.h
+++ b/src/mesa/main/nvprogram.h
@@ -106,10 +106,10 @@ _mesa_GetProgramNamedParameterdvNV(GLuint id, GLsizei len, const GLubyte *name,
                                    GLdouble *params);
 
 extern void
-_mesa_setup_nv_temporary_count(GLcontext *ctx, struct gl_program *program);
+_mesa_setup_nv_temporary_count(struct gl_context *ctx, struct gl_program *program);
 
 extern void
-_mesa_emit_nv_temp_initialization(GLcontext *ctx,
+_mesa_emit_nv_temp_initialization(struct gl_context *ctx,
 				  struct gl_program *program);
 
 #endif
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 675e933ca62..5f824b34294 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -69,7 +69,7 @@ _mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor )
  * Return pointer to a pixelmap by name.
  */
 static struct gl_pixelmap *
-get_pixelmap(GLcontext *ctx, GLenum map)
+get_pixelmap(struct gl_context *ctx, GLenum map)
 {
    switch (map) {
    case GL_PIXEL_MAP_I_TO_I:
@@ -102,7 +102,7 @@ get_pixelmap(GLcontext *ctx, GLenum map)
  * Helper routine used by the other _mesa_PixelMap() functions.
  */
 static void
-store_pixelmap(GLcontext *ctx, GLenum map, GLsizei mapsize,
+store_pixelmap(struct gl_context *ctx, GLenum map, GLsizei mapsize,
                const GLfloat *values)
 {
    GLint i;
@@ -143,7 +143,7 @@ store_pixelmap(GLcontext *ctx, GLenum map, GLsizei mapsize,
  * Convenience wrapper for _mesa_validate_pbo_access() for gl[Get]PixelMap().
  */
 static GLboolean
-validate_pbo_access(GLcontext *ctx, struct gl_pixelstore_attrib *pack,
+validate_pbo_access(struct gl_context *ctx, struct gl_pixelstore_attrib *pack,
                     GLsizei mapsize, GLenum format, GLenum type,
                     const GLvoid *ptr)
 {
@@ -566,102 +566,6 @@ _mesa_PixelTransferf( GLenum pname, GLfloat param )
 	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
          ctx->Pixel.DepthBias = param;
 	 break;
-      case GL_POST_COLOR_MATRIX_RED_SCALE:
-         if (ctx->Pixel.PostColorMatrixScale[0] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixScale[0] = param;
-	 break;
-      case GL_POST_COLOR_MATRIX_RED_BIAS:
-         if (ctx->Pixel.PostColorMatrixBias[0] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixBias[0] = param;
-	 break;
-      case GL_POST_COLOR_MATRIX_GREEN_SCALE:
-         if (ctx->Pixel.PostColorMatrixScale[1] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixScale[1] = param;
-	 break;
-      case GL_POST_COLOR_MATRIX_GREEN_BIAS:
-         if (ctx->Pixel.PostColorMatrixBias[1] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixBias[1] = param;
-	 break;
-      case GL_POST_COLOR_MATRIX_BLUE_SCALE:
-         if (ctx->Pixel.PostColorMatrixScale[2] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixScale[2] = param;
-	 break;
-      case GL_POST_COLOR_MATRIX_BLUE_BIAS:
-         if (ctx->Pixel.PostColorMatrixBias[2] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixBias[2] = param;
-	 break;
-      case GL_POST_COLOR_MATRIX_ALPHA_SCALE:
-         if (ctx->Pixel.PostColorMatrixScale[3] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixScale[3] = param;
-	 break;
-      case GL_POST_COLOR_MATRIX_ALPHA_BIAS:
-         if (ctx->Pixel.PostColorMatrixBias[3] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostColorMatrixBias[3] = param;
-	 break;
-      case GL_POST_CONVOLUTION_RED_SCALE:
-         if (ctx->Pixel.PostConvolutionScale[0] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionScale[0] = param;
-	 break;
-      case GL_POST_CONVOLUTION_RED_BIAS:
-         if (ctx->Pixel.PostConvolutionBias[0] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionBias[0] = param;
-	 break;
-      case GL_POST_CONVOLUTION_GREEN_SCALE:
-         if (ctx->Pixel.PostConvolutionScale[1] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionScale[1] = param;
-	 break;
-      case GL_POST_CONVOLUTION_GREEN_BIAS:
-         if (ctx->Pixel.PostConvolutionBias[1] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionBias[1] = param;
-	 break;
-      case GL_POST_CONVOLUTION_BLUE_SCALE:
-         if (ctx->Pixel.PostConvolutionScale[2] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionScale[2] = param;
-	 break;
-      case GL_POST_CONVOLUTION_BLUE_BIAS:
-         if (ctx->Pixel.PostConvolutionBias[2] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionBias[2] = param;
-	 break;
-      case GL_POST_CONVOLUTION_ALPHA_SCALE:
-         if (ctx->Pixel.PostConvolutionScale[3] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionScale[3] = param;
-	 break;
-      case GL_POST_CONVOLUTION_ALPHA_BIAS:
-         if (ctx->Pixel.PostConvolutionBias[3] == param)
-	    return;
-	 FLUSH_VERTICES(ctx, _NEW_PIXEL);
-         ctx->Pixel.PostConvolutionBias[3] = param;
-	 break;
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glPixelTransfer(pname)" );
          return;
@@ -686,7 +590,7 @@ _mesa_PixelTransferi( GLenum pname, GLint param )
  * pixel transfer operations are enabled.
  */
 static void
-update_image_transfer_state(GLcontext *ctx)
+update_image_transfer_state(struct gl_context *ctx)
 {
    GLuint mask = 0;
 
@@ -702,48 +606,6 @@ update_image_transfer_state(GLcontext *ctx)
    if (ctx->Pixel.MapColorFlag)
       mask |= IMAGE_MAP_COLOR_BIT;
 
-   if (ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION])
-      mask |= IMAGE_COLOR_TABLE_BIT;
-
-   if (ctx->Pixel.Convolution1DEnabled ||
-       ctx->Pixel.Convolution2DEnabled ||
-       ctx->Pixel.Separable2DEnabled) {
-      mask |= IMAGE_CONVOLUTION_BIT;
-      if (ctx->Pixel.PostConvolutionScale[0] != 1.0F ||
-          ctx->Pixel.PostConvolutionScale[1] != 1.0F ||
-          ctx->Pixel.PostConvolutionScale[2] != 1.0F ||
-          ctx->Pixel.PostConvolutionScale[3] != 1.0F ||
-          ctx->Pixel.PostConvolutionBias[0] != 0.0F ||
-          ctx->Pixel.PostConvolutionBias[1] != 0.0F ||
-          ctx->Pixel.PostConvolutionBias[2] != 0.0F ||
-          ctx->Pixel.PostConvolutionBias[3] != 0.0F) {
-         mask |= IMAGE_POST_CONVOLUTION_SCALE_BIAS;
-      }
-   }
-
-   if (ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION])
-      mask |= IMAGE_POST_CONVOLUTION_COLOR_TABLE_BIT;
-
-   if (ctx->ColorMatrixStack.Top->type != MATRIX_IDENTITY ||
-       ctx->Pixel.PostColorMatrixScale[0] != 1.0F ||
-       ctx->Pixel.PostColorMatrixBias[0]  != 0.0F ||
-       ctx->Pixel.PostColorMatrixScale[1] != 1.0F ||
-       ctx->Pixel.PostColorMatrixBias[1]  != 0.0F ||
-       ctx->Pixel.PostColorMatrixScale[2] != 1.0F ||
-       ctx->Pixel.PostColorMatrixBias[2]  != 0.0F ||
-       ctx->Pixel.PostColorMatrixScale[3] != 1.0F ||
-       ctx->Pixel.PostColorMatrixBias[3]  != 0.0F)
-      mask |= IMAGE_COLOR_MATRIX_BIT;
-
-   if (ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX])
-      mask |= IMAGE_POST_COLOR_MATRIX_COLOR_TABLE_BIT;
-
-   if (ctx->Pixel.HistogramEnabled)
-      mask |= IMAGE_HISTOGRAM_BIT;
-
-   if (ctx->Pixel.MinMaxEnabled)
-      mask |= IMAGE_MIN_MAX_BIT;
-
    ctx->_ImageTransferState = mask;
 }
 
@@ -751,13 +613,8 @@ update_image_transfer_state(GLcontext *ctx)
 /**
  * Update mesa pixel transfer derived state.
  */
-void _mesa_update_pixel( GLcontext *ctx, GLuint new_state )
+void _mesa_update_pixel( struct gl_context *ctx, GLuint new_state )
 {
-   if (new_state & _NEW_COLOR_MATRIX)
-      _math_matrix_analyse( ctx->ColorMatrixStack.Top );
-
-   /* References ColorMatrix.type (derived above).
-    */
    if (new_state & _MESA_NEW_TRANSFER_STATE)
       update_image_transfer_state(ctx);
 }
@@ -798,10 +655,8 @@ init_pixelmap(struct gl_pixelmap *map)
  * Initialize the context's PIXEL attribute group.
  */
 void
-_mesa_init_pixel( GLcontext *ctx )
+_mesa_init_pixel( struct gl_context *ctx )
 {
-   int i;
-
    /* Pixel group */
    ctx->Pixel.RedBias = 0.0;
    ctx->Pixel.RedScale = 1.0;
@@ -829,31 +684,6 @@ _mesa_init_pixel( GLcontext *ctx )
    init_pixelmap(&ctx->PixelMaps.GtoG);
    init_pixelmap(&ctx->PixelMaps.BtoB);
    init_pixelmap(&ctx->PixelMaps.AtoA);
-   ctx->Pixel.HistogramEnabled = GL_FALSE;
-   ctx->Pixel.MinMaxEnabled = GL_FALSE;
-   ASSIGN_4V(ctx->Pixel.PostColorMatrixScale, 1.0, 1.0, 1.0, 1.0);
-   ASSIGN_4V(ctx->Pixel.PostColorMatrixBias, 0.0, 0.0, 0.0, 0.0);
-   for (i = 0; i < COLORTABLE_MAX; i++) {
-      ASSIGN_4V(ctx->Pixel.ColorTableScale[i], 1.0, 1.0, 1.0, 1.0);
-      ASSIGN_4V(ctx->Pixel.ColorTableBias[i], 0.0, 0.0, 0.0, 0.0);
-      ctx->Pixel.ColorTableEnabled[i] = GL_FALSE;
-   }
-   ctx->Pixel.Convolution1DEnabled = GL_FALSE;
-   ctx->Pixel.Convolution2DEnabled = GL_FALSE;
-   ctx->Pixel.Separable2DEnabled = GL_FALSE;
-   for (i = 0; i < 3; i++) {
-      ASSIGN_4V(ctx->Pixel.ConvolutionBorderColor[i], 0.0, 0.0, 0.0, 0.0);
-      ctx->Pixel.ConvolutionBorderMode[i] = GL_REDUCE;
-      ASSIGN_4V(ctx->Pixel.ConvolutionFilterScale[i], 1.0, 1.0, 1.0, 1.0);
-      ASSIGN_4V(ctx->Pixel.ConvolutionFilterBias[i], 0.0, 0.0, 0.0, 0.0);
-   }
-   for (i = 0; i < MAX_CONVOLUTION_WIDTH * MAX_CONVOLUTION_WIDTH * 4; i++) {
-      ctx->Convolution1D.Filter[i] = 0.0;
-      ctx->Convolution2D.Filter[i] = 0.0;
-      ctx->Separable2D.Filter[i] = 0.0;
-   }
-   ASSIGN_4V(ctx->Pixel.PostConvolutionScale, 1.0, 1.0, 1.0, 1.0);
-   ASSIGN_4V(ctx->Pixel.PostConvolutionBias, 0.0, 0.0, 0.0, 0.0);
    /* GL_SGI_texture_color_table */
    ASSIGN_4V(ctx->Pixel.TextureColorTableScale, 1.0, 1.0, 1.0, 1.0);
    ASSIGN_4V(ctx->Pixel.TextureColorTableBias, 0.0, 0.0, 0.0, 0.0);
diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index f4d3f1efdb0..03560835a8c 100644
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -39,7 +39,7 @@
 #if FEATURE_pixel_transfer
 
 extern void 
-_mesa_update_pixel( GLcontext *ctx, GLuint newstate );
+_mesa_update_pixel( struct gl_context *ctx, GLuint newstate );
 
 extern void
 _mesa_init_pixel_dispatch( struct _glapi_table * disp );
@@ -47,7 +47,7 @@ _mesa_init_pixel_dispatch( struct _glapi_table * disp );
 #else /* FEATURE_pixel_transfer */
 
 static INLINE void
-_mesa_update_pixel(GLcontext *ctx, GLuint newstate)
+_mesa_update_pixel(struct gl_context *ctx, GLuint newstate)
 {
 }
 
@@ -60,7 +60,7 @@ _mesa_init_pixel_dispatch(struct _glapi_table *disp)
 
 
 extern void 
-_mesa_init_pixel( GLcontext * ctx );
+_mesa_init_pixel( struct gl_context * ctx );
 
 /*@}*/
 
diff --git a/src/mesa/main/pixelstore.c b/src/mesa/main/pixelstore.c
index ec585ef0cce..b16d27a4ea5 100644
--- a/src/mesa/main/pixelstore.c
+++ b/src/mesa/main/pixelstore.c
@@ -228,7 +228,7 @@ _mesa_PixelStoref( GLenum pname, GLfloat param )
  * Initialize the context's pixel store state.
  */
 void
-_mesa_init_pixelstore( GLcontext *ctx )
+_mesa_init_pixelstore( struct gl_context *ctx )
 {
    /* Pixel transfer */
    ctx->Pack.Alignment = 4;
diff --git a/src/mesa/main/pixelstore.h b/src/mesa/main/pixelstore.h
index 47bff4276d1..cdef7de2613 100644
--- a/src/mesa/main/pixelstore.h
+++ b/src/mesa/main/pixelstore.h
@@ -45,7 +45,7 @@ _mesa_PixelStoref( GLenum pname, GLfloat param );
 
 
 extern void
-_mesa_init_pixelstore( GLcontext *ctx );
+_mesa_init_pixelstore( struct gl_context *ctx );
 
 
 #endif
diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c
index eab9d13d6d9..87bfae27eba 100644
--- a/src/mesa/main/points.c
+++ b/src/mesa/main/points.c
@@ -245,11 +245,11 @@ _mesa_PointParameterfv( GLenum pname, const GLfloat *params)
  *
  * \param ctx GL context.
  *
- * Initializes __GLcontextRec::Point and point related constants in
- * __GLcontextRec::Const.
+ * Initializes __struct gl_contextRec::Point and point related constants in
+ * __struct gl_contextRec::Const.
  */
 void
-_mesa_init_point(GLcontext *ctx)
+_mesa_init_point(struct gl_context *ctx)
 {
    GLuint i;
 
diff --git a/src/mesa/main/points.h b/src/mesa/main/points.h
index 156641eab91..b222379b1b5 100644
--- a/src/mesa/main/points.h
+++ b/src/mesa/main/points.h
@@ -51,7 +51,7 @@ extern void GLAPIENTRY
 _mesa_PointParameterfv( GLenum pname, const GLfloat *params );
 
 extern void 
-_mesa_init_point( GLcontext * ctx );
+_mesa_init_point( struct gl_context * ctx );
 
 
 #endif
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c
index 30e4a606bb7..970020048db 100644
--- a/src/mesa/main/polygon.c
+++ b/src/mesa/main/polygon.c
@@ -190,7 +190,7 @@ _mesa_PolygonMode( GLenum face, GLenum mode )
  * too.
  */
 void
-_mesa_polygon_stipple(GLcontext *ctx, const GLubyte *pattern)
+_mesa_polygon_stipple(struct gl_context *ctx, const GLubyte *pattern)
 {
    pattern = _mesa_map_validate_pbo_source(ctx, 2,
                                            &ctx->Unpack, 32, 32, 1,
@@ -293,10 +293,10 @@ _mesa_PolygonOffsetEXT( GLfloat factor, GLfloat bias )
  *
  * \param ctx GL context.
  *
- * Initializes __GLcontextRec::Polygon and __GLcontextRec::PolygonStipple
+ * Initializes __struct gl_contextRec::Polygon and __struct gl_contextRec::PolygonStipple
  * attribute groups.
  */
-void _mesa_init_polygon( GLcontext * ctx )
+void _mesa_init_polygon( struct gl_context * ctx )
 {
    /* Polygon group */
    ctx->Polygon.CullFlag = GL_FALSE;
diff --git a/src/mesa/main/polygon.h b/src/mesa/main/polygon.h
index 78e8394d053..ad0ac4cc3a7 100644
--- a/src/mesa/main/polygon.h
+++ b/src/mesa/main/polygon.h
@@ -36,7 +36,7 @@
 
 
 extern void
-_mesa_polygon_stipple(GLcontext *ctx, const GLubyte *pattern);
+_mesa_polygon_stipple(struct gl_context *ctx, const GLubyte *pattern);
 
 
 extern void GLAPIENTRY
@@ -61,6 +61,6 @@ extern void GLAPIENTRY
 _mesa_GetPolygonStipple( GLubyte *mask );
 
 extern void 
-_mesa_init_polygon( GLcontext * ctx );
+_mesa_init_polygon( struct gl_context * ctx );
 
 #endif
diff --git a/src/mesa/main/querymatrix.c b/src/mesa/main/querymatrix.c
index 36236eb9a75..944ad435f7a 100644
--- a/src/mesa/main/querymatrix.c
+++ b/src/mesa/main/querymatrix.c
@@ -117,10 +117,6 @@ GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[
         {GL_MODELVIEW, GL_MODELVIEW_MATRIX},
         {GL_PROJECTION, GL_PROJECTION_MATRIX},
         {GL_TEXTURE, GL_TEXTURE_MATRIX},
-#if 0
-        /* this doesn't exist in GLES */
-        {GL_COLOR, GL_COLOR_MATRIX},
-#endif
     };
 
     /* Call Mesa to get the current matrix in floating-point form.  First,
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index a907dac836b..88743977206 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -43,7 +43,7 @@
  * \return pointer to new query_object object or NULL if out of memory.
  */
 static struct gl_query_object *
-_mesa_new_query_object(GLcontext *ctx, GLuint id)
+_mesa_new_query_object(struct gl_context *ctx, GLuint id)
 {
    struct gl_query_object *q = MALLOC_STRUCT(gl_query_object);
    (void) ctx;
@@ -62,7 +62,7 @@ _mesa_new_query_object(GLcontext *ctx, GLuint id)
  * Called via ctx->Driver.BeginQuery().
  */
 static void
-_mesa_begin_query(GLcontext *ctx, struct gl_query_object *q)
+_mesa_begin_query(struct gl_context *ctx, struct gl_query_object *q)
 {
    /* no-op */
 }
@@ -73,7 +73,7 @@ _mesa_begin_query(GLcontext *ctx, struct gl_query_object *q)
  * Called via ctx->Driver.EndQuery().
  */
 static void
-_mesa_end_query(GLcontext *ctx, struct gl_query_object *q)
+_mesa_end_query(struct gl_context *ctx, struct gl_query_object *q)
 {
    q->Ready = GL_TRUE;
 }
@@ -84,7 +84,7 @@ _mesa_end_query(GLcontext *ctx, struct gl_query_object *q)
  * Called via ctx->Driver.WaitQuery().
  */
 static void
-_mesa_wait_query(GLcontext *ctx, struct gl_query_object *q)
+_mesa_wait_query(struct gl_context *ctx, struct gl_query_object *q)
 {
    /* For software drivers, _mesa_end_query() should have completed the query.
     * For real hardware, implement a proper WaitQuery() driver function,
@@ -99,7 +99,7 @@ _mesa_wait_query(GLcontext *ctx, struct gl_query_object *q)
  * Called via ctx->Driver.CheckQuery().
  */
 static void
-_mesa_check_query(GLcontext *ctx, struct gl_query_object *q)
+_mesa_check_query(struct gl_context *ctx, struct gl_query_object *q)
 {
    /* No-op for sw rendering.
     * HW drivers may need to flush at this time.
@@ -112,7 +112,7 @@ _mesa_check_query(GLcontext *ctx, struct gl_query_object *q)
  * Not removed from hash table here.
  */
 static void
-_mesa_delete_query(GLcontext *ctx, struct gl_query_object *q)
+_mesa_delete_query(struct gl_context *ctx, struct gl_query_object *q)
 {
    free(q);
 }
@@ -135,7 +135,7 @@ _mesa_init_query_object_functions(struct dd_function_table *driver)
  * \return NULL if invalid target, else the address of binding point
  */
 static struct gl_query_object **
-get_query_binding_point(GLcontext *ctx, GLenum target)
+get_query_binding_point(struct gl_context *ctx, GLenum target)
 {
    switch (target) {
    case GL_SAMPLES_PASSED_ARB:
@@ -535,7 +535,7 @@ _mesa_init_queryobj_dispatch(struct _glapi_table *disp)
  * Allocate/init the context state related to query objects.
  */
 void
-_mesa_init_queryobj(GLcontext *ctx)
+_mesa_init_queryobj(struct gl_context *ctx)
 {
    ctx->Query.QueryObjects = _mesa_NewHashTable();
    ctx->Query.CurrentOcclusionObject = NULL;
@@ -549,7 +549,7 @@ static void
 delete_queryobj_cb(GLuint id, void *data, void *userData)
 {
    struct gl_query_object *q= (struct gl_query_object *) data;
-   GLcontext *ctx = (GLcontext *)userData;
+   struct gl_context *ctx = (struct gl_context *)userData;
    ctx->Driver.DeleteQuery(ctx, q);
 }
 
@@ -558,7 +558,7 @@ delete_queryobj_cb(GLuint id, void *data, void *userData)
  * Free the context state related to query objects.
  */
 void
-_mesa_free_queryobj_data(GLcontext *ctx)
+_mesa_free_queryobj_data(struct gl_context *ctx)
 {
    _mesa_HashDeleteAll(ctx->Query.QueryObjects, delete_queryobj_cb, ctx);
    _mesa_DeleteHashTable(ctx->Query.QueryObjects);
diff --git a/src/mesa/main/queryobj.h b/src/mesa/main/queryobj.h
index 8746ed15e99..e289625731a 100644
--- a/src/mesa/main/queryobj.h
+++ b/src/mesa/main/queryobj.h
@@ -34,7 +34,7 @@
 #if FEATURE_queryobj
 
 static INLINE struct gl_query_object *
-_mesa_lookup_query_object(GLcontext *ctx, GLuint id)
+_mesa_lookup_query_object(struct gl_context *ctx, GLuint id)
 {
    return (struct gl_query_object *)
       _mesa_HashLookup(ctx->Query.QueryObjects, id);
@@ -68,7 +68,7 @@ _mesa_init_queryobj_dispatch(struct _glapi_table *disp);
 #else /* FEATURE_queryobj */
 
 static INLINE struct gl_query_object *
-_mesa_lookup_query_object(GLcontext *ctx, GLuint id)
+_mesa_lookup_query_object(struct gl_context *ctx, GLuint id)
 {
    return NULL;
 }
@@ -86,10 +86,10 @@ _mesa_init_queryobj_dispatch(struct _glapi_table *disp)
 #endif /* FEATURE_queryobj */
 
 extern void
-_mesa_init_queryobj(GLcontext *ctx);
+_mesa_init_queryobj(struct gl_context *ctx);
 
 extern void
-_mesa_free_queryobj_data(GLcontext *ctx);
+_mesa_free_queryobj_data(struct gl_context *ctx);
 
 
 #endif /* QUERYOBJ_H */
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index 75c67f2693e..6f52f07dfab 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -545,10 +545,10 @@ _mesa_init_rastpos_dispatch(struct _glapi_table *disp)
  * \param ctx GL context.
  *
  * Initialize the current raster position information in
- * __GLcontextRec::Current, and adds the extension entry points to the
+ * __struct gl_contextRec::Current, and adds the extension entry points to the
  * dispatcher.
  */
-void _mesa_init_rastpos( GLcontext * ctx )
+void _mesa_init_rastpos( struct gl_context * ctx )
 {
    int i;
 
diff --git a/src/mesa/main/rastpos.h b/src/mesa/main/rastpos.h
index 4994616d40a..9b508eaedf5 100644
--- a/src/mesa/main/rastpos.h
+++ b/src/mesa/main/rastpos.h
@@ -50,7 +50,7 @@ _mesa_init_rastpos_dispatch(struct _glapi_table *disp)
 #endif /* FEATURE_rastpos */
 
 extern void 
-_mesa_init_rastpos(GLcontext *ctx);
+_mesa_init_rastpos(struct gl_context *ctx);
 
 /*@}*/
 
diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
index 93f2bd31cc6..0043c8adc41 100644
--- a/src/mesa/main/readpix.c
+++ b/src/mesa/main/readpix.c
@@ -40,7 +40,7 @@
  * \return GL_TRUE if error detected, GL_FALSE if no errors
  */
 GLboolean
-_mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
+_mesa_error_check_format_type(struct gl_context *ctx, GLenum format, GLenum type,
                               GLboolean drawing)
 {
    const char *readDraw = drawing ? "Draw" : "Read";
@@ -66,6 +66,7 @@ _mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
 
    /* additional checks */
    switch (format) {
+   case GL_RG:
    case GL_RED:
    case GL_GREEN:
    case GL_BLUE:
diff --git a/src/mesa/main/readpix.h b/src/mesa/main/readpix.h
index 1bf02fb8e4d..0753e619fed 100644
--- a/src/mesa/main/readpix.h
+++ b/src/mesa/main/readpix.h
@@ -31,7 +31,7 @@
 
 
 extern GLboolean
-_mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
+_mesa_error_check_format_type(struct gl_context *ctx, GLenum format, GLenum type,
                               GLboolean drawing);
 
 extern void GLAPIENTRY
diff --git a/src/mesa/main/remap_helper.h b/src/mesa/main/remap_helper.h
index 631cc901588..fe3e0fd9123 100644
--- a/src/mesa/main/remap_helper.h
+++ b/src/mesa/main/remap_helper.h
@@ -65,4122 +65,4122 @@ static const char _mesa_function_pool[] =
    "\0"
    "glLoadIdentity\0"
    "\0"
-   /* _mesa_function_pool[172]: SampleCoverageARB (will be remapped) */
+   /* _mesa_function_pool[172]: GetCombinerOutputParameterfvNV (will be remapped) */
+   "iiip\0"
+   "glGetCombinerOutputParameterfvNV\0"
+   "\0"
+   /* _mesa_function_pool[211]: SampleCoverageARB (will be remapped) */
    "fi\0"
    "glSampleCoverage\0"
    "glSampleCoverageARB\0"
    "\0"
-   /* _mesa_function_pool[213]: ConvolutionFilter1D (offset 348) */
+   /* _mesa_function_pool[252]: ConvolutionFilter1D (offset 348) */
    "iiiiip\0"
    "glConvolutionFilter1D\0"
    "glConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[268]: BeginQueryARB (will be remapped) */
+   /* _mesa_function_pool[307]: BeginQueryARB (will be remapped) */
    "ii\0"
    "glBeginQuery\0"
    "glBeginQueryARB\0"
    "\0"
-   /* _mesa_function_pool[301]: RasterPos3dv (offset 71) */
+   /* _mesa_function_pool[340]: RasterPos3dv (offset 71) */
    "p\0"
    "glRasterPos3dv\0"
    "\0"
-   /* _mesa_function_pool[319]: PointParameteriNV (will be remapped) */
+   /* _mesa_function_pool[358]: PointParameteriNV (will be remapped) */
    "ii\0"
    "glPointParameteri\0"
    "glPointParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[361]: GetProgramiv (will be remapped) */
+   /* _mesa_function_pool[400]: GetProgramiv (will be remapped) */
    "iip\0"
    "glGetProgramiv\0"
    "\0"
-   /* _mesa_function_pool[381]: MultiTexCoord3sARB (offset 398) */
+   /* _mesa_function_pool[420]: MultiTexCoord3sARB (offset 398) */
    "iiii\0"
    "glMultiTexCoord3s\0"
    "glMultiTexCoord3sARB\0"
    "\0"
-   /* _mesa_function_pool[426]: SecondaryColor3iEXT (will be remapped) */
+   /* _mesa_function_pool[465]: SecondaryColor3iEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3i\0"
    "glSecondaryColor3iEXT\0"
    "\0"
-   /* _mesa_function_pool[472]: WindowPos3fMESA (will be remapped) */
+   /* _mesa_function_pool[511]: WindowPos3fMESA (will be remapped) */
    "fff\0"
    "glWindowPos3f\0"
    "glWindowPos3fARB\0"
    "glWindowPos3fMESA\0"
    "\0"
-   /* _mesa_function_pool[526]: TexCoord1iv (offset 99) */
+   /* _mesa_function_pool[565]: TexCoord1iv (offset 99) */
    "p\0"
    "glTexCoord1iv\0"
    "\0"
-   /* _mesa_function_pool[543]: TexCoord4sv (offset 125) */
+   /* _mesa_function_pool[582]: TexCoord4sv (offset 125) */
    "p\0"
    "glTexCoord4sv\0"
    "\0"
-   /* _mesa_function_pool[560]: RasterPos4s (offset 84) */
+   /* _mesa_function_pool[599]: RasterPos4s (offset 84) */
    "iiii\0"
    "glRasterPos4s\0"
    "\0"
-   /* _mesa_function_pool[580]: PixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[619]: PixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[613]: ActiveTextureARB (offset 374) */
+   /* _mesa_function_pool[652]: ActiveTextureARB (offset 374) */
    "i\0"
    "glActiveTexture\0"
    "glActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[651]: BlitFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[690]: BlitFramebufferEXT (will be remapped) */
    "iiiiiiiiii\0"
    "glBlitFramebuffer\0"
    "glBlitFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[702]: TexCoord1f (offset 96) */
+   /* _mesa_function_pool[741]: TexCoord1f (offset 96) */
    "f\0"
    "glTexCoord1f\0"
    "\0"
-   /* _mesa_function_pool[718]: TexCoord1d (offset 94) */
+   /* _mesa_function_pool[757]: TexCoord1d (offset 94) */
    "d\0"
    "glTexCoord1d\0"
    "\0"
-   /* _mesa_function_pool[734]: VertexAttrib4ubvNV (will be remapped) */
+   /* _mesa_function_pool[773]: VertexAttrib4ubvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[759]: TexCoord1i (offset 98) */
+   /* _mesa_function_pool[798]: TexCoord1i (offset 98) */
    "i\0"
    "glTexCoord1i\0"
    "\0"
-   /* _mesa_function_pool[775]: GetProgramNamedParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[814]: GetProgramNamedParameterdvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[812]: Histogram (offset 367) */
+   /* _mesa_function_pool[851]: Histogram (offset 367) */
    "iiii\0"
    "glHistogram\0"
    "glHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[845]: TexCoord1s (offset 100) */
+   /* _mesa_function_pool[884]: TexCoord1s (offset 100) */
    "i\0"
    "glTexCoord1s\0"
    "\0"
-   /* _mesa_function_pool[861]: GetMapfv (offset 267) */
+   /* _mesa_function_pool[900]: GetMapfv (offset 267) */
    "iip\0"
    "glGetMapfv\0"
    "\0"
-   /* _mesa_function_pool[877]: EvalCoord1f (offset 230) */
+   /* _mesa_function_pool[916]: EvalCoord1f (offset 230) */
    "f\0"
    "glEvalCoord1f\0"
    "\0"
-   /* _mesa_function_pool[894]: TexImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[933]: TexImage4DSGIS (dynamic) */
    "iiiiiiiiiip\0"
    "glTexImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[924]: PolygonStipple (offset 175) */
+   /* _mesa_function_pool[963]: PolygonStipple (offset 175) */
    "p\0"
    "glPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[944]: WindowPos2dvMESA (will be remapped) */
+   /* _mesa_function_pool[983]: WindowPos2dvMESA (will be remapped) */
    "p\0"
    "glWindowPos2dv\0"
    "glWindowPos2dvARB\0"
    "glWindowPos2dvMESA\0"
    "\0"
-   /* _mesa_function_pool[999]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1038]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1043]: BlendEquationSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[1082]: BlendEquationSeparateEXT (will be remapped) */
    "ii\0"
    "glBlendEquationSeparate\0"
    "glBlendEquationSeparateEXT\0"
    "glBlendEquationSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[1125]: ListParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[1164]: ListParameterfSGIX (dynamic) */
    "iif\0"
    "glListParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[1151]: SecondaryColor3bEXT (will be remapped) */
+   /* _mesa_function_pool[1190]: SecondaryColor3bEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3b\0"
    "glSecondaryColor3bEXT\0"
    "\0"
-   /* _mesa_function_pool[1197]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[1236]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1243]: GetPixelMapfv (offset 271) */
+   /* _mesa_function_pool[1282]: GetPixelMapfv (offset 271) */
    "ip\0"
    "glGetPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[1263]: Color3uiv (offset 22) */
+   /* _mesa_function_pool[1302]: Color3uiv (offset 22) */
    "p\0"
    "glColor3uiv\0"
    "\0"
-   /* _mesa_function_pool[1278]: IsEnabled (offset 286) */
+   /* _mesa_function_pool[1317]: IsEnabled (offset 286) */
    "i\0"
    "glIsEnabled\0"
    "\0"
-   /* _mesa_function_pool[1293]: VertexAttrib4svNV (will be remapped) */
+   /* _mesa_function_pool[1332]: VertexAttrib4svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4svNV\0"
    "\0"
-   /* _mesa_function_pool[1317]: EvalCoord2fv (offset 235) */
+   /* _mesa_function_pool[1356]: EvalCoord2fv (offset 235) */
    "p\0"
    "glEvalCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[1335]: GetBufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1374]: GetBufferSubDataARB (will be remapped) */
    "iiip\0"
    "glGetBufferSubData\0"
    "glGetBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1382]: BufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1421]: BufferSubDataARB (will be remapped) */
    "iiip\0"
    "glBufferSubData\0"
    "glBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1423]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1462]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1461]: AttachShader (will be remapped) */
+   /* _mesa_function_pool[1500]: AttachShader (will be remapped) */
    "ii\0"
    "glAttachShader\0"
    "\0"
-   /* _mesa_function_pool[1480]: VertexAttrib2fARB (will be remapped) */
+   /* _mesa_function_pool[1519]: VertexAttrib2fARB (will be remapped) */
    "iff\0"
    "glVertexAttrib2f\0"
    "glVertexAttrib2fARB\0"
    "\0"
-   /* _mesa_function_pool[1522]: GetDebugLogLengthMESA (dynamic) */
+   /* _mesa_function_pool[1561]: GetDebugLogLengthMESA (dynamic) */
    "iii\0"
    "glGetDebugLogLengthMESA\0"
    "\0"
-   /* _mesa_function_pool[1551]: GetMapiv (offset 268) */
+   /* _mesa_function_pool[1590]: GetMapiv (offset 268) */
    "iip\0"
    "glGetMapiv\0"
    "\0"
-   /* _mesa_function_pool[1567]: VertexAttrib3fARB (will be remapped) */
+   /* _mesa_function_pool[1606]: VertexAttrib3fARB (will be remapped) */
    "ifff\0"
    "glVertexAttrib3f\0"
    "glVertexAttrib3fARB\0"
    "\0"
-   /* _mesa_function_pool[1610]: Indexubv (offset 316) */
+   /* _mesa_function_pool[1649]: Indexubv (offset 316) */
    "p\0"
    "glIndexubv\0"
    "\0"
-   /* _mesa_function_pool[1624]: GetQueryivARB (will be remapped) */
+   /* _mesa_function_pool[1663]: GetQueryivARB (will be remapped) */
    "iip\0"
    "glGetQueryiv\0"
    "glGetQueryivARB\0"
    "\0"
-   /* _mesa_function_pool[1658]: TexImage3D (offset 371) */
+   /* _mesa_function_pool[1697]: TexImage3D (offset 371) */
    "iiiiiiiiip\0"
    "glTexImage3D\0"
    "glTexImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[1699]: ReplacementCodeuiVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1738]: ReplacementCodeuiVertex3fvSUN (dynamic) */
    "pp\0"
    "glReplacementCodeuiVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1735]: EdgeFlagPointer (offset 312) */
+   /* _mesa_function_pool[1774]: EdgeFlagPointer (offset 312) */
    "ip\0"
    "glEdgeFlagPointer\0"
    "\0"
-   /* _mesa_function_pool[1757]: Color3ubv (offset 20) */
+   /* _mesa_function_pool[1796]: Color3ubv (offset 20) */
    "p\0"
    "glColor3ubv\0"
    "\0"
-   /* _mesa_function_pool[1772]: GetQueryObjectivARB (will be remapped) */
+   /* _mesa_function_pool[1811]: GetQueryObjectivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectiv\0"
    "glGetQueryObjectivARB\0"
    "\0"
-   /* _mesa_function_pool[1818]: Vertex3dv (offset 135) */
+   /* _mesa_function_pool[1857]: Vertex3dv (offset 135) */
    "p\0"
    "glVertex3dv\0"
    "\0"
-   /* _mesa_function_pool[1833]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1872]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1880]: CompressedTexSubImage2DARB (will be remapped) */
+   /* _mesa_function_pool[1919]: CompressedTexSubImage2DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexSubImage2D\0"
    "glCompressedTexSubImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[1946]: CombinerOutputNV (will be remapped) */
+   /* _mesa_function_pool[1985]: CombinerOutputNV (will be remapped) */
    "iiiiiiiiii\0"
    "glCombinerOutputNV\0"
    "\0"
-   /* _mesa_function_pool[1977]: VertexAttribs3fvNV (will be remapped) */
+   /* _mesa_function_pool[2016]: VertexAttribs3fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3fvNV\0"
    "\0"
-   /* _mesa_function_pool[2003]: Uniform2fARB (will be remapped) */
+   /* _mesa_function_pool[2042]: Uniform2fARB (will be remapped) */
    "iff\0"
    "glUniform2f\0"
    "glUniform2fARB\0"
    "\0"
-   /* _mesa_function_pool[2035]: LightModeliv (offset 166) */
+   /* _mesa_function_pool[2074]: LightModeliv (offset 166) */
    "ip\0"
    "glLightModeliv\0"
    "\0"
-   /* _mesa_function_pool[2054]: VertexAttrib1svARB (will be remapped) */
+   /* _mesa_function_pool[2093]: VertexAttrib1svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1sv\0"
    "glVertexAttrib1svARB\0"
    "\0"
-   /* _mesa_function_pool[2097]: VertexAttribs1dvNV (will be remapped) */
+   /* _mesa_function_pool[2136]: VertexAttribs1dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1dvNV\0"
    "\0"
-   /* _mesa_function_pool[2123]: Uniform2ivARB (will be remapped) */
+   /* _mesa_function_pool[2162]: Uniform2ivARB (will be remapped) */
    "iip\0"
    "glUniform2iv\0"
    "glUniform2ivARB\0"
    "\0"
-   /* _mesa_function_pool[2157]: GetImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[2196]: GetImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[2195]: Normal3bv (offset 53) */
+   /* _mesa_function_pool[2234]: Normal3bv (offset 53) */
    "p\0"
    "glNormal3bv\0"
    "\0"
-   /* _mesa_function_pool[2210]: TexGeniv (offset 193) */
+   /* _mesa_function_pool[2249]: TexGeniv (offset 193) */
    "iip\0"
    "glTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[2226]: WeightubvARB (dynamic) */
+   /* _mesa_function_pool[2265]: WeightubvARB (dynamic) */
    "ip\0"
    "glWeightubvARB\0"
    "\0"
-   /* _mesa_function_pool[2245]: VertexAttrib1fvNV (will be remapped) */
+   /* _mesa_function_pool[2284]: VertexAttrib1fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1fvNV\0"
    "\0"
-   /* _mesa_function_pool[2269]: Vertex3iv (offset 139) */
+   /* _mesa_function_pool[2308]: Vertex3iv (offset 139) */
    "p\0"
    "glVertex3iv\0"
    "\0"
-   /* _mesa_function_pool[2284]: CopyConvolutionFilter1D (offset 354) */
+   /* _mesa_function_pool[2323]: CopyConvolutionFilter1D (offset 354) */
    "iiiii\0"
    "glCopyConvolutionFilter1D\0"
    "glCopyConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[2346]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[2385]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[2394]: DeleteSync (will be remapped) */
+   /* _mesa_function_pool[2433]: DeleteSync (will be remapped) */
    "i\0"
    "glDeleteSync\0"
    "\0"
-   /* _mesa_function_pool[2410]: FragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[2449]: FragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[2440]: BlendColor (offset 336) */
+   /* _mesa_function_pool[2479]: BlendColor (offset 336) */
    "ffff\0"
    "glBlendColor\0"
    "glBlendColorEXT\0"
    "\0"
-   /* _mesa_function_pool[2475]: UniformMatrix4fvARB (will be remapped) */
+   /* _mesa_function_pool[2514]: UniformMatrix4fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix4fv\0"
    "glUniformMatrix4fvARB\0"
    "\0"
-   /* _mesa_function_pool[2522]: DeleteVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[2561]: DeleteVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glDeleteVertexArrays\0"
    "glDeleteVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[2573]: ReadInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[2612]: ReadInstrumentsSGIX (dynamic) */
    "i\0"
    "glReadInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[2598]: CallLists (offset 3) */
+   /* _mesa_function_pool[2637]: CallLists (offset 3) */
    "iip\0"
    "glCallLists\0"
    "\0"
-   /* _mesa_function_pool[2615]: UniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[2654]: UniformMatrix2x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x4fv\0"
    "\0"
-   /* _mesa_function_pool[2642]: Color4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2681]: Color4ubVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2669]: Normal3iv (offset 59) */
+   /* _mesa_function_pool[2708]: Normal3iv (offset 59) */
    "p\0"
    "glNormal3iv\0"
    "\0"
-   /* _mesa_function_pool[2684]: PassThrough (offset 199) */
+   /* _mesa_function_pool[2723]: PassThrough (offset 199) */
    "f\0"
    "glPassThrough\0"
    "\0"
-   /* _mesa_function_pool[2701]: FramebufferTextureLayerEXT (will be remapped) */
+   /* _mesa_function_pool[2740]: FramebufferTextureLayerEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[2763]: GetListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[2802]: GetListParameterfvSGIX (dynamic) */
    "iip\0"
    "glGetListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[2793]: Viewport (offset 305) */
+   /* _mesa_function_pool[2832]: Viewport (offset 305) */
    "iiii\0"
    "glViewport\0"
    "\0"
-   /* _mesa_function_pool[2810]: VertexAttrib4NusvARB (will be remapped) */
+   /* _mesa_function_pool[2849]: VertexAttrib4NusvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nusv\0"
    "glVertexAttrib4NusvARB\0"
    "\0"
-   /* _mesa_function_pool[2857]: WindowPos4svMESA (will be remapped) */
+   /* _mesa_function_pool[2896]: WindowPos4svMESA (will be remapped) */
    "p\0"
    "glWindowPos4svMESA\0"
    "\0"
-   /* _mesa_function_pool[2879]: CreateProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[2918]: CreateProgramObjectARB (will be remapped) */
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[2906]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[2945]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
    "glDeleteTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[2937]: UniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[2976]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[2964]: PrioritizeTextures (offset 331) */
+   /* _mesa_function_pool[3003]: PrioritizeTextures (offset 331) */
    "ipp\0"
    "glPrioritizeTextures\0"
    "glPrioritizeTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[3014]: AsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[3053]: AsyncMarkerSGIX (dynamic) */
    "i\0"
    "glAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[3035]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[3074]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[3063]: ClearDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[3102]: ClearDebugLogMESA (dynamic) */
    "iii\0"
    "glClearDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[3088]: ResetHistogram (offset 369) */
+   /* _mesa_function_pool[3127]: ResetHistogram (offset 369) */
    "i\0"
    "glResetHistogram\0"
    "glResetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[3128]: GetProgramNamedParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[3167]: GetProgramNamedParameterfvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[3165]: PointParameterfEXT (will be remapped) */
+   /* _mesa_function_pool[3204]: PointParameterfEXT (will be remapped) */
    "if\0"
    "glPointParameterf\0"
    "glPointParameterfARB\0"
    "glPointParameterfEXT\0"
    "glPointParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[3251]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[3290]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[3287]: GenFencesNV (will be remapped) */
+   /* _mesa_function_pool[3326]: GenFencesNV (will be remapped) */
    "ip\0"
    "glGenFencesNV\0"
    "\0"
-   /* _mesa_function_pool[3305]: ImageTransformParameterfHP (dynamic) */
+   /* _mesa_function_pool[3344]: ImageTransformParameterfHP (dynamic) */
    "iif\0"
    "glImageTransformParameterfHP\0"
    "\0"
-   /* _mesa_function_pool[3339]: MatrixIndexusvARB (dynamic) */
+   /* _mesa_function_pool[3378]: MatrixIndexusvARB (dynamic) */
    "ip\0"
    "glMatrixIndexusvARB\0"
    "\0"
-   /* _mesa_function_pool[3363]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[3402]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[3395]: DisableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[3434]: DisableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[3455]: TexCoord2sv (offset 109) */
+   /* _mesa_function_pool[3494]: TexCoord2sv (offset 109) */
    "p\0"
    "glTexCoord2sv\0"
    "\0"
-   /* _mesa_function_pool[3472]: Vertex4dv (offset 143) */
+   /* _mesa_function_pool[3511]: Vertex4dv (offset 143) */
    "p\0"
    "glVertex4dv\0"
    "\0"
-   /* _mesa_function_pool[3487]: StencilMaskSeparate (will be remapped) */
+   /* _mesa_function_pool[3526]: StencilMaskSeparate (will be remapped) */
    "ii\0"
    "glStencilMaskSeparate\0"
    "\0"
-   /* _mesa_function_pool[3513]: ProgramLocalParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[3552]: ProgramLocalParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramLocalParameter4dARB\0"
    "\0"
-   /* _mesa_function_pool[3550]: CompressedTexImage3DARB (will be remapped) */
+   /* _mesa_function_pool[3589]: CompressedTexImage3DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexImage3D\0"
    "glCompressedTexImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[3610]: Color3sv (offset 18) */
+   /* _mesa_function_pool[3649]: Color3sv (offset 18) */
    "p\0"
    "glColor3sv\0"
    "\0"
-   /* _mesa_function_pool[3624]: GetConvolutionParameteriv (offset 358) */
+   /* _mesa_function_pool[3663]: GetConvolutionParameteriv (offset 358) */
    "iip\0"
    "glGetConvolutionParameteriv\0"
    "glGetConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[3688]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[3727]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[3729]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[3768]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[3744]: TestFenceNV (will be remapped) */
+   /* _mesa_function_pool[3783]: TestFenceNV (will be remapped) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[3761]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[3800]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[3806]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[3845]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[3823]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[3862]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[3857]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[3896]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[3895]: GetPixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[3934]: GetPixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[3931]: Color3fv (offset 14) */
+   /* _mesa_function_pool[3970]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[3945]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[3984]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[3971]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[4010]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[3997]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[4036]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[4018]: GetDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[4057]: GetDebugLogMESA (dynamic) */
    "iiiipp\0"
    "glGetDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[4044]: FogCoorddEXT (will be remapped) */
+   /* _mesa_function_pool[4083]: FogCoorddEXT (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[4074]: BeginConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[4113]: BeginConditionalRenderNV (will be remapped) */
    "ii\0"
    "glBeginConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[4105]: Color4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4144]: Color4ubVertex3fSUN (dynamic) */
    "iiiifff\0"
    "glColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4136]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[4175]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[4166]: PointSize (offset 173) */
+   /* _mesa_function_pool[4205]: PointSize (offset 173) */
    "f\0"
    "glPointSize\0"
    "\0"
-   /* _mesa_function_pool[4181]: TexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4220]: TexCoord2fVertex3fSUN (dynamic) */
    "fffff\0"
    "glTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4212]: PopName (offset 200) */
+   /* _mesa_function_pool[4251]: PopName (offset 200) */
    "\0"
    "glPopName\0"
    "\0"
-   /* _mesa_function_pool[4224]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[4263]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[4251]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[4290]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[4275]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[4314]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[4301]: VertexAttrib4NbvARB (will be remapped) */
+   /* _mesa_function_pool[4340]: VertexAttrib4NbvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[4346]: GetActiveAttribARB (will be remapped) */
+   /* _mesa_function_pool[4385]: GetActiveAttribARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[4394]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[4433]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[4409]: VertexAttrib4ubNV (will be remapped) */
+   /* _mesa_function_pool[4448]: VertexAttrib4ubNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4ubNV\0"
    "\0"
-   /* _mesa_function_pool[4436]: TextureRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[4475]: TextureRangeAPPLE (will be remapped) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[4461]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[4500]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[4480]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[4519]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[4508]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4547]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4561]: Indexub (offset 315) */
+   /* _mesa_function_pool[4600]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[4574]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[4613]: ColorMaskIndexedEXT (will be remapped) */
+   "iiiii\0"
+   "glColorMaskIndexedEXT\0"
+   "\0"
+   /* _mesa_function_pool[4642]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[4589]: GetClipPlane (offset 259) */
+   /* _mesa_function_pool[4657]: GetClipPlane (offset 259) */
    "ip\0"
    "glGetClipPlane\0"
    "\0"
-   /* _mesa_function_pool[4608]: CombinerParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[4676]: CombinerParameterfvNV (will be remapped) */
    "ip\0"
    "glCombinerParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[4636]: VertexAttribs3dvNV (will be remapped) */
+   /* _mesa_function_pool[4704]: VertexAttribs3dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3dvNV\0"
    "\0"
-   /* _mesa_function_pool[4662]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[4730]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[4688]: VertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[4756]: VertexArrayRangeNV (will be remapped) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[4713]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[4781]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[4739]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[4807]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[4762]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[4830]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[4781]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[4849]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[4810]: Scaled (offset 301) */
+   /* _mesa_function_pool[4878]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[4824]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[4892]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[4852]: Scalef (offset 302) */
+   /* _mesa_function_pool[4920]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[4866]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[4934]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[4904]: MultTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[4972]: MultTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[4956]: ColorMaskIndexedEXT (will be remapped) */
-   "iiiii\0"
-   "glColorMaskIndexedEXT\0"
-   "\0"
-   /* _mesa_function_pool[4985]: ObjectUnpurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[5024]: ObjectUnpurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectUnpurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[5015]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[5054]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[5031]: WindowPos2svMESA (will be remapped) */
+   /* _mesa_function_pool[5070]: WindowPos2svMESA (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[5086]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[5125]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[5100]: TexCoord2iv (offset 107) */
+   /* _mesa_function_pool[5139]: TexCoord2iv (offset 107) */
    "p\0"
    "glTexCoord2iv\0"
    "\0"
-   /* _mesa_function_pool[5117]: CompressedTexImage1DARB (will be remapped) */
+   /* _mesa_function_pool[5156]: CompressedTexImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[5175]: Rotated (offset 299) */
+   /* _mesa_function_pool[5214]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[5191]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[5230]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[5215]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[5254]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[5237]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[5276]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[5252]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[5291]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[5281]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[5320]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[5305]: Color4iv (offset 32) */
+   /* _mesa_function_pool[5344]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[5319]: TexParameterf (offset 178) */
+   /* _mesa_function_pool[5358]: TexParameterf (offset 178) */
    "iif\0"
    "glTexParameterf\0"
    "\0"
-   /* _mesa_function_pool[5340]: TexParameteri (offset 180) */
+   /* _mesa_function_pool[5379]: TexParameteri (offset 180) */
    "iii\0"
    "glTexParameteri\0"
    "\0"
-   /* _mesa_function_pool[5361]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[5400]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[5386]: MultiTexCoord3dARB (offset 392) */
+   /* _mesa_function_pool[5425]: MultiTexCoord3dARB (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[5431]: MultiTexCoord2iARB (offset 388) */
+   /* _mesa_function_pool[5470]: MultiTexCoord2iARB (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[5475]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[5514]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[5495]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5534]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5555]: MultiTexCoord2svARB (offset 391) */
+   /* _mesa_function_pool[5594]: MultiTexCoord2svARB (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[5600]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[5639]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[5627]: Uniform3iARB (will be remapped) */
+   /* _mesa_function_pool[5666]: Uniform3iARB (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[5660]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5699]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5688]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[5727]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[5721]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[5760]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[5746]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[5785]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[5764]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[5803]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[5789]: GlobalAlphaFactordSUN (dynamic) */
+   /* _mesa_function_pool[5828]: GlobalAlphaFactordSUN (dynamic) */
    "d\0"
    "glGlobalAlphaFactordSUN\0"
    "\0"
-   /* _mesa_function_pool[5816]: GetFinalCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[5855]: GetFinalCombinerInputParameterfvNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[5858]: GenerateMipmapEXT (will be remapped) */
+   /* _mesa_function_pool[5897]: GenerateMipmapEXT (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "\0"
-   /* _mesa_function_pool[5898]: GenLists (offset 5) */
+   /* _mesa_function_pool[5937]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[5912]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[5951]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[5947]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[5986]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[5981]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[6020]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[6008]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[6047]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[6036]: BufferDataARB (will be remapped) */
+   /* _mesa_function_pool[6075]: BufferDataARB (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[6071]: FlushVertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[6110]: FlushVertexArrayRangeNV (will be remapped) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[6099]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[6138]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[6119]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[6158]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[6139]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[6178]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[6159]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6198]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6185]: GetTexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[6224]: GetTexFilterFuncSGIS (dynamic) */
    "iip\0"
    "glGetTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[6213]: Scissor (offset 176) */
+   /* _mesa_function_pool[6252]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[6229]: Fogf (offset 153) */
+   /* _mesa_function_pool[6268]: Fogf (offset 153) */
    "if\0"
    "glFogf\0"
    "\0"
-   /* _mesa_function_pool[6240]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[6279]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6285]: TexSubImage1D (offset 332) */
+   /* _mesa_function_pool[6324]: TexSubImage1D (offset 332) */
    "iiiiiip\0"
    "glTexSubImage1D\0"
    "glTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[6329]: VertexAttrib1sARB (will be remapped) */
+   /* _mesa_function_pool[6368]: VertexAttrib1sARB (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[6370]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[6409]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[6386]: Color4usv (offset 40) */
+   /* _mesa_function_pool[6425]: Color4usv (offset 40) */
    "p\0"
    "glColor4usv\0"
    "\0"
-   /* _mesa_function_pool[6401]: Fogi (offset 155) */
+   /* _mesa_function_pool[6440]: Fogi (offset 155) */
    "ii\0"
    "glFogi\0"
    "\0"
-   /* _mesa_function_pool[6412]: DepthRange (offset 288) */
+   /* _mesa_function_pool[6451]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[6429]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[6468]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[6447]: FinalCombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[6486]: FinalCombinerInputNV (will be remapped) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[6476]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[6515]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[6493]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[6532]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[6511]: Color4ui (offset 37) */
+   /* _mesa_function_pool[6550]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[6528]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[6567]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[6547]: Color3usv (offset 24) */
+   /* _mesa_function_pool[6586]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[6562]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[6601]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[6582]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[6621]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[6599]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[6638]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[6648]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[6687]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[6665]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[6704]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[6684]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[6723]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[6703]: Uniform1fARB (will be remapped) */
+   /* _mesa_function_pool[6742]: Uniform1fARB (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[6734]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[6773]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[6786]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[6825]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[6803]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[6842]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[6852]: ColorTableParameteriv (offset 341) */
+   /* _mesa_function_pool[6891]: ColorTableParameteriv (offset 341) */
    "iip\0"
    "glColorTableParameteriv\0"
    "glColorTableParameterivSGI\0"
    "\0"
-   /* _mesa_function_pool[6908]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[6947]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[6939]: WindowPos3dMESA (will be remapped) */
+   /* _mesa_function_pool[6978]: WindowPos3dMESA (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[6993]: Color4us (offset 39) */
+   /* _mesa_function_pool[7032]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[7010]: PointParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[7049]: PointParameterfvEXT (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[7100]: Color3bv (offset 10) */
+   /* _mesa_function_pool[7139]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[7114]: WindowPos2fvMESA (will be remapped) */
+   /* _mesa_function_pool[7153]: WindowPos2fvMESA (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[7169]: SecondaryColor3bvEXT (will be remapped) */
+   /* _mesa_function_pool[7208]: SecondaryColor3bvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[7215]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[7254]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[7245]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[7284]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[7282]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[7321]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[7311]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[7350]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7353]: RenderbufferStorageEXT (will be remapped) */
+   /* _mesa_function_pool[7392]: RenderbufferStorageEXT (will be remapped) */
    "iiii\0"
    "glRenderbufferStorage\0"
    "glRenderbufferStorageEXT\0"
    "\0"
-   /* _mesa_function_pool[7406]: IsFenceNV (will be remapped) */
+   /* _mesa_function_pool[7445]: IsFenceNV (will be remapped) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[7421]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[7460]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[7443]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[7482]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[7473]: UniformMatrix2fvARB (will be remapped) */
+   /* _mesa_function_pool[7512]: UniformMatrix2fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[7520]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[7559]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[7564]: ColorTable (offset 339) */
+   /* _mesa_function_pool[7603]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[7617]: IndexPointer (offset 314) */
+   /* _mesa_function_pool[7656]: IndexPointer (offset 314) */
    "iip\0"
    "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[7637]: Accum (offset 213) */
+   /* _mesa_function_pool[7676]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[7649]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[7688]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[7670]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[7709]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[7702]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[7741]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[7758]: Finish (offset 216) */
+   /* _mesa_function_pool[7797]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[7769]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[7808]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[7793]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[7832]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[7811]: VertexAttrib3dvARB (will be remapped) */
+   /* _mesa_function_pool[7850]: VertexAttrib3dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[7854]: HintPGI (dynamic) */
+   /* _mesa_function_pool[7893]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[7868]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[7907]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[7926]: Color4s (offset 33) */
+   /* _mesa_function_pool[7965]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[7942]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[7981]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[7967]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[8006]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[7985]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[8024]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[8002]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[8041]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[8017]: CullParameterdvEXT (will be remapped) */
+   /* _mesa_function_pool[8056]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[8042]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[8081]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[8079]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[8118]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[8108]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[8147]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[8165]: Color4i (offset 31) */
+   /* _mesa_function_pool[8204]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[8181]: Color4f (offset 29) */
+   /* _mesa_function_pool[8220]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[8197]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[8236]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[8215]: Color4d (offset 27) */
+   /* _mesa_function_pool[8254]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[8231]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[8270]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[8247]: Color4b (offset 25) */
+   /* _mesa_function_pool[8286]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[8263]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[8302]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[8280]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[8319]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[8310]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[8349]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[8328]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[8367]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[8386]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[8425]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[8407]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[8446]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[8426]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[8465]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[8453]: BeginTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[8492]: BeginTransformFeedbackEXT (will be remapped) */
    "i\0"
    "glBeginTransformFeedbackEXT\0"
    "glBeginTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[8509]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[8548]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[8531]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[8570]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[8547]: EndList (offset 1) */
+   /* _mesa_function_pool[8586]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[8559]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[8598]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[8583]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[8622]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[8613]: Uniform3fvARB (will be remapped) */
+   /* _mesa_function_pool[8652]: Uniform3fvARB (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[8647]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[8686]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[8665]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[8704]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[8716]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[8755]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[8735]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[8774]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[8750]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[8789]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[8778]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[8817]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[8806]: CheckFramebufferStatusEXT (will be remapped) */
+   /* _mesa_function_pool[8845]: CheckFramebufferStatusEXT (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "\0"
-   /* _mesa_function_pool[8862]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[8901]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[8890]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[8929]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[8908]: GetVertexAttribivARB (will be remapped) */
+   /* _mesa_function_pool[8947]: GetVertexAttribivARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[8956]: GetCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[8995]: GetCombinerInputParameterfvNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[8995]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[9034]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[9013]: LoadTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[9052]: LoadTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[9065]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[9104]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[9099]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[9138]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[9127]: SecondaryColor3sEXT (will be remapped) */
+   /* _mesa_function_pool[9166]: SecondaryColor3sEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[9173]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[9212]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[9199]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[9238]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[9214]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[9253]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[9241]: Color3us (offset 23) */
+   /* _mesa_function_pool[9280]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[9257]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[9296]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[9292]: VertexAttrib4ivARB (will be remapped) */
+   /* _mesa_function_pool[9331]: VertexAttrib4ivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[9335]: End (offset 43) */
+   /* _mesa_function_pool[9374]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[9343]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[9382]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[9368]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[9407]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[9394]: GetQueryObjectui64vEXT (will be remapped) */
+   /* _mesa_function_pool[9433]: GetQueryObjectui64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[9424]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[9463]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[9469]: SecondaryColor3dEXT (will be remapped) */
+   /* _mesa_function_pool[9508]: SecondaryColor3dEXT (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[9515]: Color3ub (offset 19) */
+   /* _mesa_function_pool[9554]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[9531]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[9570]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9563]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[9602]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[9588]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[9627]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[9623]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[9662]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[9646]: Color3ui (offset 21) */
+   /* _mesa_function_pool[9685]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[9662]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[9701]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[9679]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[9718]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[9725]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[9764]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[9752]: GetTexParameterPointervAPPLE (will be remapped) */
+   /* _mesa_function_pool[9791]: GetTexParameterPointervAPPLE (will be remapped) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[9788]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[9827]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[9804]: GetTransformFeedbackVaryingEXT (will be remapped) */
+   /* _mesa_function_pool[9843]: GetTransformFeedbackVaryingEXT (will be remapped) */
    "iiipppp\0"
    "glGetTransformFeedbackVaryingEXT\0"
    "glGetTransformFeedbackVarying\0"
    "\0"
-   /* _mesa_function_pool[9876]: VertexAttrib4bvARB (will be remapped) */
+   /* _mesa_function_pool[9915]: VertexAttrib4bvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[9919]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[9958]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[9952]: GetIntegerIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[9991]: GetIntegerIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "\0"
-   /* _mesa_function_pool[9981]: MultiTexCoord4sARB (offset 406) */
+   /* _mesa_function_pool[10020]: MultiTexCoord4sARB (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[10027]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[10066]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[10060]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[10099]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[10084]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[10123]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "\0"
-   /* _mesa_function_pool[10109]: WindowPos2dMESA (will be remapped) */
+   /* _mesa_function_pool[10148]: WindowPos2dMESA (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[10162]: FramebufferTexture3DEXT (will be remapped) */
+   /* _mesa_function_pool[10201]: FramebufferTexture3DEXT (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "\0"
-   /* _mesa_function_pool[10219]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[10258]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "\0"
-   /* _mesa_function_pool[10257]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[10296]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[10282]: VertexAttrib3dARB (will be remapped) */
+   /* _mesa_function_pool[10321]: VertexAttrib3dARB (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[10325]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10364]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10389]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[10428]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[10433]: GetError (offset 261) */
+   /* _mesa_function_pool[10472]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[10446]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[10485]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[10465]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[10504]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[10482]: Indexdv (offset 45) */
+   /* _mesa_function_pool[10521]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[10495]: FramebufferTexture2DEXT (will be remapped) */
+   /* _mesa_function_pool[10534]: FramebufferTexture2DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "\0"
-   /* _mesa_function_pool[10551]: Normal3s (offset 60) */
+   /* _mesa_function_pool[10590]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[10567]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[10606]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[10601]: PushName (offset 201) */
+   /* _mesa_function_pool[10640]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[10615]: MultiTexCoord2dvARB (offset 385) */
+   /* _mesa_function_pool[10654]: MultiTexCoord2dvARB (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[10660]: CullParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[10699]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[10685]: Normal3i (offset 58) */
+   /* _mesa_function_pool[10724]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[10701]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[10740]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[10736]: SecondaryColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[10775]: SecondaryColorPointerEXT (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[10793]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[10832]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[10836]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[10875]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[10865]: GetActiveUniformARB (will be remapped) */
+   /* _mesa_function_pool[10904]: GetActiveUniformARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[10915]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[10954]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[10949]: Normal3b (offset 52) */
+   /* _mesa_function_pool[10988]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[10965]: Normal3d (offset 54) */
+   /* _mesa_function_pool[11004]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[10981]: Normal3f (offset 56) */
+   /* _mesa_function_pool[11020]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[10997]: MultiTexCoord1svARB (offset 383) */
+   /* _mesa_function_pool[11036]: MultiTexCoord1svARB (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[11042]: Indexi (offset 48) */
+   /* _mesa_function_pool[11081]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[11054]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[11093]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[11087]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[11126]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[11115]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[11154]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[11136]: BindBufferRangeEXT (will be remapped) */
+   /* _mesa_function_pool[11175]: DeformationMap3dSGIX (dynamic) */
+   "iddiiddiiddiip\0"
+   "glDeformationMap3dSGIX\0"
+   "\0"
+   /* _mesa_function_pool[11214]: BindBufferRangeEXT (will be remapped) */
    "iiiii\0"
    "glBindBufferRangeEXT\0"
    "glBindBufferRange\0"
    "\0"
-   /* _mesa_function_pool[11182]: DepthMask (offset 211) */
+   /* _mesa_function_pool[11260]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[11197]: IsShader (will be remapped) */
+   /* _mesa_function_pool[11275]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[11211]: Indexf (offset 46) */
+   /* _mesa_function_pool[11289]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[11223]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[11301]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[11261]: Indexd (offset 44) */
+   /* _mesa_function_pool[11339]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[11273]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[11351]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[11294]: StencilOp (offset 244) */
+   /* _mesa_function_pool[11372]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[11311]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[11389]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[11333]: FramebufferTextureLayer (dynamic) */
+   /* _mesa_function_pool[11411]: FramebufferTextureLayer (dynamic) */
    "iiiii\0"
    "glFramebufferTextureLayerARB\0"
    "\0"
-   /* _mesa_function_pool[11369]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[11447]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[11414]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[11492]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[11430]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[11508]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[11476]: Indexs (offset 50) */
+   /* _mesa_function_pool[11554]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[11488]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[11566]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[11508]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[11586]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[11530]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[11608]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[11568]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[11646]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[11600]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[11678]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[11627]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[11705]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[11642]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[11720]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[11659]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[11737]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[11674]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11752]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11727]: Color4bv (offset 26) */
+   /* _mesa_function_pool[11805]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[11741]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[11819]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[11763]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[11841]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[11811]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[11889]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[11836]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[11914]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[11884]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[11962]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[11908]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[11986]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[11943]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[12021]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[11961]: LogicOp (offset 242) */
+   /* _mesa_function_pool[12039]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[11974]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[12052]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[11998]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[12076]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[12013]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[12091]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[12089]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[12167]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[12106]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[12184]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[12126]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[12204]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[12153]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[12231]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[12198]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[12276]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[12213]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12291]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12245]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[12323]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[12273]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[12351]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[12297]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[12375]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[12358]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[12436]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[12382]: GenTextures (offset 328) */
+   /* _mesa_function_pool[12460]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[12417]: FramebufferTextureARB (will be remapped) */
+   /* _mesa_function_pool[12495]: FramebufferTextureARB (will be remapped) */
    "iiii\0"
    "glFramebufferTextureARB\0"
    "\0"
-   /* _mesa_function_pool[12447]: SetFenceNV (will be remapped) */
+   /* _mesa_function_pool[12525]: SetFenceNV (will be remapped) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[12464]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[12542]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[12520]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[12598]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[12559]: MultiModeDrawArraysIBM (will be remapped) */
-   "pppii\0"
-   "glMultiModeDrawArraysIBM\0"
-   "\0"
-   /* _mesa_function_pool[12591]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[12637]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[12624]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[12670]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[12646]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12692]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12674]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[12720]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[12692]: GetCombinerOutputParameterfvNV (will be remapped) */
-   "iiip\0"
-   "glGetCombinerOutputParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[12731]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[12738]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[12749]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[12756]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[12764]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[12771]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[12780]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[12787]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[12797]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[12804]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[12821]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[12828]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[12838]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[12845]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[12893]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[12900]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[12908]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[12915]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[12927]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[12934]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[12956]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[12963]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[12999]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[13006]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[13043]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[13050]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[13059]: EndTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[13066]: EndTransformFeedbackEXT (will be remapped) */
    "\0"
    "glEndTransformFeedbackEXT\0"
    "glEndTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[13110]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[13117]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[13144]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[13151]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[13173]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[13180]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[13218]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[13225]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[13274]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[13281]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[13295]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[13302]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[13325]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[13332]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[13360]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[13367]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[13379]: Flush (offset 217) */
+   /* _mesa_function_pool[13386]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[13389]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[13396]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[13404]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[13411]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[13426]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[13433]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[13444]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[13451]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[13487]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[13494]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[13511]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[13518]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[13527]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[13534]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[13545]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[13552]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[13587]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[13594]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[13609]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[13616]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[13629]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[13636]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[13670]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[13677]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[13725]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[13732]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[13743]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[13750]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[13767]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[13774]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[13785]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[13792]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[13803]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[13810]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[13857]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[13864]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[13899]: Color4ub (offset 35) */
+   /* _mesa_function_pool[13906]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[13916]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[13923]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[13936]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[13943]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[13965]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[13972]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[13983]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[13990]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[14043]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[14050]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[14062]: Indexiv (offset 49) */
+   /* _mesa_function_pool[14069]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[14075]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[14082]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[14093]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[14100]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[14137]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[14144]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[14197]: Frustum (offset 289) */
+   /* _mesa_function_pool[14204]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[14215]: GetString (offset 275) */
+   /* _mesa_function_pool[14222]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[14230]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[14237]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[14256]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[14263]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[14271]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[14278]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[14289]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[14296]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[14319]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[14326]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[14337]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[14344]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[14382]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[14389]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[14426]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[14433]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[14469]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[14476]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[14510]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[14517]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[14538]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[14545]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[14573]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[14580]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[14591]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[14598]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[14622]: DrawArraysInstanced (will be remapped) */
+   /* _mesa_function_pool[14629]: DrawArraysInstanced (will be remapped) */
    "iiii\0"
    "glDrawArraysInstanced\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "\0"
-   /* _mesa_function_pool[14700]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[14707]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[14734]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[14741]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[14759]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[14766]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[14815]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[14822]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[14834]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[14841]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[14850]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[14857]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[14898]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[14905]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[14944]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[14951]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[14961]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[14968]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[14988]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[14995]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[15015]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[15022]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[15052]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[15059]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[15072]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[15079]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[15093]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[15100]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[15120]: Rectd (offset 86) */
+   /* _mesa_function_pool[15127]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[15134]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[15141]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[15160]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[15167]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[15197]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[15204]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[15244]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[15251]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[15263]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[15270]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[15308]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[15315]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[15333]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[15340]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[15363]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[15370]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[15410]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[15417]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[15458]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[15465]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[15516]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[15523]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[15550]: Lightfv (offset 160) */
+   /* _mesa_function_pool[15557]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[15565]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[15572]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[15581]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[15588]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[15601]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[15608]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[15623]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[15630]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[15666]: Color4fv (offset 30) */
+   /* _mesa_function_pool[15673]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[15680]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[15687]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[15725]: DrawElementsInstanced (will be remapped) */
+   /* _mesa_function_pool[15732]: DrawElementsInstanced (will be remapped) */
    "iiipi\0"
    "glDrawElementsInstanced\0"
    "glDrawElementsInstancedARB\0"
    "glDrawElementsInstancedEXT\0"
    "\0"
-   /* _mesa_function_pool[15810]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[15817]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[15831]: Rects (offset 92) */
+   /* _mesa_function_pool[15838]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[15845]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[15852]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[15879]: Lightiv (offset 162) */
+   /* _mesa_function_pool[15886]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[15894]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[15901]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[15938]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[15945]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[15986]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[15993]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[16011]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[16018]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[16035]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[16042]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[16080]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[16087]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[16123]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[16130]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[16149]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[16156]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[16175]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[16182]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[16193]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[16200]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[16236]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[16243]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[16290]: Rectdv (offset 87) */
+   /* _mesa_function_pool[16297]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[16303]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[16310]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[16329]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[16336]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[16388]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[16395]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[16416]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[16423]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[16461]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[16468]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[16488]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[16495]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[16515]: Materialiv (offset 172) */
+   /* _mesa_function_pool[16522]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[16533]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[16540]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[16555]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[16562]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[16590]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[16597]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[16636]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[16643]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[16689]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[16696]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[16735]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[16742]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[16753]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[16760]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[16817]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[16824]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[16844]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[16851]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[16871]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[16878]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[16899]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[16906]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[16937]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[16944]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[16955]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[16962]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[16979]: TexGeni (offset 192) */
+   /* _mesa_function_pool[16986]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[16994]: TexGenf (offset 190) */
+   /* _mesa_function_pool[17001]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[17009]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[17016]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[17042]: TexGend (offset 188) */
+   /* _mesa_function_pool[17049]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[17057]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[17064]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[17084]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[17091]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[17107]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[17114]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[17126]: BindBufferOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[17133]: BindBufferOffsetEXT (will be remapped) */
    "iiii\0"
    "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[17154]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[17161]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[17208]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[17215]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[17232]: DisableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[17239]: DisableIndexedEXT (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "\0"
-   /* _mesa_function_pool[17256]: BindBufferBaseEXT (will be remapped) */
+   /* _mesa_function_pool[17263]: BindBufferBaseEXT (will be remapped) */
    "iii\0"
    "glBindBufferBaseEXT\0"
    "glBindBufferBase\0"
    "\0"
-   /* _mesa_function_pool[17298]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[17305]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[17327]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[17334]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[17351]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[17358]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[17398]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[17405]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[17448]: PixelTexGenSGIX (will be remapped) */
+   /* _mesa_function_pool[17455]: PixelTexGenSGIX (will be remapped) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[17469]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[17476]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[17496]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[17503]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[17530]: Color4sv (offset 34) */
+   /* _mesa_function_pool[17537]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[17544]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[17551]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[17574]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[17581]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[17606]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[17613]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[17641]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[17648]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[17657]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[17664]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[17690]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[17697]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[17748]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[17755]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[17804]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[17811]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[17834]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[17841]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[17854]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[17861]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[17873]: Color3dv (offset 12) */
+   /* _mesa_function_pool[17880]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[17887]: IsTexture (offset 330) */
+   /* _mesa_function_pool[17894]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[17917]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[17924]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[17940]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[17947]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[17981]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[17988]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[18016]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[18023]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[18035]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[18042]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[18074]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[18081]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[18104]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[18111]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[18136]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[18143]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[18165]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[18172]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[18181]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[18188]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[18209]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[18216]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[18251]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[18258]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[18269]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[18276]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[18295]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[18302]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[18344]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[18351]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[18362]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[18369]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[18407]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[18414]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[18441]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[18448]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[18465]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[18472]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[18504]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[18511]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[18533]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[18540]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[18551]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[18558]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[18594]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[18601]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[18614]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[18621]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[18682]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[18689]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[18737]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[18744]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[18775]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[18782]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[18809]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[18816]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[18857]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[18864]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[18885]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[18892]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[18938]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[18945]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[18959]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[18966]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[18986]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[18993]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[19018]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[19025]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[19042]: TransformFeedbackVaryingsEXT (will be remapped) */
+   /* _mesa_function_pool[19049]: TransformFeedbackVaryingsEXT (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryingsEXT\0"
    "glTransformFeedbackVaryings\0"
    "\0"
-   /* _mesa_function_pool[19107]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[19114]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[19129]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[19136]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[19147]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[19154]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[19170]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[19177]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[19197]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[19204]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[19247]: Color3s (offset 17) */
+   /* _mesa_function_pool[19254]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[19262]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[19269]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[19296]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[19303]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[19349]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[19356]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[19368]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[19375]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[19392]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[19399]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[19436]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[19443]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[19459]: Color3i (offset 15) */
+   /* _mesa_function_pool[19466]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[19474]: FrontFace (offset 157) */
+   /* _mesa_function_pool[19481]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[19489]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[19496]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[19507]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[19514]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[19555]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[19562]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[19573]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[19580]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[19616]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[19623]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[19666]: Color3b (offset 9) */
+   /* _mesa_function_pool[19673]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[19681]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[19688]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[19725]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[19732]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[19749]: Color3f (offset 13) */
+   /* _mesa_function_pool[19756]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[19764]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[19771]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[19784]: Color3d (offset 11) */
+   /* _mesa_function_pool[19791]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[19799]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[19806]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[19814]: Lightf (offset 159) */
+   /* _mesa_function_pool[19821]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[19828]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[19835]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[19854]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[19861]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[19870]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[19877]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[19891]: Lighti (offset 161) */
+   /* _mesa_function_pool[19898]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[19905]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[19912]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[19936]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[19943]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[19973]: GetBooleanIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[19980]: GetBooleanIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "\0"
-   /* _mesa_function_pool[20002]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[20009]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[20087]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[20094]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[20122]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[20129]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[20167]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[20174]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[20202]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[20209]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[20219]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[20226]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[20236]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[20243]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[20253]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[20260]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[20296]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[20303]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[20327]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[20334]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[20382]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[20389]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[20407]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[20414]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[20433]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[20440]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[20478]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[20485]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[20505]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[20512]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[20527]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[20534]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[20554]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[20561]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[20583]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[20590]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[20609]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[20616]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[20632]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[20639]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[20651]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[20658]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[20678]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[20685]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[20696]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[20703]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[20741]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[20748]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[20784]: ClearColor (offset 206) */
+   /* _mesa_function_pool[20791]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[20803]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[20810]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[20822]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[20829]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[20871]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[20878]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[20898]: IsEnabledIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[20905]: IsEnabledIndexedEXT (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "\0"
-   /* _mesa_function_pool[20924]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[20931]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[20940]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[20947]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[20988]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[20995]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[21008]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[21015]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[21056]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[21063]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[21080]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[21087]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[21121]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[21128]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[21153]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[21160]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[21171]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[21178]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[21263]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[21270]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[21294]: Bitmap (offset 8) */
+   /* _mesa_function_pool[21301]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[21312]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[21319]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[21357]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[21364]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[21388]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[21395]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[21424]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[21431]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[21467]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[21474]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[21499]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[21506]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[21514]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[21521]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[21532]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[21539]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[21572]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[21579]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[21599]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[21606]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[21618]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[21625]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[21666]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[21673]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[21701]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[21708]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[21728]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[21735]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[21752]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[21759]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[21786]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[21793]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[21838]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[21845]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[21857]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[21864]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[21888]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[21895]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[21926]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[21933]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[21969]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[21976]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[21989]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[21996]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[22060]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[22067]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[22082]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[22089]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[22102]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[22109]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[22156]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[22163]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[22209]: ProgramParameteriARB (will be remapped) */
+   /* _mesa_function_pool[22216]: ProgramParameteriARB (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "\0"
-   /* _mesa_function_pool[22237]: Map1d (offset 220) */
+   /* _mesa_function_pool[22244]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[22253]: Map1f (offset 221) */
+   /* _mesa_function_pool[22260]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[22269]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[22276]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[22328]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[22335]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[22364]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[22371]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[22388]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[22395]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[22409]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[22416]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[22440]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[22447]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[22479]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[22486]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[22501]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[22508]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[22555]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[22562]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[22576]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[22583]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[22622]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[22629]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[22637]: Fogiv (offset 156) */
+   /* _mesa_function_pool[22644]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[22649]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[22656]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[22666]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[22673]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[22702]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[22709]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[22723]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[22730]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[22750]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[22757]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[22774]: Rotatef (offset 300) */
+   /* _mesa_function_pool[22781]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[22790]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[22797]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[22832]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[22839]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[22848]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[22855]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[22864]: Clear (offset 203) */
+   /* _mesa_function_pool[22871]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[22875]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[22882]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[22891]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[22898]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[22918]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[22925]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[22952]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[22959]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[22968]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[22975]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[23024]: Ortho (offset 296) */
+   /* _mesa_function_pool[23031]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[23040]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[23047]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[23061]: ListBase (offset 6) */
+   /* _mesa_function_pool[23068]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[23075]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[23082]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[23091]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[23098]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[23147]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[23154]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[23239]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[23246]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[23296]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[23303]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[23312]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[23319]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[23338]: Rectiv (offset 91) */
+   /* _mesa_function_pool[23345]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[23351]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[23358]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[23389]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[23396]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[23416]: EndConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[23423]: EndConditionalRenderNV (will be remapped) */
    "\0"
    "glEndConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[23443]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[23450]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[23466]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[23473]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[23485]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[23492]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[23504]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[23511]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[23524]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[23531]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[23570]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[23577]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[23585]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[23592]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[23630]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[23637]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[23675]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[23682]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[23721]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[23728]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[23756]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[23763]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[23771]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[23778]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[23819]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[23826]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[23854]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[23861]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[23897]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[23904]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[23914]: PauseTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[23921]: PauseTransformFeedback (will be remapped) */
    "\0"
    "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[23941]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[23948]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[23984]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[23991]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[24031]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[24038]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[24119]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[24126]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[24145]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[24152]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[24190]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[24197]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[24222]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[24229]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[24237]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[24244]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[24263]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[24270]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[24288]: LineWidth (offset 168) */
+   /* _mesa_function_pool[24295]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[24303]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[24310]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[24334]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[24341]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[24372]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[24379]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[24392]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[24399]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[24413]: TexGendv (offset 189) */
+   /* _mesa_function_pool[24420]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[24429]: EnableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[24436]: EnableIndexedEXT (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "\0"
-   /* _mesa_function_pool[24452]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[24459]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[24477]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[24484]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[24498]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[24505]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[24532]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[24539]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[24559]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[24566]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[24582]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[24589]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[24608]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[24615]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[24672]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[24679]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[24698]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[24705]: MultiModeDrawArraysIBM (will be remapped) */
+   "pppii\0"
+   "glMultiModeDrawArraysIBM\0"
+   "\0"
+   /* _mesa_function_pool[24737]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[24742]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[24781]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[24773]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[24812]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[24810]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[24849]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[24831]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[24870]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[24853]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[24892]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[24874]: CallList (offset 2) */
+   /* _mesa_function_pool[24913]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[24888]: Materialfv (offset 170) */
+   /* _mesa_function_pool[24927]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[24906]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[24945]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[24923]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[24962]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[24955]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[24994]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[25000]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[25039]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[25048]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[25087]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[25093]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[25132]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[25111]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[25150]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[25164]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[25203]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[25195]: Color3iv (offset 16) */
+   /* _mesa_function_pool[25234]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[25209]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[25248]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[25243]: DrawElements (offset 311) */
+   /* _mesa_function_pool[25282]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[25264]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[25303]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[25290]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[25329]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[25327]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[25366]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[25387]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[25426]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[25430]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[25469]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[25485]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[25524]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[25508]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[25547]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[25581]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[25620]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[25604]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[25643]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[25635]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[25674]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[25672]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[25711]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[25689]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[25728]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[25705]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[25744]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[25725]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[25764]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[25739]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[25778]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[25758]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[25797]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[25778]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[25817]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[25827]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[25866]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[25873]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[25912]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[25892]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[25931]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[25918]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[25957]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[25961]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[26000]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[25986]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[26025]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[26031]: Map2d (offset 222) */
+   /* _mesa_function_pool[26070]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[26051]: Map2f (offset 223) */
+   /* _mesa_function_pool[26090]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[26071]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[26110]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[26096]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[26135]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[26113]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[26152]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[26142]: FragmentLightModelivSGIX (dynamic) */
+   /* _mesa_function_pool[26181]: FragmentLightModelivSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelivSGIX\0"
    "\0"
-   /* _mesa_function_pool[26173]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[26212]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[26196]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[26235]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[26213]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[26252]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[26230]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[26269]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[26247]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[26286]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[26265]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[26304]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[26291]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[26330]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[26347]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[26386]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[26366]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[26405]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[26383]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[26422]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[26414]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[26453]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[26454]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[26493]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[26480]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[26519]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[26511]: Materialf (offset 169) */
+   /* _mesa_function_pool[26550]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[26528]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[26567]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[26573]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[26612]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[26598]: Materiali (offset 171) */
+   /* _mesa_function_pool[26637]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[26615]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[26654]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[26641]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[26680]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[26676]: Indexsv (offset 51) */
+   /* _mesa_function_pool[26715]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[26689]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[26728]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[26734]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[26773]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[26753]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[26792]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[26770]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[26809]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[26803]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[26842]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[26821]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[26860]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[26858]: Translated (offset 303) */
+   /* _mesa_function_pool[26897]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[26876]: Translatef (offset 304) */
+   /* _mesa_function_pool[26915]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[26894]: StencilMask (offset 209) */
+   /* _mesa_function_pool[26933]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[26911]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[26950]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[26931]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[26970]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[26949]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[26988]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[26975]: IsList (offset 287) */
+   /* _mesa_function_pool[27014]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[26987]: IsSync (will be remapped) */
+   /* _mesa_function_pool[27026]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[26999]: RenderMode (offset 196) */
+   /* _mesa_function_pool[27038]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[27015]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[27054]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[27048]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[27087]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "\0"
-   /* _mesa_function_pool[27100]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[27139]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[27137]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[27176]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[27165]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[27204]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[27207]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[27246]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[27250]: LoadName (offset 198) */
+   /* _mesa_function_pool[27289]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[27264]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[27303]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[27291]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[27330]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[27309]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[27348]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[27343]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[27382]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[27394]: CullFace (offset 152) */
+   /* _mesa_function_pool[27433]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[27408]: BindTexture (offset 307) */
+   /* _mesa_function_pool[27447]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[27443]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[27482]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[27470]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[27509]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[27516]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[27555]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[27542]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[27581]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[27561]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[27600]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[27581]: Rectsv (offset 93) */
+   /* _mesa_function_pool[27620]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[27594]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[27633]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[27621]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[27660]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[27679]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[27718]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[27705]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[27744]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[27768]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[27807]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[27823]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[27862]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[27850]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[27889]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[27871]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[27910]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[27893]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[27932]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[27921]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[27960]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[27945]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[27984]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[27990]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[28029]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[28009]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[28048]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[28036]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[28075]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[28052]: Recti (offset 90) */
+   /* _mesa_function_pool[28091]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[28066]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[28105]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[28105]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[28144]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[28134]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[28173]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[28173]: PixelTransformParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[28212]: PixelTransformParameterfvEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[28209]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[28248]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[28231]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[28270]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[28252]: Rectf (offset 88) */
+   /* _mesa_function_pool[28291]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[28266]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[28305]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[28289]: Indexfv (offset 47) */
+   /* _mesa_function_pool[28328]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[28302]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[28341]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[28348]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[28387]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[28400]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[28439]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[28435]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[28474]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[28455]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[28494]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[28482]: IndexMask (offset 212) */
+   /* _mesa_function_pool[28521]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[28497]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[28536]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[28534]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[28573]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[28577]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[28616]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[28593]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[28632]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[28619]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[28658]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[28638]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[28677]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[28660]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[28699]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[28679]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[28718]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[28696]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[28735]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[28723]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[28762]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[28737]: Fogfv (offset 154) */
+   /* _mesa_function_pool[28776]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[28749]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[28788]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[28783]: InitNames (offset 197) */
+   /* _mesa_function_pool[28822]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[28797]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[28836]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[28812]: Minmax (offset 368) */
+   /* _mesa_function_pool[28851]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[28838]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[28877]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[28857]: DeformationMap3dSGIX (dynamic) */
-   "iddiiddiiddiip\0"
-   "glDeformationMap3dSGIX\0"
-   "\0"
    /* _mesa_function_pool[28896]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
@@ -4468,534 +4468,532 @@ static const char _mesa_function_pool[] =
 
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   {  1461, AttachShader_remap_index },
-   {  8995, CreateProgram_remap_index },
-   { 21153, CreateShader_remap_index },
-   { 23466, DeleteProgram_remap_index },
-   { 16937, DeleteShader_remap_index },
-   { 21599, DetachShader_remap_index },
-   { 16461, GetAttachedShaders_remap_index },
-   {  4275, GetProgramInfoLog_remap_index },
-   {   361, GetProgramiv_remap_index },
-   {  5721, GetShaderInfoLog_remap_index },
-   { 28619, GetShaderiv_remap_index },
-   { 12198, IsProgram_remap_index },
-   { 11197, IsShader_remap_index },
-   {  9099, StencilFuncSeparate_remap_index },
-   {  3487, StencilMaskSeparate_remap_index },
-   {  6803, StencilOpSeparate_remap_index },
-   { 20478, UniformMatrix2x3fv_remap_index },
-   {  2615, UniformMatrix2x4fv_remap_index },
+   {  1500, AttachShader_remap_index },
+   {  9034, CreateProgram_remap_index },
+   { 21160, CreateShader_remap_index },
+   { 23473, DeleteProgram_remap_index },
+   { 16944, DeleteShader_remap_index },
+   { 21606, DetachShader_remap_index },
+   { 16468, GetAttachedShaders_remap_index },
+   {  4314, GetProgramInfoLog_remap_index },
+   {   400, GetProgramiv_remap_index },
+   {  5760, GetShaderInfoLog_remap_index },
+   { 28658, GetShaderiv_remap_index },
+   { 12276, IsProgram_remap_index },
+   { 11275, IsShader_remap_index },
+   {  9138, StencilFuncSeparate_remap_index },
+   {  3526, StencilMaskSeparate_remap_index },
+   {  6842, StencilOpSeparate_remap_index },
+   { 20485, UniformMatrix2x3fv_remap_index },
+   {  2654, UniformMatrix2x4fv_remap_index },
    { 30286, UniformMatrix3x2fv_remap_index },
-   { 28009, UniformMatrix3x4fv_remap_index },
-   { 14961, UniformMatrix4x2fv_remap_index },
-   {  2937, UniformMatrix4x3fv_remap_index },
-   { 14622, DrawArraysInstanced_remap_index },
-   { 15725, DrawElementsInstanced_remap_index },
-   {  9013, LoadTransposeMatrixdARB_remap_index },
-   { 28348, LoadTransposeMatrixfARB_remap_index },
-   {  4904, MultTransposeMatrixdARB_remap_index },
-   { 21786, MultTransposeMatrixfARB_remap_index },
-   {   172, SampleCoverageARB_remap_index },
-   {  5117, CompressedTexImage1DARB_remap_index },
-   { 22269, CompressedTexImage2DARB_remap_index },
-   {  3550, CompressedTexImage3DARB_remap_index },
-   { 16753, CompressedTexSubImage1DARB_remap_index },
-   {  1880, CompressedTexSubImage2DARB_remap_index },
-   { 18614, CompressedTexSubImage3DARB_remap_index },
-   { 26291, GetCompressedTexImageARB_remap_index },
-   {  3395, DisableVertexAttribArrayARB_remap_index },
-   { 27621, EnableVertexAttribArrayARB_remap_index },
+   { 28048, UniformMatrix3x4fv_remap_index },
+   { 14968, UniformMatrix4x2fv_remap_index },
+   {  2976, UniformMatrix4x3fv_remap_index },
+   { 14629, DrawArraysInstanced_remap_index },
+   { 15732, DrawElementsInstanced_remap_index },
+   {  9052, LoadTransposeMatrixdARB_remap_index },
+   { 28387, LoadTransposeMatrixfARB_remap_index },
+   {  4972, MultTransposeMatrixdARB_remap_index },
+   { 21793, MultTransposeMatrixfARB_remap_index },
+   {   211, SampleCoverageARB_remap_index },
+   {  5156, CompressedTexImage1DARB_remap_index },
+   { 22276, CompressedTexImage2DARB_remap_index },
+   {  3589, CompressedTexImage3DARB_remap_index },
+   { 16760, CompressedTexSubImage1DARB_remap_index },
+   {  1919, CompressedTexSubImage2DARB_remap_index },
+   { 18621, CompressedTexSubImage3DARB_remap_index },
+   { 26330, GetCompressedTexImageARB_remap_index },
+   {  3434, DisableVertexAttribArrayARB_remap_index },
+   { 27660, EnableVertexAttribArrayARB_remap_index },
    { 29462, GetProgramEnvParameterdvARB_remap_index },
-   { 21666, GetProgramEnvParameterfvARB_remap_index },
-   { 25290, GetProgramLocalParameterdvARB_remap_index },
-   {  7245, GetProgramLocalParameterfvARB_remap_index },
-   { 16844, GetProgramStringARB_remap_index },
-   { 25485, GetProgramivARB_remap_index },
-   { 18809, GetVertexAttribdvARB_remap_index },
-   { 14850, GetVertexAttribfvARB_remap_index },
-   {  8908, GetVertexAttribivARB_remap_index },
-   { 17690, ProgramEnvParameter4dARB_remap_index },
-   { 23239, ProgramEnvParameter4dvARB_remap_index },
-   { 15458, ProgramEnvParameter4fARB_remap_index },
-   {  8108, ProgramEnvParameter4fvARB_remap_index },
-   {  3513, ProgramLocalParameter4dARB_remap_index },
-   { 11908, ProgramLocalParameter4dvARB_remap_index },
-   { 27100, ProgramLocalParameter4fARB_remap_index },
-   { 23819, ProgramLocalParameter4fvARB_remap_index },
-   { 26071, ProgramStringARB_remap_index },
-   { 17940, VertexAttrib1dARB_remap_index },
-   { 14426, VertexAttrib1dvARB_remap_index },
-   {  3688, VertexAttrib1fARB_remap_index },
+   { 21673, GetProgramEnvParameterfvARB_remap_index },
+   { 25329, GetProgramLocalParameterdvARB_remap_index },
+   {  7284, GetProgramLocalParameterfvARB_remap_index },
+   { 16851, GetProgramStringARB_remap_index },
+   { 25524, GetProgramivARB_remap_index },
+   { 18816, GetVertexAttribdvARB_remap_index },
+   { 14857, GetVertexAttribfvARB_remap_index },
+   {  8947, GetVertexAttribivARB_remap_index },
+   { 17697, ProgramEnvParameter4dARB_remap_index },
+   { 23246, ProgramEnvParameter4dvARB_remap_index },
+   { 15465, ProgramEnvParameter4fARB_remap_index },
+   {  8147, ProgramEnvParameter4fvARB_remap_index },
+   {  3552, ProgramLocalParameter4dARB_remap_index },
+   { 11986, ProgramLocalParameter4dvARB_remap_index },
+   { 27139, ProgramLocalParameter4fARB_remap_index },
+   { 23826, ProgramLocalParameter4fvARB_remap_index },
+   { 26110, ProgramStringARB_remap_index },
+   { 17947, VertexAttrib1dARB_remap_index },
+   { 14433, VertexAttrib1dvARB_remap_index },
+   {  3727, VertexAttrib1fARB_remap_index },
    { 30367, VertexAttrib1fvARB_remap_index },
-   {  6329, VertexAttrib1sARB_remap_index },
-   {  2054, VertexAttrib1svARB_remap_index },
-   { 13857, VertexAttrib2dARB_remap_index },
-   { 16080, VertexAttrib2dvARB_remap_index },
-   {  1480, VertexAttrib2fARB_remap_index },
-   { 16193, VertexAttrib2fvARB_remap_index },
+   {  6368, VertexAttrib1sARB_remap_index },
+   {  2093, VertexAttrib1svARB_remap_index },
+   { 13864, VertexAttrib2dARB_remap_index },
+   { 16087, VertexAttrib2dvARB_remap_index },
+   {  1519, VertexAttrib2fARB_remap_index },
+   { 16200, VertexAttrib2fvARB_remap_index },
    { 29993, VertexAttrib2sARB_remap_index },
    { 29099, VertexAttrib2svARB_remap_index },
-   { 10282, VertexAttrib3dARB_remap_index },
-   {  7811, VertexAttrib3dvARB_remap_index },
-   {  1567, VertexAttrib3fARB_remap_index },
-   { 20741, VertexAttrib3fvARB_remap_index },
-   { 25918, VertexAttrib3sARB_remap_index },
-   { 18551, VertexAttrib3svARB_remap_index },
-   {  4301, VertexAttrib4NbvARB_remap_index },
-   { 16416, VertexAttrib4NivARB_remap_index },
-   { 20696, VertexAttrib4NsvARB_remap_index },
-   { 21618, VertexAttrib4NubARB_remap_index },
+   { 10321, VertexAttrib3dARB_remap_index },
+   {  7850, VertexAttrib3dvARB_remap_index },
+   {  1606, VertexAttrib3fARB_remap_index },
+   { 20748, VertexAttrib3fvARB_remap_index },
+   { 25957, VertexAttrib3sARB_remap_index },
+   { 18558, VertexAttrib3svARB_remap_index },
+   {  4340, VertexAttrib4NbvARB_remap_index },
+   { 16423, VertexAttrib4NivARB_remap_index },
+   { 20703, VertexAttrib4NsvARB_remap_index },
+   { 21625, VertexAttrib4NubARB_remap_index },
    { 29345, VertexAttrib4NubvARB_remap_index },
-   { 17351, VertexAttrib4NuivARB_remap_index },
-   {  2810, VertexAttrib4NusvARB_remap_index },
-   {  9876, VertexAttrib4bvARB_remap_index },
-   { 24698, VertexAttrib4dARB_remap_index },
-   { 19573, VertexAttrib4dvARB_remap_index },
-   { 10389, VertexAttrib4fARB_remap_index },
-   { 10793, VertexAttrib4fvARB_remap_index },
-   {  9292, VertexAttrib4ivARB_remap_index },
-   { 15894, VertexAttrib4sARB_remap_index },
-   { 28534, VertexAttrib4svARB_remap_index },
-   { 15263, VertexAttrib4ubvARB_remap_index },
-   { 27945, VertexAttrib4uivARB_remap_index },
-   { 18362, VertexAttrib4usvARB_remap_index },
-   { 20327, VertexAttribPointerARB_remap_index },
+   { 17358, VertexAttrib4NuivARB_remap_index },
+   {  2849, VertexAttrib4NusvARB_remap_index },
+   {  9915, VertexAttrib4bvARB_remap_index },
+   { 24737, VertexAttrib4dARB_remap_index },
+   { 19580, VertexAttrib4dvARB_remap_index },
+   { 10428, VertexAttrib4fARB_remap_index },
+   { 10832, VertexAttrib4fvARB_remap_index },
+   {  9331, VertexAttrib4ivARB_remap_index },
+   { 15901, VertexAttrib4sARB_remap_index },
+   { 28573, VertexAttrib4svARB_remap_index },
+   { 15270, VertexAttrib4ubvARB_remap_index },
+   { 27984, VertexAttrib4uivARB_remap_index },
+   { 18369, VertexAttrib4usvARB_remap_index },
+   { 20334, VertexAttribPointerARB_remap_index },
    { 30127, BindBufferARB_remap_index },
-   {  6036, BufferDataARB_remap_index },
-   {  1382, BufferSubDataARB_remap_index },
-   { 28134, DeleteBuffersARB_remap_index },
+   {  6075, BufferDataARB_remap_index },
+   {  1421, BufferSubDataARB_remap_index },
+   { 28173, DeleteBuffersARB_remap_index },
    { 30410, GenBuffersARB_remap_index },
-   { 16236, GetBufferParameterivARB_remap_index },
-   { 15410, GetBufferPointervARB_remap_index },
-   {  1335, GetBufferSubDataARB_remap_index },
-   { 27893, IsBufferARB_remap_index },
-   { 24303, MapBufferARB_remap_index },
-   { 28749, UnmapBufferARB_remap_index },
-   {   268, BeginQueryARB_remap_index },
-   { 18035, DeleteQueriesARB_remap_index },
-   { 11087, EndQueryARB_remap_index },
-   { 26770, GenQueriesARB_remap_index },
-   {  1772, GetQueryObjectivARB_remap_index },
-   { 15938, GetQueryObjectuivARB_remap_index },
-   {  1624, GetQueryivARB_remap_index },
-   { 18269, IsQueryARB_remap_index },
-   {  7421, AttachObjectARB_remap_index },
-   { 16899, CompileShaderARB_remap_index },
-   {  2879, CreateProgramObjectARB_remap_index },
-   {  5981, CreateShaderObjectARB_remap_index },
-   { 13274, DeleteObjectARB_remap_index },
-   { 22060, DetachObjectARB_remap_index },
-   { 10865, GetActiveUniformARB_remap_index },
-   {  8583, GetAttachedObjectsARB_remap_index },
-   {  8890, GetHandleARB_remap_index },
+   { 16243, GetBufferParameterivARB_remap_index },
+   { 15417, GetBufferPointervARB_remap_index },
+   {  1374, GetBufferSubDataARB_remap_index },
+   { 27932, IsBufferARB_remap_index },
+   { 24310, MapBufferARB_remap_index },
+   { 28788, UnmapBufferARB_remap_index },
+   {   307, BeginQueryARB_remap_index },
+   { 18042, DeleteQueriesARB_remap_index },
+   { 11126, EndQueryARB_remap_index },
+   { 26809, GenQueriesARB_remap_index },
+   {  1811, GetQueryObjectivARB_remap_index },
+   { 15945, GetQueryObjectuivARB_remap_index },
+   {  1663, GetQueryivARB_remap_index },
+   { 18276, IsQueryARB_remap_index },
+   {  7460, AttachObjectARB_remap_index },
+   { 16906, CompileShaderARB_remap_index },
+   {  2918, CreateProgramObjectARB_remap_index },
+   {  6020, CreateShaderObjectARB_remap_index },
+   { 13281, DeleteObjectARB_remap_index },
+   { 22067, DetachObjectARB_remap_index },
+   { 10904, GetActiveUniformARB_remap_index },
+   {  8622, GetAttachedObjectsARB_remap_index },
+   {  8929, GetHandleARB_remap_index },
    { 30160, GetInfoLogARB_remap_index },
    { 29416, GetObjectParameterfvARB_remap_index },
-   { 25164, GetObjectParameterivARB_remap_index },
-   { 26528, GetShaderSourceARB_remap_index },
-   { 25778, GetUniformLocationARB_remap_index },
-   { 21888, GetUniformfvARB_remap_index },
-   { 11530, GetUniformivARB_remap_index },
-   { 18407, LinkProgramARB_remap_index },
-   { 18465, ShaderSourceARB_remap_index },
-   {  6703, Uniform1fARB_remap_index },
-   { 27309, Uniform1fvARB_remap_index },
-   { 20296, Uniform1iARB_remap_index },
-   { 19262, Uniform1ivARB_remap_index },
-   {  2003, Uniform2fARB_remap_index },
-   { 13110, Uniform2fvARB_remap_index },
-   { 24190, Uniform2iARB_remap_index },
-   {  2123, Uniform2ivARB_remap_index },
-   { 17009, Uniform3fARB_remap_index },
-   {  8613, Uniform3fvARB_remap_index },
-   {  5627, Uniform3iARB_remap_index },
-   { 15516, Uniform3ivARB_remap_index },
-   { 17496, Uniform4fARB_remap_index },
-   { 21752, Uniform4fvARB_remap_index },
-   { 22918, Uniform4iARB_remap_index },
-   { 18775, Uniform4ivARB_remap_index },
-   {  7473, UniformMatrix2fvARB_remap_index },
+   { 25203, GetObjectParameterivARB_remap_index },
+   { 26567, GetShaderSourceARB_remap_index },
+   { 25817, GetUniformLocationARB_remap_index },
+   { 21895, GetUniformfvARB_remap_index },
+   { 11608, GetUniformivARB_remap_index },
+   { 18414, LinkProgramARB_remap_index },
+   { 18472, ShaderSourceARB_remap_index },
+   {  6742, Uniform1fARB_remap_index },
+   { 27348, Uniform1fvARB_remap_index },
+   { 20303, Uniform1iARB_remap_index },
+   { 19269, Uniform1ivARB_remap_index },
+   {  2042, Uniform2fARB_remap_index },
+   { 13117, Uniform2fvARB_remap_index },
+   { 24197, Uniform2iARB_remap_index },
+   {  2162, Uniform2ivARB_remap_index },
+   { 17016, Uniform3fARB_remap_index },
+   {  8652, Uniform3fvARB_remap_index },
+   {  5666, Uniform3iARB_remap_index },
+   { 15523, Uniform3ivARB_remap_index },
+   { 17503, Uniform4fARB_remap_index },
+   { 21759, Uniform4fvARB_remap_index },
+   { 22925, Uniform4iARB_remap_index },
+   { 18782, Uniform4ivARB_remap_index },
+   {  7512, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
-   {  2475, UniformMatrix4fvARB_remap_index },
-   { 23351, UseProgramObjectARB_remap_index },
-   { 13545, ValidateProgramARB_remap_index },
-   { 19616, BindAttribLocationARB_remap_index },
-   {  4346, GetActiveAttribARB_remap_index },
-   { 15197, GetAttribLocationARB_remap_index },
-   { 27048, DrawBuffersARB_remap_index },
-   { 12013, RenderbufferStorageMultisample_remap_index },
-   { 12417, FramebufferTextureARB_remap_index },
-   { 23721, FramebufferTextureFaceARB_remap_index },
-   { 22209, ProgramParameteriARB_remap_index },
-   { 17544, FlushMappedBufferRange_remap_index },
-   { 25581, MapBufferRange_remap_index },
-   { 15072, BindVertexArray_remap_index },
-   { 13404, GenVertexArrays_remap_index },
-   { 27823, CopyBufferSubData_remap_index },
-   { 28638, ClientWaitSync_remap_index },
-   {  2394, DeleteSync_remap_index },
-   {  6370, FenceSync_remap_index },
-   { 13916, GetInteger64v_remap_index },
-   { 20803, GetSynciv_remap_index },
-   { 26987, IsSync_remap_index },
-   {  8531, WaitSync_remap_index },
-   {  3363, DrawElementsBaseVertex_remap_index },
-   { 28066, DrawRangeElementsBaseVertex_remap_index },
-   { 24334, MultiDrawElementsBaseVertex_remap_index },
-   {  4480, BindTransformFeedback_remap_index },
-   {  2906, DeleteTransformFeedbacks_remap_index },
-   {  5660, DrawTransformFeedback_remap_index },
-   {  8750, GenTransformFeedbacks_remap_index },
-   { 25961, IsTransformFeedback_remap_index },
-   { 23914, PauseTransformFeedback_remap_index },
-   {  4824, ResumeTransformFeedback_remap_index },
-   {  4739, PolygonOffsetEXT_remap_index },
-   { 21388, GetPixelTexGenParameterfvSGIS_remap_index },
-   {  3895, GetPixelTexGenParameterivSGIS_remap_index },
-   { 21121, PixelTexGenParameterfSGIS_remap_index },
-   {   580, PixelTexGenParameterfvSGIS_remap_index },
-   { 11568, PixelTexGenParameteriSGIS_remap_index },
-   { 12591, PixelTexGenParameterivSGIS_remap_index },
-   { 15160, SampleMaskSGIS_remap_index },
-   { 18209, SamplePatternSGIS_remap_index },
-   { 24263, ColorPointerEXT_remap_index },
-   { 16123, EdgeFlagPointerEXT_remap_index },
-   {  5281, IndexPointerEXT_remap_index },
-   {  5361, NormalPointerEXT_remap_index },
-   { 14510, TexCoordPointerEXT_remap_index },
-   {  6159, VertexPointerEXT_remap_index },
-   {  3165, PointParameterfEXT_remap_index },
-   {  7010, PointParameterfvEXT_remap_index },
+   {  2514, UniformMatrix4fvARB_remap_index },
+   { 23358, UseProgramObjectARB_remap_index },
+   { 13552, ValidateProgramARB_remap_index },
+   { 19623, BindAttribLocationARB_remap_index },
+   {  4385, GetActiveAttribARB_remap_index },
+   { 15204, GetAttribLocationARB_remap_index },
+   { 27087, DrawBuffersARB_remap_index },
+   { 12091, RenderbufferStorageMultisample_remap_index },
+   { 12495, FramebufferTextureARB_remap_index },
+   { 23728, FramebufferTextureFaceARB_remap_index },
+   { 22216, ProgramParameteriARB_remap_index },
+   { 17551, FlushMappedBufferRange_remap_index },
+   { 25620, MapBufferRange_remap_index },
+   { 15079, BindVertexArray_remap_index },
+   { 13411, GenVertexArrays_remap_index },
+   { 27862, CopyBufferSubData_remap_index },
+   { 28677, ClientWaitSync_remap_index },
+   {  2433, DeleteSync_remap_index },
+   {  6409, FenceSync_remap_index },
+   { 13923, GetInteger64v_remap_index },
+   { 20810, GetSynciv_remap_index },
+   { 27026, IsSync_remap_index },
+   {  8570, WaitSync_remap_index },
+   {  3402, DrawElementsBaseVertex_remap_index },
+   { 28105, DrawRangeElementsBaseVertex_remap_index },
+   { 24341, MultiDrawElementsBaseVertex_remap_index },
+   {  4519, BindTransformFeedback_remap_index },
+   {  2945, DeleteTransformFeedbacks_remap_index },
+   {  5699, DrawTransformFeedback_remap_index },
+   {  8789, GenTransformFeedbacks_remap_index },
+   { 26000, IsTransformFeedback_remap_index },
+   { 23921, PauseTransformFeedback_remap_index },
+   {  4892, ResumeTransformFeedback_remap_index },
+   {  4807, PolygonOffsetEXT_remap_index },
+   { 21395, GetPixelTexGenParameterfvSGIS_remap_index },
+   {  3934, GetPixelTexGenParameterivSGIS_remap_index },
+   { 21128, PixelTexGenParameterfSGIS_remap_index },
+   {   619, PixelTexGenParameterfvSGIS_remap_index },
+   { 11646, PixelTexGenParameteriSGIS_remap_index },
+   { 12637, PixelTexGenParameterivSGIS_remap_index },
+   { 15167, SampleMaskSGIS_remap_index },
+   { 18216, SamplePatternSGIS_remap_index },
+   { 24270, ColorPointerEXT_remap_index },
+   { 16130, EdgeFlagPointerEXT_remap_index },
+   {  5320, IndexPointerEXT_remap_index },
+   {  5400, NormalPointerEXT_remap_index },
+   { 14517, TexCoordPointerEXT_remap_index },
+   {  6198, VertexPointerEXT_remap_index },
+   {  3204, PointParameterfEXT_remap_index },
+   {  7049, PointParameterfvEXT_remap_index },
    { 29514, LockArraysEXT_remap_index },
-   { 13609, UnlockArraysEXT_remap_index },
-   {  8017, CullParameterdvEXT_remap_index },
-   { 10660, CullParameterfvEXT_remap_index },
-   {  1151, SecondaryColor3bEXT_remap_index },
-   {  7169, SecondaryColor3bvEXT_remap_index },
-   {  9469, SecondaryColor3dEXT_remap_index },
-   { 23524, SecondaryColor3dvEXT_remap_index },
-   { 25827, SecondaryColor3fEXT_remap_index },
-   { 16689, SecondaryColor3fvEXT_remap_index },
-   {   426, SecondaryColor3iEXT_remap_index },
-   { 14898, SecondaryColor3ivEXT_remap_index },
-   {  9127, SecondaryColor3sEXT_remap_index },
-   { 28302, SecondaryColor3svEXT_remap_index },
-   { 25000, SecondaryColor3ubEXT_remap_index },
-   { 19507, SecondaryColor3ubvEXT_remap_index },
-   { 11763, SecondaryColor3uiEXT_remap_index },
-   { 21008, SecondaryColor3uivEXT_remap_index },
-   { 23771, SecondaryColor3usEXT_remap_index },
-   { 11836, SecondaryColor3usvEXT_remap_index },
-   { 10736, SecondaryColorPointerEXT_remap_index },
-   { 23585, MultiDrawArraysEXT_remap_index },
-   { 19197, MultiDrawElementsEXT_remap_index },
-   { 19392, FogCoordPointerEXT_remap_index },
-   {  4044, FogCoorddEXT_remap_index },
+   { 13616, UnlockArraysEXT_remap_index },
+   {  1190, SecondaryColor3bEXT_remap_index },
+   {  7208, SecondaryColor3bvEXT_remap_index },
+   {  9508, SecondaryColor3dEXT_remap_index },
+   { 23531, SecondaryColor3dvEXT_remap_index },
+   { 25866, SecondaryColor3fEXT_remap_index },
+   { 16696, SecondaryColor3fvEXT_remap_index },
+   {   465, SecondaryColor3iEXT_remap_index },
+   { 14905, SecondaryColor3ivEXT_remap_index },
+   {  9166, SecondaryColor3sEXT_remap_index },
+   { 28341, SecondaryColor3svEXT_remap_index },
+   { 25039, SecondaryColor3ubEXT_remap_index },
+   { 19514, SecondaryColor3ubvEXT_remap_index },
+   { 11841, SecondaryColor3uiEXT_remap_index },
+   { 21015, SecondaryColor3uivEXT_remap_index },
+   { 23778, SecondaryColor3usEXT_remap_index },
+   { 11914, SecondaryColor3usvEXT_remap_index },
+   { 10775, SecondaryColorPointerEXT_remap_index },
+   { 23592, MultiDrawArraysEXT_remap_index },
+   { 19204, MultiDrawElementsEXT_remap_index },
+   { 19399, FogCoordPointerEXT_remap_index },
+   {  4083, FogCoorddEXT_remap_index },
    { 28915, FogCoorddvEXT_remap_index },
-   {  4136, FogCoordfEXT_remap_index },
-   { 24923, FogCoordfvEXT_remap_index },
-   { 17448, PixelTexGenSGIX_remap_index },
-   { 25508, BlendFuncSeparateEXT_remap_index },
-   {  6071, FlushVertexArrayRangeNV_remap_index },
-   {  4688, VertexArrayRangeNV_remap_index },
-   { 25892, CombinerInputNV_remap_index },
-   {  1946, CombinerOutputNV_remap_index },
-   { 28455, CombinerParameterfNV_remap_index },
-   {  4608, CombinerParameterfvNV_remap_index },
-   { 20527, CombinerParameteriNV_remap_index },
+   {  4175, FogCoordfEXT_remap_index },
+   { 24962, FogCoordfvEXT_remap_index },
+   { 17455, PixelTexGenSGIX_remap_index },
+   { 25547, BlendFuncSeparateEXT_remap_index },
+   {  6110, FlushVertexArrayRangeNV_remap_index },
+   {  4756, VertexArrayRangeNV_remap_index },
+   { 25931, CombinerInputNV_remap_index },
+   {  1985, CombinerOutputNV_remap_index },
+   { 28494, CombinerParameterfNV_remap_index },
+   {  4676, CombinerParameterfvNV_remap_index },
+   { 20534, CombinerParameteriNV_remap_index },
    { 29885, CombinerParameterivNV_remap_index },
-   {  6447, FinalCombinerInputNV_remap_index },
-   {  8956, GetCombinerInputParameterfvNV_remap_index },
+   {  6486, FinalCombinerInputNV_remap_index },
+   {  8995, GetCombinerInputParameterfvNV_remap_index },
    { 29722, GetCombinerInputParameterivNV_remap_index },
-   { 12692, GetCombinerOutputParameterfvNV_remap_index },
-   { 12520, GetCombinerOutputParameterivNV_remap_index },
-   {  5816, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 22790, GetFinalCombinerInputParameterivNV_remap_index },
-   { 11508, ResizeBuffersMESA_remap_index },
-   { 10109, WindowPos2dMESA_remap_index },
-   {   944, WindowPos2dvMESA_remap_index },
+   {   172, GetCombinerOutputParameterfvNV_remap_index },
+   { 12598, GetCombinerOutputParameterivNV_remap_index },
+   {  5855, GetFinalCombinerInputParameterfvNV_remap_index },
+   { 22797, GetFinalCombinerInputParameterivNV_remap_index },
+   { 11586, ResizeBuffersMESA_remap_index },
+   { 10148, WindowPos2dMESA_remap_index },
+   {   983, WindowPos2dvMESA_remap_index },
    { 30713, WindowPos2fMESA_remap_index },
-   {  7114, WindowPos2fvMESA_remap_index },
-   { 16636, WindowPos2iMESA_remap_index },
-   { 18682, WindowPos2ivMESA_remap_index },
-   { 19296, WindowPos2sMESA_remap_index },
-   {  5031, WindowPos2svMESA_remap_index },
-   {  6939, WindowPos3dMESA_remap_index },
-   { 12838, WindowPos3dvMESA_remap_index },
-   {   472, WindowPos3fMESA_remap_index },
-   { 13670, WindowPos3fvMESA_remap_index },
-   { 22102, WindowPos3iMESA_remap_index },
-   { 27768, WindowPos3ivMESA_remap_index },
-   { 17154, WindowPos3sMESA_remap_index },
+   {  7153, WindowPos2fvMESA_remap_index },
+   { 16643, WindowPos2iMESA_remap_index },
+   { 18689, WindowPos2ivMESA_remap_index },
+   { 19303, WindowPos2sMESA_remap_index },
+   {  5070, WindowPos2svMESA_remap_index },
+   {  6978, WindowPos3dMESA_remap_index },
+   { 12845, WindowPos3dvMESA_remap_index },
+   {   511, WindowPos3fMESA_remap_index },
+   { 13677, WindowPos3fvMESA_remap_index },
+   { 22109, WindowPos3iMESA_remap_index },
+   { 27807, WindowPos3ivMESA_remap_index },
+   { 17161, WindowPos3sMESA_remap_index },
    { 29171, WindowPos3svMESA_remap_index },
-   { 10060, WindowPos4dMESA_remap_index },
-   { 15601, WindowPos4dvMESA_remap_index },
-   { 12797, WindowPos4fMESA_remap_index },
-   { 28209, WindowPos4fvMESA_remap_index },
-   { 27921, WindowPos4iMESA_remap_index },
-   { 11311, WindowPos4ivMESA_remap_index },
-   { 17327, WindowPos4sMESA_remap_index },
-   {  2857, WindowPos4svMESA_remap_index },
-   { 12559, MultiModeDrawArraysIBM_remap_index },
-   { 26641, MultiModeDrawElementsIBM_remap_index },
-   { 11115, DeleteFencesNV_remap_index },
-   { 25739, FinishFenceNV_remap_index },
-   {  3287, GenFencesNV_remap_index },
-   { 15581, GetFenceivNV_remap_index },
-   {  7406, IsFenceNV_remap_index },
-   { 12447, SetFenceNV_remap_index },
-   {  3744, TestFenceNV_remap_index },
+   { 10099, WindowPos4dMESA_remap_index },
+   { 15608, WindowPos4dvMESA_remap_index },
+   { 12804, WindowPos4fMESA_remap_index },
+   { 28248, WindowPos4fvMESA_remap_index },
+   { 27960, WindowPos4iMESA_remap_index },
+   { 11389, WindowPos4ivMESA_remap_index },
+   { 17334, WindowPos4sMESA_remap_index },
+   {  2896, WindowPos4svMESA_remap_index },
+   { 24705, MultiModeDrawArraysIBM_remap_index },
+   { 26680, MultiModeDrawElementsIBM_remap_index },
+   { 11154, DeleteFencesNV_remap_index },
+   { 25778, FinishFenceNV_remap_index },
+   {  3326, GenFencesNV_remap_index },
+   { 15588, GetFenceivNV_remap_index },
+   {  7445, IsFenceNV_remap_index },
+   { 12525, SetFenceNV_remap_index },
+   {  3783, TestFenceNV_remap_index },
    { 29142, AreProgramsResidentNV_remap_index },
-   { 28497, BindProgramNV_remap_index },
-   { 23854, DeleteProgramsNV_remap_index },
-   { 19725, ExecuteProgramNV_remap_index },
+   { 28536, BindProgramNV_remap_index },
+   { 23861, DeleteProgramsNV_remap_index },
+   { 19732, ExecuteProgramNV_remap_index },
    { 30606, GenProgramsNV_remap_index },
-   { 21467, GetProgramParameterdvNV_remap_index },
-   {  9531, GetProgramParameterfvNV_remap_index },
-   { 24237, GetProgramStringNV_remap_index },
-   { 22479, GetProgramivNV_remap_index },
-   { 21701, GetTrackMatrixivNV_remap_index },
-   { 24031, GetVertexAttribPointervNV_remap_index },
-   { 22723, GetVertexAttribdvNV_remap_index },
-   {  8426, GetVertexAttribfvNV_remap_index },
-   { 16817, GetVertexAttribivNV_remap_index },
-   { 17574, IsProgramNV_remap_index },
-   {  8509, LoadProgramNV_remap_index },
-   { 25604, ProgramParameters4dvNV_remap_index },
-   { 22409, ProgramParameters4fvNV_remap_index },
-   { 18986, RequestResidentProgramsNV_remap_index },
-   { 20505, TrackMatrixNV_remap_index },
+   { 21474, GetProgramParameterdvNV_remap_index },
+   {  9570, GetProgramParameterfvNV_remap_index },
+   { 24244, GetProgramStringNV_remap_index },
+   { 22486, GetProgramivNV_remap_index },
+   { 21708, GetTrackMatrixivNV_remap_index },
+   { 24038, GetVertexAttribPointervNV_remap_index },
+   { 22730, GetVertexAttribdvNV_remap_index },
+   {  8465, GetVertexAttribfvNV_remap_index },
+   { 16824, GetVertexAttribivNV_remap_index },
+   { 17581, IsProgramNV_remap_index },
+   {  8548, LoadProgramNV_remap_index },
+   { 25643, ProgramParameters4dvNV_remap_index },
+   { 22416, ProgramParameters4fvNV_remap_index },
+   { 18993, RequestResidentProgramsNV_remap_index },
+   { 20512, TrackMatrixNV_remap_index },
    { 29699, VertexAttrib1dNV_remap_index },
-   { 12358, VertexAttrib1dvNV_remap_index },
-   { 26173, VertexAttrib1fNV_remap_index },
-   {  2245, VertexAttrib1fvNV_remap_index },
-   { 28266, VertexAttrib1sNV_remap_index },
-   { 13743, VertexAttrib1svNV_remap_index },
-   {  4251, VertexAttrib2dNV_remap_index },
-   { 12273, VertexAttrib2dvNV_remap_index },
-   { 18441, VertexAttrib2fNV_remap_index },
-   { 11884, VertexAttrib2fvNV_remap_index },
-   {  5191, VertexAttrib2sNV_remap_index },
-   { 17208, VertexAttrib2svNV_remap_index },
-   { 10257, VertexAttrib3dNV_remap_index },
+   { 12436, VertexAttrib1dvNV_remap_index },
+   { 26212, VertexAttrib1fNV_remap_index },
+   {  2284, VertexAttrib1fvNV_remap_index },
+   { 28305, VertexAttrib1sNV_remap_index },
+   { 13750, VertexAttrib1svNV_remap_index },
+   {  4290, VertexAttrib2dNV_remap_index },
+   { 12351, VertexAttrib2dvNV_remap_index },
+   { 18448, VertexAttrib2fNV_remap_index },
+   { 11962, VertexAttrib2fvNV_remap_index },
+   {  5230, VertexAttrib2sNV_remap_index },
+   { 17215, VertexAttrib2svNV_remap_index },
+   { 10296, VertexAttrib3dNV_remap_index },
    { 29392, VertexAttrib3dvNV_remap_index },
-   {  9343, VertexAttrib3fNV_remap_index },
-   { 22750, VertexAttrib3fvNV_remap_index },
-   { 20382, VertexAttrib3sNV_remap_index },
-   { 21728, VertexAttrib3svNV_remap_index },
-   { 26615, VertexAttrib4dNV_remap_index },
+   {  9382, VertexAttrib3fNV_remap_index },
+   { 22757, VertexAttrib3fvNV_remap_index },
+   { 20389, VertexAttrib3sNV_remap_index },
+   { 21735, VertexAttrib3svNV_remap_index },
+   { 26654, VertexAttrib4dNV_remap_index },
    { 30643, VertexAttrib4dvNV_remap_index },
-   {  3945, VertexAttrib4fNV_remap_index },
-   {  8559, VertexAttrib4fvNV_remap_index },
-   { 24582, VertexAttrib4sNV_remap_index },
-   {  1293, VertexAttrib4svNV_remap_index },
-   {  4409, VertexAttrib4ubNV_remap_index },
-   {   734, VertexAttrib4ubvNV_remap_index },
-   { 19905, VertexAttribPointerNV_remap_index },
-   {  2097, VertexAttribs1dvNV_remap_index },
-   { 24119, VertexAttribs1fvNV_remap_index },
+   {  3984, VertexAttrib4fNV_remap_index },
+   {  8598, VertexAttrib4fvNV_remap_index },
+   { 24589, VertexAttrib4sNV_remap_index },
+   {  1332, VertexAttrib4svNV_remap_index },
+   {  4448, VertexAttrib4ubNV_remap_index },
+   {   773, VertexAttrib4ubvNV_remap_index },
+   { 19912, VertexAttribPointerNV_remap_index },
+   {  2136, VertexAttribs1dvNV_remap_index },
+   { 24126, VertexAttribs1fvNV_remap_index },
    { 30443, VertexAttribs1svNV_remap_index },
-   {  9368, VertexAttribs2dvNV_remap_index },
-   { 23312, VertexAttribs2fvNV_remap_index },
-   { 16149, VertexAttribs2svNV_remap_index },
-   {  4636, VertexAttribs3dvNV_remap_index },
-   {  1977, VertexAttribs3fvNV_remap_index },
-   { 27516, VertexAttribs3svNV_remap_index },
-   { 24672, VertexAttribs4dvNV_remap_index },
-   {  4662, VertexAttribs4fvNV_remap_index },
+   {  9407, VertexAttribs2dvNV_remap_index },
+   { 23319, VertexAttribs2fvNV_remap_index },
+   { 16156, VertexAttribs2svNV_remap_index },
+   {  4704, VertexAttribs3dvNV_remap_index },
+   {  2016, VertexAttribs3fvNV_remap_index },
+   { 27555, VertexAttribs3svNV_remap_index },
+   { 24679, VertexAttribs4dvNV_remap_index },
+   {  4730, VertexAttribs4fvNV_remap_index },
    { 30230, VertexAttribs4svNV_remap_index },
-   { 27264, VertexAttribs4ubvNV_remap_index },
-   { 24742, GetTexBumpParameterfvATI_remap_index },
+   { 27303, VertexAttribs4ubvNV_remap_index },
+   { 24781, GetTexBumpParameterfvATI_remap_index },
    { 30484, GetTexBumpParameterivATI_remap_index },
-   { 16871, TexBumpParameterfvATI_remap_index },
-   { 18857, TexBumpParameterivATI_remap_index },
-   { 14289, AlphaFragmentOp1ATI_remap_index },
-   {  9919, AlphaFragmentOp2ATI_remap_index },
-   { 22666, AlphaFragmentOp3ATI_remap_index },
-   { 27443, BeginFragmentShaderATI_remap_index },
-   { 28696, BindFragmentShaderATI_remap_index },
-   { 21857, ColorFragmentOp1ATI_remap_index },
-   {  3823, ColorFragmentOp2ATI_remap_index },
+   { 16878, TexBumpParameterfvATI_remap_index },
+   { 18864, TexBumpParameterivATI_remap_index },
+   { 14296, AlphaFragmentOp1ATI_remap_index },
+   {  9958, AlphaFragmentOp2ATI_remap_index },
+   { 22673, AlphaFragmentOp3ATI_remap_index },
+   { 27482, BeginFragmentShaderATI_remap_index },
+   { 28735, BindFragmentShaderATI_remap_index },
+   { 21864, ColorFragmentOp1ATI_remap_index },
+   {  3862, ColorFragmentOp2ATI_remap_index },
    { 29037, ColorFragmentOp3ATI_remap_index },
-   {  4781, DeleteFragmentShaderATI_remap_index },
+   {  4849, DeleteFragmentShaderATI_remap_index },
    { 30667, EndFragmentShaderATI_remap_index },
    { 29913, GenFragmentShadersATI_remap_index },
-   { 23443, PassTexCoordATI_remap_index },
-   {  6139, SampleMapATI_remap_index },
-   {  5912, SetFragmentShaderConstantATI_remap_index },
-   {   319, PointParameteriNV_remap_index },
-   { 12999, PointParameterivNV_remap_index },
-   { 26454, ActiveStencilFaceEXT_remap_index },
-   { 25264, BindVertexArrayAPPLE_remap_index },
-   {  2522, DeleteVertexArraysAPPLE_remap_index },
-   { 16488, GenVertexArraysAPPLE_remap_index },
-   { 21532, IsVertexArrayAPPLE_remap_index },
-   {   775, GetProgramNamedParameterdvNV_remap_index },
-   {  3128, GetProgramNamedParameterfvNV_remap_index },
-   { 24773, ProgramNamedParameter4dNV_remap_index },
-   { 13325, ProgramNamedParameter4dvNV_remap_index },
-   {  8042, ProgramNamedParameter4fNV_remap_index },
-   { 10701, ProgramNamedParameter4fvNV_remap_index },
-   { 22388, DepthBoundsEXT_remap_index },
-   {  1043, BlendEquationSeparateEXT_remap_index },
-   { 13444, BindFramebufferEXT_remap_index },
-   { 23630, BindRenderbufferEXT_remap_index },
-   {  8806, CheckFramebufferStatusEXT_remap_index },
-   { 20822, DeleteFramebuffersEXT_remap_index },
+   { 23450, PassTexCoordATI_remap_index },
+   {  6178, SampleMapATI_remap_index },
+   {  5951, SetFragmentShaderConstantATI_remap_index },
+   {   358, PointParameteriNV_remap_index },
+   { 13006, PointParameterivNV_remap_index },
+   { 26493, ActiveStencilFaceEXT_remap_index },
+   { 25303, BindVertexArrayAPPLE_remap_index },
+   {  2561, DeleteVertexArraysAPPLE_remap_index },
+   { 16495, GenVertexArraysAPPLE_remap_index },
+   { 21539, IsVertexArrayAPPLE_remap_index },
+   {   814, GetProgramNamedParameterdvNV_remap_index },
+   {  3167, GetProgramNamedParameterfvNV_remap_index },
+   { 24812, ProgramNamedParameter4dNV_remap_index },
+   { 13332, ProgramNamedParameter4dvNV_remap_index },
+   {  8081, ProgramNamedParameter4fNV_remap_index },
+   { 10740, ProgramNamedParameter4fvNV_remap_index },
+   { 22395, DepthBoundsEXT_remap_index },
+   {  1082, BlendEquationSeparateEXT_remap_index },
+   { 13451, BindFramebufferEXT_remap_index },
+   { 23637, BindRenderbufferEXT_remap_index },
+   {  8845, CheckFramebufferStatusEXT_remap_index },
+   { 20829, DeleteFramebuffersEXT_remap_index },
    { 29294, DeleteRenderbuffersEXT_remap_index },
-   { 12297, FramebufferRenderbufferEXT_remap_index },
-   { 12464, FramebufferTexture1DEXT_remap_index },
-   { 10495, FramebufferTexture2DEXT_remap_index },
-   { 10162, FramebufferTexture3DEXT_remap_index },
-   { 21424, GenFramebuffersEXT_remap_index },
-   { 16035, GenRenderbuffersEXT_remap_index },
-   {  5858, GenerateMipmapEXT_remap_index },
-   { 20002, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 12375, FramebufferRenderbufferEXT_remap_index },
+   { 12542, FramebufferTexture1DEXT_remap_index },
+   { 10534, FramebufferTexture2DEXT_remap_index },
+   { 10201, FramebufferTexture3DEXT_remap_index },
+   { 21431, GenFramebuffersEXT_remap_index },
+   { 16042, GenRenderbuffersEXT_remap_index },
+   {  5897, GenerateMipmapEXT_remap_index },
+   { 20009, GetFramebufferAttachmentParameterivEXT_remap_index },
    { 29819, GetRenderbufferParameterivEXT_remap_index },
-   { 18737, IsFramebufferEXT_remap_index },
+   { 18744, IsFramebufferEXT_remap_index },
    { 30566, IsRenderbufferEXT_remap_index },
-   {  7353, RenderbufferStorageEXT_remap_index },
-   {   651, BlitFramebufferEXT_remap_index },
-   { 13144, BufferParameteriAPPLE_remap_index },
-   { 17606, FlushMappedBufferRangeAPPLE_remap_index },
-   {  2701, FramebufferTextureLayerEXT_remap_index },
-   {  4956, ColorMaskIndexedEXT_remap_index },
-   { 17232, DisableIndexedEXT_remap_index },
-   { 24429, EnableIndexedEXT_remap_index },
-   { 19973, GetBooleanIndexedvEXT_remap_index },
-   {  9952, GetIntegerIndexedvEXT_remap_index },
-   { 20898, IsEnabledIndexedEXT_remap_index },
-   {  4074, BeginConditionalRenderNV_remap_index },
-   { 23416, EndConditionalRenderNV_remap_index },
-   {  8453, BeginTransformFeedbackEXT_remap_index },
-   { 17256, BindBufferBaseEXT_remap_index },
-   { 17126, BindBufferOffsetEXT_remap_index },
-   { 11136, BindBufferRangeEXT_remap_index },
-   { 13059, EndTransformFeedbackEXT_remap_index },
-   {  9804, GetTransformFeedbackVaryingEXT_remap_index },
-   { 19042, TransformFeedbackVaryingsEXT_remap_index },
-   { 27165, ProvokingVertexEXT_remap_index },
-   {  9752, GetTexParameterPointervAPPLE_remap_index },
-   {  4436, TextureRangeAPPLE_remap_index },
-   { 10567, GetObjectParameterivAPPLE_remap_index },
-   { 18181, ObjectPurgeableAPPLE_remap_index },
-   {  4985, ObjectUnpurgeableAPPLE_remap_index },
-   { 26480, StencilFuncSeparateATI_remap_index },
-   { 16555, ProgramEnvParameters4fvEXT_remap_index },
-   { 19936, ProgramLocalParameters4fvEXT_remap_index },
-   { 12927, GetQueryObjecti64vEXT_remap_index },
-   {  9394, GetQueryObjectui64vEXT_remap_index },
-   { 21926, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 11054, EGLImageTargetTexture2DOES_remap_index },
+   {  7392, RenderbufferStorageEXT_remap_index },
+   {   690, BlitFramebufferEXT_remap_index },
+   { 13151, BufferParameteriAPPLE_remap_index },
+   { 17613, FlushMappedBufferRangeAPPLE_remap_index },
+   {  2740, FramebufferTextureLayerEXT_remap_index },
+   {  4613, ColorMaskIndexedEXT_remap_index },
+   { 17239, DisableIndexedEXT_remap_index },
+   { 24436, EnableIndexedEXT_remap_index },
+   { 19980, GetBooleanIndexedvEXT_remap_index },
+   {  9991, GetIntegerIndexedvEXT_remap_index },
+   { 20905, IsEnabledIndexedEXT_remap_index },
+   {  4113, BeginConditionalRenderNV_remap_index },
+   { 23423, EndConditionalRenderNV_remap_index },
+   {  8492, BeginTransformFeedbackEXT_remap_index },
+   { 17263, BindBufferBaseEXT_remap_index },
+   { 17133, BindBufferOffsetEXT_remap_index },
+   { 11214, BindBufferRangeEXT_remap_index },
+   { 13066, EndTransformFeedbackEXT_remap_index },
+   {  9843, GetTransformFeedbackVaryingEXT_remap_index },
+   { 19049, TransformFeedbackVaryingsEXT_remap_index },
+   { 27204, ProvokingVertexEXT_remap_index },
+   {  9791, GetTexParameterPointervAPPLE_remap_index },
+   {  4475, TextureRangeAPPLE_remap_index },
+   { 10606, GetObjectParameterivAPPLE_remap_index },
+   { 18188, ObjectPurgeableAPPLE_remap_index },
+   {  5024, ObjectUnpurgeableAPPLE_remap_index },
+   { 26519, StencilFuncSeparateATI_remap_index },
+   { 16562, ProgramEnvParameters4fvEXT_remap_index },
+   { 19943, ProgramLocalParameters4fvEXT_remap_index },
+   { 12934, GetQueryObjecti64vEXT_remap_index },
+   {  9433, GetQueryObjectui64vEXT_remap_index },
+   { 21933, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 11093, EGLImageTargetTexture2DOES_remap_index },
    {    -1, -1 }
 };
 
 /* these functions are in the ABI, but have alternative names */
 static const struct gl_function_remap MESA_alt_functions[] = {
    /* from GL_EXT_blend_color */
-   {  2440, _gloffset_BlendColor },
+   {  2479, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 10219, _gloffset_BlendEquation },
+   { 10258, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 15623, _gloffset_ColorSubTable },
+   { 15630, _gloffset_ColorSubTable },
    { 29226, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
-   {   213, _gloffset_ConvolutionFilter1D },
-   {  2284, _gloffset_CopyConvolutionFilter1D },
-   {  3624, _gloffset_GetConvolutionParameteriv },
-   {  7702, _gloffset_ConvolutionFilter2D },
-   {  7868, _gloffset_ConvolutionParameteriv },
-   {  8328, _gloffset_ConvolutionParameterfv },
-   { 18885, _gloffset_GetSeparableFilter },
-   { 22156, _gloffset_SeparableFilter2D },
-   { 22968, _gloffset_ConvolutionParameteri },
-   { 23091, _gloffset_ConvolutionParameterf },
-   { 24608, _gloffset_GetConvolutionParameterfv },
-   { 25430, _gloffset_GetConvolutionFilter },
-   { 27705, _gloffset_CopyConvolutionFilter2D },
+   {   252, _gloffset_ConvolutionFilter1D },
+   {  2323, _gloffset_CopyConvolutionFilter1D },
+   {  3663, _gloffset_GetConvolutionParameteriv },
+   {  7741, _gloffset_ConvolutionFilter2D },
+   {  7907, _gloffset_ConvolutionParameteriv },
+   {  8367, _gloffset_ConvolutionParameterfv },
+   { 18892, _gloffset_GetSeparableFilter },
+   { 22163, _gloffset_SeparableFilter2D },
+   { 22975, _gloffset_ConvolutionParameteri },
+   { 23098, _gloffset_ConvolutionParameterf },
+   { 24615, _gloffset_GetConvolutionParameterfv },
+   { 25469, _gloffset_GetConvolutionFilter },
+   { 27744, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 13803, _gloffset_CopyTexSubImage3D },
-   { 15363, _gloffset_CopyTexImage2D },
-   { 22576, _gloffset_CopyTexImage1D },
-   { 25111, _gloffset_CopyTexSubImage2D },
-   { 27343, _gloffset_CopyTexSubImage1D },
+   { 13810, _gloffset_CopyTexSubImage3D },
+   { 15370, _gloffset_CopyTexImage2D },
+   { 22583, _gloffset_CopyTexImage1D },
+   { 25150, _gloffset_CopyTexSubImage2D },
+   { 27382, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
-   {  8665, _gloffset_DrawRangeElements },
+   {  8704, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
-   {   812, _gloffset_Histogram },
-   {  3088, _gloffset_ResetHistogram },
-   {  9065, _gloffset_GetMinmax },
-   { 14137, _gloffset_GetHistogramParameterfv },
-   { 22501, _gloffset_GetMinmaxParameteriv },
-   { 24498, _gloffset_ResetMinmax },
-   { 25327, _gloffset_GetHistogramParameteriv },
-   { 26414, _gloffset_GetHistogram },
-   { 28812, _gloffset_Minmax },
+   {   851, _gloffset_Histogram },
+   {  3127, _gloffset_ResetHistogram },
+   {  9104, _gloffset_GetMinmax },
+   { 14144, _gloffset_GetHistogramParameterfv },
+   { 22508, _gloffset_GetMinmaxParameteriv },
+   { 24505, _gloffset_ResetMinmax },
+   { 25366, _gloffset_GetHistogramParameteriv },
+   { 26453, _gloffset_GetHistogram },
+   { 28851, _gloffset_Minmax },
    { 30313, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
-   {  7564, _gloffset_ColorTable },
-   { 13983, _gloffset_GetColorTable },
-   { 21171, _gloffset_GetColorTableParameterfv },
-   { 23147, _gloffset_GetColorTableParameteriv },
+   {  7603, _gloffset_ColorTable },
+   { 13990, _gloffset_GetColorTable },
+   { 21178, _gloffset_GetColorTableParameterfv },
+   { 23154, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
-   {  6285, _gloffset_TexSubImage1D },
-   {  9679, _gloffset_TexSubImage2D },
+   {  6324, _gloffset_TexSubImage1D },
+   {  9718, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
-   {  1658, _gloffset_TexImage3D },
-   { 20940, _gloffset_TexSubImage3D },
+   {  1697, _gloffset_TexImage3D },
+   { 20947, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
-   {  2964, _gloffset_PrioritizeTextures },
-   {  6734, _gloffset_AreTexturesResident },
-   { 12382, _gloffset_GenTextures },
-   { 14469, _gloffset_DeleteTextures },
-   { 17887, _gloffset_IsTexture },
-   { 27408, _gloffset_BindTexture },
+   {  3003, _gloffset_PrioritizeTextures },
+   {  6773, _gloffset_AreTexturesResident },
+   { 12460, _gloffset_GenTextures },
+   { 14476, _gloffset_DeleteTextures },
+   { 17894, _gloffset_IsTexture },
+   { 27447, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 22328, _gloffset_ArrayElement },
-   { 28400, _gloffset_GetPointerv },
+   { 22335, _gloffset_ArrayElement },
+   { 28439, _gloffset_GetPointerv },
    { 29940, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
-   {  6852, _gloffset_ColorTableParameteriv },
-   {  7564, _gloffset_ColorTable },
-   { 13983, _gloffset_GetColorTable },
-   { 14093, _gloffset_CopyColorTable },
-   { 17748, _gloffset_ColorTableParameterfv },
-   { 21171, _gloffset_GetColorTableParameterfv },
-   { 23147, _gloffset_GetColorTableParameteriv },
+   {  6891, _gloffset_ColorTableParameteriv },
+   {  7603, _gloffset_ColorTable },
+   { 13990, _gloffset_GetColorTable },
+   { 14100, _gloffset_CopyColorTable },
+   { 17755, _gloffset_ColorTableParameterfv },
+   { 21178, _gloffset_GetColorTableParameterfv },
+   { 23154, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
-   {   381, _gloffset_MultiTexCoord3sARB },
-   {   613, _gloffset_ActiveTextureARB },
-   {  3761, _gloffset_MultiTexCoord1fvARB },
-   {  5386, _gloffset_MultiTexCoord3dARB },
-   {  5431, _gloffset_MultiTexCoord2iARB },
-   {  5555, _gloffset_MultiTexCoord2svARB },
-   {  7520, _gloffset_MultiTexCoord2fARB },
-   {  9424, _gloffset_MultiTexCoord3fvARB },
-   {  9981, _gloffset_MultiTexCoord4sARB },
-   { 10615, _gloffset_MultiTexCoord2dvARB },
-   { 10997, _gloffset_MultiTexCoord1svARB },
-   { 11369, _gloffset_MultiTexCoord3svARB },
-   { 11430, _gloffset_MultiTexCoord4iARB },
-   { 12153, _gloffset_MultiTexCoord3iARB },
-   { 12956, _gloffset_MultiTexCoord1dARB },
-   { 13173, _gloffset_MultiTexCoord3dvARB },
-   { 14337, _gloffset_MultiTexCoord3ivARB },
-   { 14382, _gloffset_MultiTexCoord2sARB },
-   { 15680, _gloffset_MultiTexCoord4ivARB },
-   { 17398, _gloffset_ClientActiveTextureARB },
-   { 19681, _gloffset_MultiTexCoord2dARB },
-   { 20122, _gloffset_MultiTexCoord4dvARB },
-   { 20433, _gloffset_MultiTexCoord4fvARB },
-   { 21312, _gloffset_MultiTexCoord3fARB },
-   { 23675, _gloffset_MultiTexCoord4dARB },
-   { 23941, _gloffset_MultiTexCoord1sARB },
-   { 24145, _gloffset_MultiTexCoord1dvARB },
-   { 24955, _gloffset_MultiTexCoord1ivARB },
-   { 25048, _gloffset_MultiTexCoord2ivARB },
-   { 25387, _gloffset_MultiTexCoord1iARB },
-   { 26689, _gloffset_MultiTexCoord4svARB },
-   { 27207, _gloffset_MultiTexCoord1fARB },
-   { 27470, _gloffset_MultiTexCoord4fARB },
+   {   420, _gloffset_MultiTexCoord3sARB },
+   {   652, _gloffset_ActiveTextureARB },
+   {  3800, _gloffset_MultiTexCoord1fvARB },
+   {  5425, _gloffset_MultiTexCoord3dARB },
+   {  5470, _gloffset_MultiTexCoord2iARB },
+   {  5594, _gloffset_MultiTexCoord2svARB },
+   {  7559, _gloffset_MultiTexCoord2fARB },
+   {  9463, _gloffset_MultiTexCoord3fvARB },
+   { 10020, _gloffset_MultiTexCoord4sARB },
+   { 10654, _gloffset_MultiTexCoord2dvARB },
+   { 11036, _gloffset_MultiTexCoord1svARB },
+   { 11447, _gloffset_MultiTexCoord3svARB },
+   { 11508, _gloffset_MultiTexCoord4iARB },
+   { 12231, _gloffset_MultiTexCoord3iARB },
+   { 12963, _gloffset_MultiTexCoord1dARB },
+   { 13180, _gloffset_MultiTexCoord3dvARB },
+   { 14344, _gloffset_MultiTexCoord3ivARB },
+   { 14389, _gloffset_MultiTexCoord2sARB },
+   { 15687, _gloffset_MultiTexCoord4ivARB },
+   { 17405, _gloffset_ClientActiveTextureARB },
+   { 19688, _gloffset_MultiTexCoord2dARB },
+   { 20129, _gloffset_MultiTexCoord4dvARB },
+   { 20440, _gloffset_MultiTexCoord4fvARB },
+   { 21319, _gloffset_MultiTexCoord3fARB },
+   { 23682, _gloffset_MultiTexCoord4dARB },
+   { 23948, _gloffset_MultiTexCoord1sARB },
+   { 24152, _gloffset_MultiTexCoord1dvARB },
+   { 24994, _gloffset_MultiTexCoord1ivARB },
+   { 25087, _gloffset_MultiTexCoord2ivARB },
+   { 25426, _gloffset_MultiTexCoord1iARB },
+   { 26728, _gloffset_MultiTexCoord4svARB },
+   { 27246, _gloffset_MultiTexCoord1fARB },
+   { 27509, _gloffset_MultiTexCoord4fARB },
    { 29774, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
@@ -5004,7 +5002,7 @@ static const struct gl_function_remap MESA_alt_functions[] = {
 
 #if defined(need_GL_3DFX_tbuffer)
 static const struct gl_function_remap GL_3DFX_tbuffer_functions[] = {
-   {  8386, -1 }, /* TbufferMask3DFX */
+   {  8425, -1 }, /* TbufferMask3DFX */
    {    -1, -1 }
 };
 #endif
@@ -5075,7 +5073,7 @@ static const struct gl_function_remap GL_ARB_framebuffer_object_functions[] = {
 #if defined(need_GL_ARB_geometry_shader4)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_ARB_geometry_shader4_functions[] = {
-   { 11333, -1 }, /* FramebufferTextureLayer */
+   { 11411, -1 }, /* FramebufferTextureLayer */
    {    -1, -1 }
 };
 #endif
@@ -5089,11 +5087,11 @@ static const struct gl_function_remap GL_ARB_map_buffer_range_functions[] = {
 
 #if defined(need_GL_ARB_matrix_palette)
 static const struct gl_function_remap GL_ARB_matrix_palette_functions[] = {
-   {  3339, -1 }, /* MatrixIndexusvARB */
-   { 11974, -1 }, /* MatrixIndexuivARB */
-   { 13295, -1 }, /* MatrixIndexPointerARB */
-   { 18136, -1 }, /* CurrentPaletteMatrixARB */
-   { 21056, -1 }, /* MatrixIndexubvARB */
+   {  3378, -1 }, /* MatrixIndexusvARB */
+   { 12052, -1 }, /* MatrixIndexuivARB */
+   { 13302, -1 }, /* MatrixIndexPointerARB */
+   { 18143, -1 }, /* CurrentPaletteMatrixARB */
+   { 21063, -1 }, /* MatrixIndexubvARB */
    {    -1, -1 }
 };
 #endif
@@ -5170,14 +5168,14 @@ static const struct gl_function_remap GL_ARB_vertex_array_object_functions[] = {
 
 #if defined(need_GL_ARB_vertex_blend)
 static const struct gl_function_remap GL_ARB_vertex_blend_functions[] = {
-   {  2226, -1 }, /* WeightubvARB */
-   {  5746, -1 }, /* WeightivARB */
-   { 10084, -1 }, /* WeightPointerARB */
-   { 12674, -1 }, /* WeightfvARB */
-   { 16175, -1 }, /* WeightbvARB */
-   { 19349, -1 }, /* WeightusvARB */
-   { 22082, -1 }, /* VertexBlendARB */
-   { 27291, -1 }, /* WeightsvARB */
+   {  2265, -1 }, /* WeightubvARB */
+   {  5785, -1 }, /* WeightivARB */
+   { 10123, -1 }, /* WeightPointerARB */
+   { 12720, -1 }, /* WeightfvARB */
+   { 16182, -1 }, /* WeightbvARB */
+   { 19356, -1 }, /* WeightusvARB */
+   { 22089, -1 }, /* VertexBlendARB */
+   { 27330, -1 }, /* WeightsvARB */
    { 29276, -1 }, /* WeightdvARB */
    { 29974, -1 }, /* WeightuivARB */
    {    -1, -1 }
@@ -5249,7 +5247,7 @@ static const struct gl_function_remap GL_ATI_separate_stencil_functions[] = {
 
 #if defined(need_GL_EXT_blend_color)
 static const struct gl_function_remap GL_EXT_blend_color_functions[] = {
-   {  2440, _gloffset_BlendColor },
+   {  2479, _gloffset_BlendColor },
    {    -1, -1 }
 };
 #endif
@@ -5270,14 +5268,14 @@ static const struct gl_function_remap GL_EXT_blend_func_separate_functions[] = {
 
 #if defined(need_GL_EXT_blend_minmax)
 static const struct gl_function_remap GL_EXT_blend_minmax_functions[] = {
-   { 10219, _gloffset_BlendEquation },
+   { 10258, _gloffset_BlendEquation },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_color_subtable)
 static const struct gl_function_remap GL_EXT_color_subtable_functions[] = {
-   { 15623, _gloffset_ColorSubTable },
+   { 15630, _gloffset_ColorSubTable },
    { 29226, _gloffset_CopyColorSubTable },
    {    -1, -1 }
 };
@@ -5292,42 +5290,42 @@ static const struct gl_function_remap GL_EXT_compiled_vertex_array_functions[] =
 
 #if defined(need_GL_EXT_convolution)
 static const struct gl_function_remap GL_EXT_convolution_functions[] = {
-   {   213, _gloffset_ConvolutionFilter1D },
-   {  2284, _gloffset_CopyConvolutionFilter1D },
-   {  3624, _gloffset_GetConvolutionParameteriv },
-   {  7702, _gloffset_ConvolutionFilter2D },
-   {  7868, _gloffset_ConvolutionParameteriv },
-   {  8328, _gloffset_ConvolutionParameterfv },
-   { 18885, _gloffset_GetSeparableFilter },
-   { 22156, _gloffset_SeparableFilter2D },
-   { 22968, _gloffset_ConvolutionParameteri },
-   { 23091, _gloffset_ConvolutionParameterf },
-   { 24608, _gloffset_GetConvolutionParameterfv },
-   { 25430, _gloffset_GetConvolutionFilter },
-   { 27705, _gloffset_CopyConvolutionFilter2D },
+   {   252, _gloffset_ConvolutionFilter1D },
+   {  2323, _gloffset_CopyConvolutionFilter1D },
+   {  3663, _gloffset_GetConvolutionParameteriv },
+   {  7741, _gloffset_ConvolutionFilter2D },
+   {  7907, _gloffset_ConvolutionParameteriv },
+   {  8367, _gloffset_ConvolutionParameterfv },
+   { 18892, _gloffset_GetSeparableFilter },
+   { 22163, _gloffset_SeparableFilter2D },
+   { 22975, _gloffset_ConvolutionParameteri },
+   { 23098, _gloffset_ConvolutionParameterf },
+   { 24615, _gloffset_GetConvolutionParameterfv },
+   { 25469, _gloffset_GetConvolutionFilter },
+   { 27744, _gloffset_CopyConvolutionFilter2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_coordinate_frame)
 static const struct gl_function_remap GL_EXT_coordinate_frame_functions[] = {
-   {  9563, -1 }, /* TangentPointerEXT */
-   { 11488, -1 }, /* Binormal3ivEXT */
-   { 12106, -1 }, /* Tangent3sEXT */
-   { 13360, -1 }, /* Tangent3fvEXT */
-   { 17107, -1 }, /* Tangent3dvEXT */
-   { 17834, -1 }, /* Binormal3bvEXT */
-   { 18938, -1 }, /* Binormal3dEXT */
-   { 20988, -1 }, /* Tangent3fEXT */
-   { 23040, -1 }, /* Binormal3sEXT */
-   { 23485, -1 }, /* Tangent3ivEXT */
-   { 23504, -1 }, /* Tangent3dEXT */
-   { 24372, -1 }, /* Binormal3svEXT */
-   { 24853, -1 }, /* Binormal3fEXT */
-   { 25705, -1 }, /* Binormal3dvEXT */
-   { 26911, -1 }, /* Tangent3iEXT */
-   { 27990, -1 }, /* Tangent3bvEXT */
-   { 28435, -1 }, /* Tangent3bEXT */
+   {  9602, -1 }, /* TangentPointerEXT */
+   { 11566, -1 }, /* Binormal3ivEXT */
+   { 12184, -1 }, /* Tangent3sEXT */
+   { 13367, -1 }, /* Tangent3fvEXT */
+   { 17114, -1 }, /* Tangent3dvEXT */
+   { 17841, -1 }, /* Binormal3bvEXT */
+   { 18945, -1 }, /* Binormal3dEXT */
+   { 20995, -1 }, /* Tangent3fEXT */
+   { 23047, -1 }, /* Binormal3sEXT */
+   { 23492, -1 }, /* Tangent3ivEXT */
+   { 23511, -1 }, /* Tangent3dEXT */
+   { 24379, -1 }, /* Binormal3svEXT */
+   { 24892, -1 }, /* Binormal3fEXT */
+   { 25744, -1 }, /* Binormal3dvEXT */
+   { 26950, -1 }, /* Tangent3iEXT */
+   { 28029, -1 }, /* Tangent3bvEXT */
+   { 28474, -1 }, /* Tangent3bEXT */
    { 28999, -1 }, /* Binormal3fvEXT */
    { 29673, -1 }, /* BinormalPointerEXT */
    { 30078, -1 }, /* Tangent3svEXT */
@@ -5339,18 +5337,19 @@ static const struct gl_function_remap GL_EXT_coordinate_frame_functions[] = {
 
 #if defined(need_GL_EXT_copy_texture)
 static const struct gl_function_remap GL_EXT_copy_texture_functions[] = {
-   { 13803, _gloffset_CopyTexSubImage3D },
-   { 15363, _gloffset_CopyTexImage2D },
-   { 22576, _gloffset_CopyTexImage1D },
-   { 25111, _gloffset_CopyTexSubImage2D },
-   { 27343, _gloffset_CopyTexSubImage1D },
+   { 13810, _gloffset_CopyTexSubImage3D },
+   { 15370, _gloffset_CopyTexImage2D },
+   { 22583, _gloffset_CopyTexImage1D },
+   { 25150, _gloffset_CopyTexSubImage2D },
+   { 27382, _gloffset_CopyTexSubImage1D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_cull_vertex)
-/* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_EXT_cull_vertex_functions[] = {
+   {  8056, -1 }, /* CullParameterdvEXT */
+   { 10699, -1 }, /* CullParameterfvEXT */
    {    -1, -1 }
 };
 #endif
@@ -5378,7 +5377,7 @@ static const struct gl_function_remap GL_EXT_draw_instanced_functions[] = {
 
 #if defined(need_GL_EXT_draw_range_elements)
 static const struct gl_function_remap GL_EXT_draw_range_elements_functions[] = {
-   {  8665, _gloffset_DrawRangeElements },
+   {  8704, _gloffset_DrawRangeElements },
    {    -1, -1 }
 };
 #endif
@@ -5420,15 +5419,15 @@ static const struct gl_function_remap GL_EXT_gpu_program_parameters_functions[]
 
 #if defined(need_GL_EXT_histogram)
 static const struct gl_function_remap GL_EXT_histogram_functions[] = {
-   {   812, _gloffset_Histogram },
-   {  3088, _gloffset_ResetHistogram },
-   {  9065, _gloffset_GetMinmax },
-   { 14137, _gloffset_GetHistogramParameterfv },
-   { 22501, _gloffset_GetMinmaxParameteriv },
-   { 24498, _gloffset_ResetMinmax },
-   { 25327, _gloffset_GetHistogramParameteriv },
-   { 26414, _gloffset_GetHistogram },
-   { 28812, _gloffset_Minmax },
+   {   851, _gloffset_Histogram },
+   {  3127, _gloffset_ResetHistogram },
+   {  9104, _gloffset_GetMinmax },
+   { 14144, _gloffset_GetHistogramParameterfv },
+   { 22508, _gloffset_GetMinmaxParameteriv },
+   { 24505, _gloffset_ResetMinmax },
+   { 25366, _gloffset_GetHistogramParameteriv },
+   { 26453, _gloffset_GetHistogram },
+   { 28851, _gloffset_Minmax },
    { 30313, _gloffset_GetMinmaxParameterfv },
    {    -1, -1 }
 };
@@ -5436,23 +5435,23 @@ static const struct gl_function_remap GL_EXT_histogram_functions[] = {
 
 #if defined(need_GL_EXT_index_func)
 static const struct gl_function_remap GL_EXT_index_func_functions[] = {
-   { 10446, -1 }, /* IndexFuncEXT */
+   { 10485, -1 }, /* IndexFuncEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_material)
 static const struct gl_function_remap GL_EXT_index_material_functions[] = {
-   { 19436, -1 }, /* IndexMaterialEXT */
+   { 19443, -1 }, /* IndexMaterialEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_light_texture)
 static const struct gl_function_remap GL_EXT_light_texture_functions[] = {
-   { 24392, -1 }, /* ApplyTextureEXT */
-   { 24452, -1 }, /* TextureMaterialEXT */
-   { 24477, -1 }, /* TextureLightEXT */
+   { 24399, -1 }, /* ApplyTextureEXT */
+   { 24459, -1 }, /* TextureMaterialEXT */
+   { 24484, -1 }, /* TextureLightEXT */
    {    -1, -1 }
 };
 #endif
@@ -5473,19 +5472,19 @@ static const struct gl_function_remap GL_EXT_multisample_functions[] = {
 
 #if defined(need_GL_EXT_paletted_texture)
 static const struct gl_function_remap GL_EXT_paletted_texture_functions[] = {
-   {  7564, _gloffset_ColorTable },
-   { 13983, _gloffset_GetColorTable },
-   { 21171, _gloffset_GetColorTableParameterfv },
-   { 23147, _gloffset_GetColorTableParameteriv },
+   {  7603, _gloffset_ColorTable },
+   { 13990, _gloffset_GetColorTable },
+   { 21178, _gloffset_GetColorTableParameterfv },
+   { 23154, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_pixel_transform)
 static const struct gl_function_remap GL_EXT_pixel_transform_functions[] = {
-   { 20087, -1 }, /* PixelTransformParameterfEXT */
-   { 20167, -1 }, /* PixelTransformParameteriEXT */
-   { 28173, -1 }, /* PixelTransformParameterfvEXT */
+   { 20094, -1 }, /* PixelTransformParameterfEXT */
+   { 20174, -1 }, /* PixelTransformParameteriEXT */
+   { 28212, -1 }, /* PixelTransformParameterfvEXT */
    { 29637, -1 }, /* PixelTransformParameterivEXT */
    {    -1, -1 }
 };
@@ -5528,16 +5527,16 @@ static const struct gl_function_remap GL_EXT_stencil_two_side_functions[] = {
 
 #if defined(need_GL_EXT_subtexture)
 static const struct gl_function_remap GL_EXT_subtexture_functions[] = {
-   {  6285, _gloffset_TexSubImage1D },
-   {  9679, _gloffset_TexSubImage2D },
+   {  6324, _gloffset_TexSubImage1D },
+   {  9718, _gloffset_TexSubImage2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_texture3D)
 static const struct gl_function_remap GL_EXT_texture3D_functions[] = {
-   {  1658, _gloffset_TexImage3D },
-   { 20940, _gloffset_TexSubImage3D },
+   {  1697, _gloffset_TexImage3D },
+   { 20947, _gloffset_TexSubImage3D },
    {    -1, -1 }
 };
 #endif
@@ -5551,19 +5550,19 @@ static const struct gl_function_remap GL_EXT_texture_array_functions[] = {
 
 #if defined(need_GL_EXT_texture_object)
 static const struct gl_function_remap GL_EXT_texture_object_functions[] = {
-   {  2964, _gloffset_PrioritizeTextures },
-   {  6734, _gloffset_AreTexturesResident },
-   { 12382, _gloffset_GenTextures },
-   { 14469, _gloffset_DeleteTextures },
-   { 17887, _gloffset_IsTexture },
-   { 27408, _gloffset_BindTexture },
+   {  3003, _gloffset_PrioritizeTextures },
+   {  6773, _gloffset_AreTexturesResident },
+   { 12460, _gloffset_GenTextures },
+   { 14476, _gloffset_DeleteTextures },
+   { 17894, _gloffset_IsTexture },
+   { 27447, _gloffset_BindTexture },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_texture_perturb_normal)
 static const struct gl_function_remap GL_EXT_texture_perturb_normal_functions[] = {
-   { 12624, -1 }, /* TextureNormalEXT */
+   { 12670, -1 }, /* TextureNormalEXT */
    {    -1, -1 }
 };
 #endif
@@ -5585,8 +5584,8 @@ static const struct gl_function_remap GL_EXT_transform_feedback_functions[] = {
 #if defined(need_GL_EXT_vertex_array)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_EXT_vertex_array_functions[] = {
-   { 22328, _gloffset_ArrayElement },
-   { 28400, _gloffset_GetPointerv },
+   { 22335, _gloffset_ArrayElement },
+   { 28439, _gloffset_GetPointerv },
    { 29940, _gloffset_DrawArrays },
    {    -1, -1 }
 };
@@ -5594,21 +5593,21 @@ static const struct gl_function_remap GL_EXT_vertex_array_functions[] = {
 
 #if defined(need_GL_EXT_vertex_weighting)
 static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
-   { 17917, -1 }, /* VertexWeightfvEXT */
-   { 24831, -1 }, /* VertexWeightfEXT */
-   { 26383, -1 }, /* VertexWeightPointerEXT */
+   { 17924, -1 }, /* VertexWeightfvEXT */
+   { 24870, -1 }, /* VertexWeightfEXT */
+   { 26422, -1 }, /* VertexWeightPointerEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_HP_image_transform)
 static const struct gl_function_remap GL_HP_image_transform_functions[] = {
-   {  2157, -1 }, /* GetImageTransformParameterfvHP */
-   {  3305, -1 }, /* ImageTransformParameterfHP */
-   {  9257, -1 }, /* ImageTransformParameterfvHP */
-   { 10915, -1 }, /* ImageTransformParameteriHP */
-   { 11223, -1 }, /* GetImageTransformParameterivHP */
-   { 17981, -1 }, /* ImageTransformParameterivHP */
+   {  2196, -1 }, /* GetImageTransformParameterfvHP */
+   {  3344, -1 }, /* ImageTransformParameterfHP */
+   {  9296, -1 }, /* ImageTransformParameterfvHP */
+   { 10954, -1 }, /* ImageTransformParameteriHP */
+   { 11301, -1 }, /* GetImageTransformParameterivHP */
+   { 17988, -1 }, /* ImageTransformParameterivHP */
    {    -1, -1 }
 };
 #endif
@@ -5622,13 +5621,13 @@ static const struct gl_function_remap GL_IBM_multimode_draw_arrays_functions[] =
 
 #if defined(need_GL_IBM_vertex_array_lists)
 static const struct gl_function_remap GL_IBM_vertex_array_lists_functions[] = {
-   {  3857, -1 }, /* SecondaryColorPointerListIBM */
-   {  5252, -1 }, /* NormalPointerListIBM */
-   {  6908, -1 }, /* FogCoordPointerListIBM */
-   {  7215, -1 }, /* VertexPointerListIBM */
-   { 10836, -1 }, /* ColorPointerListIBM */
-   { 12213, -1 }, /* TexCoordPointerListIBM */
-   { 12646, -1 }, /* IndexPointerListIBM */
+   {  3896, -1 }, /* SecondaryColorPointerListIBM */
+   {  5291, -1 }, /* NormalPointerListIBM */
+   {  6947, -1 }, /* FogCoordPointerListIBM */
+   {  7254, -1 }, /* VertexPointerListIBM */
+   { 10875, -1 }, /* ColorPointerListIBM */
+   { 12291, -1 }, /* TexCoordPointerListIBM */
+   { 12692, -1 }, /* IndexPointerListIBM */
    { 30256, -1 }, /* EdgeFlagPointerListIBM */
    {    -1, -1 }
 };
@@ -5643,10 +5642,10 @@ static const struct gl_function_remap GL_INGR_blend_func_separate_functions[] =
 
 #if defined(need_GL_INTEL_parallel_arrays)
 static const struct gl_function_remap GL_INTEL_parallel_arrays_functions[] = {
-   { 11600, -1 }, /* VertexPointervINTEL */
-   { 14230, -1 }, /* ColorPointervINTEL */
-   { 27679, -1 }, /* NormalPointervINTEL */
-   { 28105, -1 }, /* TexCoordPointervINTEL */
+   { 11678, -1 }, /* VertexPointervINTEL */
+   { 14237, -1 }, /* ColorPointervINTEL */
+   { 27718, -1 }, /* NormalPointervINTEL */
+   { 28144, -1 }, /* TexCoordPointervINTEL */
    {    -1, -1 }
 };
 #endif
@@ -5660,10 +5659,10 @@ static const struct gl_function_remap GL_MESA_resize_buffers_functions[] = {
 
 #if defined(need_GL_MESA_shader_debug)
 static const struct gl_function_remap GL_MESA_shader_debug_functions[] = {
-   {  1522, -1 }, /* GetDebugLogLengthMESA */
-   {  3063, -1 }, /* ClearDebugLogMESA */
-   {  4018, -1 }, /* GetDebugLogMESA */
-   { 28593, -1 }, /* CreateDebugObjectMESA */
+   {  1561, -1 }, /* GetDebugLogLengthMESA */
+   {  3102, -1 }, /* ClearDebugLogMESA */
+   {  4057, -1 }, /* GetDebugLogMESA */
+   { 28632, -1 }, /* CreateDebugObjectMESA */
    {    -1, -1 }
 };
 #endif
@@ -5684,15 +5683,15 @@ static const struct gl_function_remap GL_NV_condtitional_render_functions[] = {
 
 #if defined(need_GL_NV_evaluators)
 static const struct gl_function_remap GL_NV_evaluators_functions[] = {
-   {  5947, -1 }, /* GetMapAttribParameterivNV */
-   {  7670, -1 }, /* MapControlPointsNV */
-   {  7769, -1 }, /* MapParameterfvNV */
-   {  9662, -1 }, /* EvalMapsNV */
-   { 15845, -1 }, /* GetMapAttribParameterfvNV */
-   { 16011, -1 }, /* MapParameterivNV */
-   { 22891, -1 }, /* GetMapParameterivNV */
-   { 23389, -1 }, /* GetMapParameterfvNV */
-   { 27015, -1 }, /* GetMapControlPointsNV */
+   {  5986, -1 }, /* GetMapAttribParameterivNV */
+   {  7709, -1 }, /* MapControlPointsNV */
+   {  7808, -1 }, /* MapParameterfvNV */
+   {  9701, -1 }, /* EvalMapsNV */
+   { 15852, -1 }, /* GetMapAttribParameterfvNV */
+   { 16018, -1 }, /* MapParameterivNV */
+   { 22898, -1 }, /* GetMapParameterivNV */
+   { 23396, -1 }, /* GetMapParameterfvNV */
+   { 27054, -1 }, /* GetMapControlPointsNV */
    {    -1, -1 }
 };
 #endif
@@ -5727,8 +5726,8 @@ static const struct gl_function_remap GL_NV_register_combiners_functions[] = {
 
 #if defined(need_GL_NV_register_combiners2)
 static const struct gl_function_remap GL_NV_register_combiners2_functions[] = {
-   { 14700, -1 }, /* CombinerStageParameterfvNV */
-   { 15015, -1 }, /* GetCombinerStageParameterfvNV */
+   { 14707, -1 }, /* CombinerStageParameterfvNV */
+   { 15022, -1 }, /* GetCombinerStageParameterfvNV */
    {    -1, -1 }
 };
 #endif
@@ -5756,23 +5755,23 @@ static const struct gl_function_remap GL_OES_EGL_image_functions[] = {
 
 #if defined(need_GL_PGI_misc_hints)
 static const struct gl_function_remap GL_PGI_misc_hints_functions[] = {
-   {  7854, -1 }, /* HintPGI */
+   {  7893, -1 }, /* HintPGI */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_detail_texture)
 static const struct gl_function_remap GL_SGIS_detail_texture_functions[] = {
-   { 14988, -1 }, /* GetDetailTexFuncSGIS */
-   { 15308, -1 }, /* DetailTexFuncSGIS */
+   { 14995, -1 }, /* GetDetailTexFuncSGIS */
+   { 15315, -1 }, /* DetailTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_fog_function)
 static const struct gl_function_remap GL_SGIS_fog_function_functions[] = {
-   { 25093, -1 }, /* FogFuncSGIS */
-   { 25758, -1 }, /* GetFogFuncSGIS */
+   { 25132, -1 }, /* FogFuncSGIS */
+   { 25797, -1 }, /* GetFogFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5800,42 +5799,42 @@ static const struct gl_function_remap GL_SGIS_point_parameters_functions[] = {
 
 #if defined(need_GL_SGIS_sharpen_texture)
 static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
-   {  6008, -1 }, /* GetSharpenTexFuncSGIS */
-   { 20407, -1 }, /* SharpenTexFuncSGIS */
+   {  6047, -1 }, /* GetSharpenTexFuncSGIS */
+   { 20414, -1 }, /* SharpenTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture4D)
 static const struct gl_function_remap GL_SGIS_texture4D_functions[] = {
-   {   894, -1 }, /* TexImage4DSGIS */
-   { 14538, -1 }, /* TexSubImage4DSGIS */
+   {   933, -1 }, /* TexImage4DSGIS */
+   { 14545, -1 }, /* TexSubImage4DSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_color_mask)
 static const struct gl_function_remap GL_SGIS_texture_color_mask_functions[] = {
-   { 13936, -1 }, /* TextureColorMaskSGIS */
+   { 13943, -1 }, /* TextureColorMaskSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_filter4)
 static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {
-   {  6185, -1 }, /* GetTexFilterFuncSGIS */
-   { 15134, -1 }, /* TexFilterFuncSGIS */
+   {  6224, -1 }, /* GetTexFilterFuncSGIS */
+   { 15141, -1 }, /* TexFilterFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_async)
 static const struct gl_function_remap GL_SGIX_async_functions[] = {
-   {  3014, -1 }, /* AsyncMarkerSGIX */
-   {  3997, -1 }, /* FinishAsyncSGIX */
-   {  4762, -1 }, /* PollAsyncSGIX */
-   { 20554, -1 }, /* DeleteAsyncMarkersSGIX */
-   { 20609, -1 }, /* IsAsyncMarkerSGIX */
+   {  3053, -1 }, /* AsyncMarkerSGIX */
+   {  4036, -1 }, /* FinishAsyncSGIX */
+   {  4830, -1 }, /* PollAsyncSGIX */
+   { 20561, -1 }, /* DeleteAsyncMarkersSGIX */
+   { 20616, -1 }, /* IsAsyncMarkerSGIX */
    { 30053, -1 }, /* GenAsyncMarkersSGIX */
    {    -1, -1 }
 };
@@ -5843,29 +5842,29 @@ static const struct gl_function_remap GL_SGIX_async_functions[] = {
 
 #if defined(need_GL_SGIX_flush_raster)
 static const struct gl_function_remap GL_SGIX_flush_raster_functions[] = {
-   {  6562, -1 }, /* FlushRasterSGIX */
+   {  6601, -1 }, /* FlushRasterSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_fragment_lighting)
 static const struct gl_function_remap GL_SGIX_fragment_lighting_functions[] = {
-   {  2410, -1 }, /* FragmentMaterialfvSGIX */
-   {  4713, -1 }, /* FragmentLightiSGIX */
-   {  5688, -1 }, /* GetFragmentMaterialfvSGIX */
-   {  7282, -1 }, /* FragmentMaterialfSGIX */
-   {  7443, -1 }, /* GetFragmentLightivSGIX */
-   {  8280, -1 }, /* FragmentLightModeliSGIX */
-   {  9725, -1 }, /* FragmentLightivSGIX */
-   { 10027, -1 }, /* GetFragmentMaterialivSGIX */
-   { 17804, -1 }, /* FragmentLightModelfSGIX */
-   { 18104, -1 }, /* FragmentColorMaterialSGIX */
-   { 18504, -1 }, /* FragmentMaterialiSGIX */
-   { 19764, -1 }, /* LightEnviSGIX */
-   { 21263, -1 }, /* FragmentLightModelfvSGIX */
-   { 21572, -1 }, /* FragmentLightfvSGIX */
-   { 26142, -1 }, /* FragmentLightModelivSGIX */
-   { 26265, -1 }, /* FragmentLightfSGIX */
+   {  2449, -1 }, /* FragmentMaterialfvSGIX */
+   {  4781, -1 }, /* FragmentLightiSGIX */
+   {  5727, -1 }, /* GetFragmentMaterialfvSGIX */
+   {  7321, -1 }, /* FragmentMaterialfSGIX */
+   {  7482, -1 }, /* GetFragmentLightivSGIX */
+   {  8319, -1 }, /* FragmentLightModeliSGIX */
+   {  9764, -1 }, /* FragmentLightivSGIX */
+   { 10066, -1 }, /* GetFragmentMaterialivSGIX */
+   { 17811, -1 }, /* FragmentLightModelfSGIX */
+   { 18111, -1 }, /* FragmentColorMaterialSGIX */
+   { 18511, -1 }, /* FragmentMaterialiSGIX */
+   { 19771, -1 }, /* LightEnviSGIX */
+   { 21270, -1 }, /* FragmentLightModelfvSGIX */
+   { 21579, -1 }, /* FragmentLightfvSGIX */
+   { 26181, -1 }, /* FragmentLightModelivSGIX */
+   { 26304, -1 }, /* FragmentLightfSGIX */
    { 28969, -1 }, /* GetFragmentLightfvSGIX */
    { 30536, -1 }, /* FragmentMaterialivSGIX */
    {    -1, -1 }
@@ -5874,37 +5873,37 @@ static const struct gl_function_remap GL_SGIX_fragment_lighting_functions[] = {
 
 #if defined(need_GL_SGIX_framezoom)
 static const struct gl_function_remap GL_SGIX_framezoom_functions[] = {
-   { 20632, -1 }, /* FrameZoomSGIX */
+   { 20639, -1 }, /* FrameZoomSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_igloo_interface)
 static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
-   { 26573, -1 }, /* IglooInterfaceSGIX */
+   { 26612, -1 }, /* IglooInterfaceSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_instruments)
 static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
-   {  2573, -1 }, /* ReadInstrumentsSGIX */
-   {  5764, -1 }, /* PollInstrumentsSGIX */
-   {  9623, -1 }, /* GetInstrumentsSGIX */
-   { 11811, -1 }, /* StartInstrumentsSGIX */
-   { 14734, -1 }, /* StopInstrumentsSGIX */
-   { 16388, -1 }, /* InstrumentsBufferSGIX */
+   {  2612, -1 }, /* ReadInstrumentsSGIX */
+   {  5803, -1 }, /* PollInstrumentsSGIX */
+   {  9662, -1 }, /* GetInstrumentsSGIX */
+   { 11889, -1 }, /* StartInstrumentsSGIX */
+   { 14741, -1 }, /* StopInstrumentsSGIX */
+   { 16395, -1 }, /* InstrumentsBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_list_priority)
 static const struct gl_function_remap GL_SGIX_list_priority_functions[] = {
-   {  1125, -1 }, /* ListParameterfSGIX */
-   {  2763, -1 }, /* GetListParameterfvSGIX */
-   { 16303, -1 }, /* ListParameteriSGIX */
-   { 17057, -1 }, /* ListParameterfvSGIX */
-   { 19170, -1 }, /* ListParameterivSGIX */
+   {  1164, -1 }, /* ListParameterfSGIX */
+   {  2802, -1 }, /* GetListParameterfvSGIX */
+   { 16310, -1 }, /* ListParameteriSGIX */
+   { 17064, -1 }, /* ListParameterfvSGIX */
+   { 19177, -1 }, /* ListParameterivSGIX */
    { 30097, -1 }, /* GetListParameterivSGIX */
    {    -1, -1 }
 };
@@ -5919,47 +5918,47 @@ static const struct gl_function_remap GL_SGIX_pixel_texture_functions[] = {
 
 #if defined(need_GL_SGIX_polynomial_ffd)
 static const struct gl_function_remap GL_SGIX_polynomial_ffd_functions[] = {
-   {  3251, -1 }, /* LoadIdentityDeformationMapSGIX */
-   { 14834, -1 }, /* DeformSGIX */
-   { 22440, -1 }, /* DeformationMap3fSGIX */
-   { 28857, -1 }, /* DeformationMap3dSGIX */
+   {  3290, -1 }, /* LoadIdentityDeformationMapSGIX */
+   { 11175, -1 }, /* DeformationMap3dSGIX */
+   { 14841, -1 }, /* DeformSGIX */
+   { 22447, -1 }, /* DeformationMap3fSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_reference_plane)
 static const struct gl_function_remap GL_SGIX_reference_plane_functions[] = {
-   { 13487, -1 }, /* ReferencePlaneSGIX */
+   { 13494, -1 }, /* ReferencePlaneSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_sprite)
 static const struct gl_function_remap GL_SGIX_sprite_functions[] = {
-   {  8778, -1 }, /* SpriteParameterfvSGIX */
-   { 18959, -1 }, /* SpriteParameteriSGIX */
-   { 24532, -1 }, /* SpriteParameterfSGIX */
-   { 27137, -1 }, /* SpriteParameterivSGIX */
+   {  8817, -1 }, /* SpriteParameterfvSGIX */
+   { 18966, -1 }, /* SpriteParameteriSGIX */
+   { 24539, -1 }, /* SpriteParameterfSGIX */
+   { 27176, -1 }, /* SpriteParameterivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_tag_sample_buffer)
 static const struct gl_function_remap GL_SGIX_tag_sample_buffer_functions[] = {
-   { 19018, -1 }, /* TagSampleBufferSGIX */
+   { 19025, -1 }, /* TagSampleBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGI_color_table)
 static const struct gl_function_remap GL_SGI_color_table_functions[] = {
-   {  6852, _gloffset_ColorTableParameteriv },
-   {  7564, _gloffset_ColorTable },
-   { 13983, _gloffset_GetColorTable },
-   { 14093, _gloffset_CopyColorTable },
-   { 17748, _gloffset_ColorTableParameterfv },
-   { 21171, _gloffset_GetColorTableParameterfv },
-   { 23147, _gloffset_GetColorTableParameteriv },
+   {  6891, _gloffset_ColorTableParameteriv },
+   {  7603, _gloffset_ColorTable },
+   { 13990, _gloffset_GetColorTable },
+   { 14100, _gloffset_CopyColorTable },
+   { 17755, _gloffset_ColorTableParameterfv },
+   { 21178, _gloffset_GetColorTableParameterfv },
+   { 23154, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
@@ -5973,80 +5972,80 @@ static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
 
 #if defined(need_GL_SUN_global_alpha)
 static const struct gl_function_remap GL_SUN_global_alpha_functions[] = {
-   {  3035, -1 }, /* GlobalAlphaFactorubSUN */
-   {  4224, -1 }, /* GlobalAlphaFactoriSUN */
-   {  5789, -1 }, /* GlobalAlphaFactordSUN */
-   {  8862, -1 }, /* GlobalAlphaFactoruiSUN */
-   {  9214, -1 }, /* GlobalAlphaFactorbSUN */
-   { 12126, -1 }, /* GlobalAlphaFactorfSUN */
-   { 12245, -1 }, /* GlobalAlphaFactorusSUN */
-   { 20871, -1 }, /* GlobalAlphaFactorsSUN */
+   {  3074, -1 }, /* GlobalAlphaFactorubSUN */
+   {  4263, -1 }, /* GlobalAlphaFactoriSUN */
+   {  5828, -1 }, /* GlobalAlphaFactordSUN */
+   {  8901, -1 }, /* GlobalAlphaFactoruiSUN */
+   {  9253, -1 }, /* GlobalAlphaFactorbSUN */
+   { 12204, -1 }, /* GlobalAlphaFactorfSUN */
+   { 12323, -1 }, /* GlobalAlphaFactorusSUN */
+   { 20878, -1 }, /* GlobalAlphaFactorsSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_mesh_array)
 static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
-   { 26949, -1 }, /* DrawMeshArraysSUN */
+   { 26988, -1 }, /* DrawMeshArraysSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_triangle_list)
 static const struct gl_function_remap GL_SUN_triangle_list_functions[] = {
-   {  3971, -1 }, /* ReplacementCodeubSUN */
-   {  5600, -1 }, /* ReplacementCodeubvSUN */
-   { 17469, -1 }, /* ReplacementCodeusvSUN */
-   { 17657, -1 }, /* ReplacementCodePointerSUN */
-   { 19828, -1 }, /* ReplacementCodeuiSUN */
-   { 20583, -1 }, /* ReplacementCodeusSUN */
-   { 27594, -1 }, /* ReplacementCodeuivSUN */
+   {  4010, -1 }, /* ReplacementCodeubSUN */
+   {  5639, -1 }, /* ReplacementCodeubvSUN */
+   { 17476, -1 }, /* ReplacementCodeusvSUN */
+   { 17664, -1 }, /* ReplacementCodePointerSUN */
+   { 19835, -1 }, /* ReplacementCodeuiSUN */
+   { 20590, -1 }, /* ReplacementCodeusSUN */
+   { 27633, -1 }, /* ReplacementCodeuivSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_vertex)
 static const struct gl_function_remap GL_SUN_vertex_functions[] = {
-   {   999, -1 }, /* ReplacementCodeuiColor3fVertex3fvSUN */
-   {  1197, -1 }, /* TexCoord4fColor4fNormal3fVertex4fvSUN */
-   {  1423, -1 }, /* TexCoord2fColor4ubVertex3fvSUN */
-   {  1699, -1 }, /* ReplacementCodeuiVertex3fvSUN */
-   {  1833, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fvSUN */
-   {  2346, -1 }, /* ReplacementCodeuiNormal3fVertex3fSUN */
-   {  2642, -1 }, /* Color4ubVertex3fvSUN */
-   {  4105, -1 }, /* Color4ubVertex3fSUN */
-   {  4181, -1 }, /* TexCoord2fVertex3fSUN */
-   {  4508, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
-   {  4866, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
-   {  5495, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
-   {  6240, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
-   {  6599, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
-   {  7311, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
-   {  8079, -1 }, /* Color3fVertex3fSUN */
-   {  9173, -1 }, /* Color3fVertex3fvSUN */
-   {  9588, -1 }, /* Color4fNormal3fVertex3fvSUN */
-   { 10325, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 11674, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
-   { 13218, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
-   { 13629, -1 }, /* TexCoord2fColor3fVertex3fSUN */
-   { 14759, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
-   { 15093, -1 }, /* Color4ubVertex2fvSUN */
-   { 15333, -1 }, /* Normal3fVertex3fSUN */
-   { 16329, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
-   { 16590, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 17298, -1 }, /* TexCoord2fVertex3fvSUN */
-   { 18074, -1 }, /* Color4ubVertex2fSUN */
-   { 18295, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
-   { 20253, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
-   { 20651, -1 }, /* Normal3fVertex3fvSUN */
-   { 21080, -1 }, /* Color4fNormal3fVertex3fSUN */
-   { 21989, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
-   { 23984, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
-   { 25209, -1 }, /* TexCoord4fVertex4fSUN */
-   { 25635, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
-   { 25986, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
-   { 26113, -1 }, /* TexCoord4fVertex4fvSUN */
-   { 26821, -1 }, /* ReplacementCodeuiVertex3fSUN */
+   {  1038, -1 }, /* ReplacementCodeuiColor3fVertex3fvSUN */
+   {  1236, -1 }, /* TexCoord4fColor4fNormal3fVertex4fvSUN */
+   {  1462, -1 }, /* TexCoord2fColor4ubVertex3fvSUN */
+   {  1738, -1 }, /* ReplacementCodeuiVertex3fvSUN */
+   {  1872, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fvSUN */
+   {  2385, -1 }, /* ReplacementCodeuiNormal3fVertex3fSUN */
+   {  2681, -1 }, /* Color4ubVertex3fvSUN */
+   {  4144, -1 }, /* Color4ubVertex3fSUN */
+   {  4220, -1 }, /* TexCoord2fVertex3fSUN */
+   {  4547, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
+   {  4934, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
+   {  5534, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
+   {  6279, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
+   {  6638, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
+   {  7350, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
+   {  8118, -1 }, /* Color3fVertex3fSUN */
+   {  9212, -1 }, /* Color3fVertex3fvSUN */
+   {  9627, -1 }, /* Color4fNormal3fVertex3fvSUN */
+   { 10364, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 11752, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
+   { 13225, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
+   { 13636, -1 }, /* TexCoord2fColor3fVertex3fSUN */
+   { 14766, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
+   { 15100, -1 }, /* Color4ubVertex2fvSUN */
+   { 15340, -1 }, /* Normal3fVertex3fSUN */
+   { 16336, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
+   { 16597, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 17305, -1 }, /* TexCoord2fVertex3fvSUN */
+   { 18081, -1 }, /* Color4ubVertex2fSUN */
+   { 18302, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
+   { 20260, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
+   { 20658, -1 }, /* Normal3fVertex3fvSUN */
+   { 21087, -1 }, /* Color4fNormal3fVertex3fSUN */
+   { 21996, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
+   { 23991, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
+   { 25248, -1 }, /* TexCoord4fVertex4fSUN */
+   { 25674, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
+   { 26025, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
+   { 26152, -1 }, /* TexCoord4fVertex4fvSUN */
+   { 26860, -1 }, /* ReplacementCodeuiVertex3fSUN */
    {    -1, -1 }
 };
 #endif
@@ -6054,39 +6053,39 @@ static const struct gl_function_remap GL_SUN_vertex_functions[] = {
 #if defined(need_GL_VERSION_1_3)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_VERSION_1_3_functions[] = {
-   {   381, _gloffset_MultiTexCoord3sARB },
-   {   613, _gloffset_ActiveTextureARB },
-   {  3761, _gloffset_MultiTexCoord1fvARB },
-   {  5386, _gloffset_MultiTexCoord3dARB },
-   {  5431, _gloffset_MultiTexCoord2iARB },
-   {  5555, _gloffset_MultiTexCoord2svARB },
-   {  7520, _gloffset_MultiTexCoord2fARB },
-   {  9424, _gloffset_MultiTexCoord3fvARB },
-   {  9981, _gloffset_MultiTexCoord4sARB },
-   { 10615, _gloffset_MultiTexCoord2dvARB },
-   { 10997, _gloffset_MultiTexCoord1svARB },
-   { 11369, _gloffset_MultiTexCoord3svARB },
-   { 11430, _gloffset_MultiTexCoord4iARB },
-   { 12153, _gloffset_MultiTexCoord3iARB },
-   { 12956, _gloffset_MultiTexCoord1dARB },
-   { 13173, _gloffset_MultiTexCoord3dvARB },
-   { 14337, _gloffset_MultiTexCoord3ivARB },
-   { 14382, _gloffset_MultiTexCoord2sARB },
-   { 15680, _gloffset_MultiTexCoord4ivARB },
-   { 17398, _gloffset_ClientActiveTextureARB },
-   { 19681, _gloffset_MultiTexCoord2dARB },
-   { 20122, _gloffset_MultiTexCoord4dvARB },
-   { 20433, _gloffset_MultiTexCoord4fvARB },
-   { 21312, _gloffset_MultiTexCoord3fARB },
-   { 23675, _gloffset_MultiTexCoord4dARB },
-   { 23941, _gloffset_MultiTexCoord1sARB },
-   { 24145, _gloffset_MultiTexCoord1dvARB },
-   { 24955, _gloffset_MultiTexCoord1ivARB },
-   { 25048, _gloffset_MultiTexCoord2ivARB },
-   { 25387, _gloffset_MultiTexCoord1iARB },
-   { 26689, _gloffset_MultiTexCoord4svARB },
-   { 27207, _gloffset_MultiTexCoord1fARB },
-   { 27470, _gloffset_MultiTexCoord4fARB },
+   {   420, _gloffset_MultiTexCoord3sARB },
+   {   652, _gloffset_ActiveTextureARB },
+   {  3800, _gloffset_MultiTexCoord1fvARB },
+   {  5425, _gloffset_MultiTexCoord3dARB },
+   {  5470, _gloffset_MultiTexCoord2iARB },
+   {  5594, _gloffset_MultiTexCoord2svARB },
+   {  7559, _gloffset_MultiTexCoord2fARB },
+   {  9463, _gloffset_MultiTexCoord3fvARB },
+   { 10020, _gloffset_MultiTexCoord4sARB },
+   { 10654, _gloffset_MultiTexCoord2dvARB },
+   { 11036, _gloffset_MultiTexCoord1svARB },
+   { 11447, _gloffset_MultiTexCoord3svARB },
+   { 11508, _gloffset_MultiTexCoord4iARB },
+   { 12231, _gloffset_MultiTexCoord3iARB },
+   { 12963, _gloffset_MultiTexCoord1dARB },
+   { 13180, _gloffset_MultiTexCoord3dvARB },
+   { 14344, _gloffset_MultiTexCoord3ivARB },
+   { 14389, _gloffset_MultiTexCoord2sARB },
+   { 15687, _gloffset_MultiTexCoord4ivARB },
+   { 17405, _gloffset_ClientActiveTextureARB },
+   { 19688, _gloffset_MultiTexCoord2dARB },
+   { 20129, _gloffset_MultiTexCoord4dvARB },
+   { 20440, _gloffset_MultiTexCoord4fvARB },
+   { 21319, _gloffset_MultiTexCoord3fARB },
+   { 23682, _gloffset_MultiTexCoord4dARB },
+   { 23948, _gloffset_MultiTexCoord1sARB },
+   { 24152, _gloffset_MultiTexCoord1dvARB },
+   { 24994, _gloffset_MultiTexCoord1ivARB },
+   { 25087, _gloffset_MultiTexCoord2ivARB },
+   { 25426, _gloffset_MultiTexCoord1iARB },
+   { 26728, _gloffset_MultiTexCoord4svARB },
+   { 27246, _gloffset_MultiTexCoord1fARB },
+   { 27509, _gloffset_MultiTexCoord4fARB },
    { 29774, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index adc1199d87a..dc8bc747874 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -46,7 +46,6 @@
 #include "fbobject.h"
 #include "formats.h"
 #include "mtypes.h"
-#include "fbobject.h"
 #include "renderbuffer.h"
 
 
@@ -62,7 +61,7 @@
  */
 
 static void *
-get_pointer_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb,
+get_pointer_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb,
                   GLint x, GLint y)
 {
    if (!rb->Data)
@@ -76,7 +75,7 @@ get_pointer_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb,
 
 
 static void
-get_row_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+get_row_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
               GLint x, GLint y, void *values)
 {
    const GLubyte *src = (const GLubyte *) rb->Data + y * rb->Width + x;
@@ -86,7 +85,7 @@ get_row_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-get_values_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+get_values_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                  const GLint x[], const GLint y[], void *values)
 {
    GLubyte *dst = (GLubyte *) values;
@@ -100,7 +99,7 @@ get_values_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_row_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_row_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
               GLint x, GLint y, const void *values, const GLubyte *mask)
 {
    const GLubyte *src = (const GLubyte *) values;
@@ -121,7 +120,7 @@ put_row_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_mono_row_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_mono_row_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                    GLint x, GLint y, const void *value, const GLubyte *mask)
 {
    const GLubyte val = *((const GLubyte *) value);
@@ -145,7 +144,7 @@ put_mono_row_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_values_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_values_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                  const GLint x[], const GLint y[],
                  const void *values, const GLubyte *mask)
 {
@@ -162,7 +161,7 @@ put_values_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_mono_values_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_mono_values_ubyte(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                       const GLint x[], const GLint y[],
                       const void *value, const GLubyte *mask)
 {
@@ -184,7 +183,7 @@ put_mono_values_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
  */
 
 static void *
-get_pointer_ushort(GLcontext *ctx, struct gl_renderbuffer *rb,
+get_pointer_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb,
                    GLint x, GLint y)
 {
    if (!rb->Data)
@@ -196,7 +195,7 @@ get_pointer_ushort(GLcontext *ctx, struct gl_renderbuffer *rb,
 
 
 static void
-get_row_ushort(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+get_row_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                GLint x, GLint y, void *values)
 {
    const void *src = rb->GetPointer(ctx, rb, x, y);
@@ -206,7 +205,7 @@ get_row_ushort(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-get_values_ushort(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+get_values_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                   const GLint x[], const GLint y[], void *values)
 {
    GLushort *dst = (GLushort *) values;
@@ -220,7 +219,7 @@ get_values_ushort(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_row_ushort(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_row_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                GLint x, GLint y, const void *values, const GLubyte *mask)
 {
    const GLushort *src = (const GLushort *) values;
@@ -241,7 +240,7 @@ put_row_ushort(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_mono_row_ushort(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_mono_row_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                     GLint x, GLint y, const void *value, const GLubyte *mask)
 {
    const GLushort val = *((const GLushort *) value);
@@ -265,7 +264,7 @@ put_mono_row_ushort(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_values_ushort(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_values_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                   const GLint x[], const GLint y[], const void *values,
                   const GLubyte *mask)
 {
@@ -282,7 +281,7 @@ put_values_ushort(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
  
 
 static void
-put_mono_values_ushort(GLcontext *ctx, struct gl_renderbuffer *rb,
+put_mono_values_ushort(struct gl_context *ctx, struct gl_renderbuffer *rb,
                        GLuint count, const GLint x[], const GLint y[],
                        const void *value, const GLubyte *mask)
 {
@@ -313,7 +312,7 @@ put_mono_values_ushort(GLcontext *ctx, struct gl_renderbuffer *rb,
  */
 
 static void *
-get_pointer_uint(GLcontext *ctx, struct gl_renderbuffer *rb,
+get_pointer_uint(struct gl_context *ctx, struct gl_renderbuffer *rb,
                  GLint x, GLint y)
 {
    if (!rb->Data)
@@ -325,7 +324,7 @@ get_pointer_uint(GLcontext *ctx, struct gl_renderbuffer *rb,
 
 
 static void
-get_row_uint(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+get_row_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
              GLint x, GLint y, void *values)
 {
    const void *src = rb->GetPointer(ctx, rb, x, y);
@@ -336,7 +335,7 @@ get_row_uint(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-get_values_uint(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+get_values_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                 const GLint x[], const GLint y[], void *values)
 {
    GLuint *dst = (GLuint *) values;
@@ -351,7 +350,7 @@ get_values_uint(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_row_uint(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_row_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
              GLint x, GLint y, const void *values, const GLubyte *mask)
 {
    const GLuint *src = (const GLuint *) values;
@@ -373,7 +372,7 @@ put_row_uint(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_mono_row_uint(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_mono_row_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                   GLint x, GLint y, const void *value, const GLubyte *mask)
 {
    const GLuint val = *((const GLuint *) value);
@@ -398,7 +397,7 @@ put_mono_row_uint(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_values_uint(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_values_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                 const GLint x[], const GLint y[], const void *values,
                 const GLubyte *mask)
 {
@@ -416,7 +415,7 @@ put_values_uint(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_mono_values_uint(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_mono_values_uint(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                      const GLint x[], const GLint y[], const void *value,
                      const GLubyte *mask)
 {
@@ -441,7 +440,7 @@ put_mono_values_uint(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
  */
 
 static void *
-get_pointer_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb,
+get_pointer_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb,
                    GLint x, GLint y)
 {
    ASSERT(rb->Format == MESA_FORMAT_RGB888);
@@ -453,7 +452,7 @@ get_pointer_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb,
 
 
 static void
-get_row_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+get_row_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                GLint x, GLint y, void *values)
 {
    const GLubyte *src = (const GLubyte *) rb->Data + 3 * (y * rb->Width + x);
@@ -471,7 +470,7 @@ get_row_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-get_values_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+get_values_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                   const GLint x[], const GLint y[], void *values)
 {
    GLubyte *dst = (GLubyte *) values;
@@ -490,7 +489,7 @@ get_values_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_row_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_row_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                GLint x, GLint y, const void *values, const GLubyte *mask)
 {
    /* note: incoming values are RGB+A! */
@@ -510,7 +509,7 @@ put_row_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_row_rgb_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_row_rgb_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                    GLint x, GLint y, const void *values, const GLubyte *mask)
 {
    /* note: incoming values are RGB+A! */
@@ -530,7 +529,7 @@ put_row_rgb_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_mono_row_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_mono_row_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                     GLint x, GLint y, const void *value, const GLubyte *mask)
 {
    /* note: incoming value is RGB+A! */
@@ -558,7 +557,7 @@ put_mono_row_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_values_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_values_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                   const GLint x[], const GLint y[], const void *values,
                   const GLubyte *mask)
 {
@@ -579,7 +578,7 @@ put_values_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_mono_values_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb,
+put_mono_values_ubyte3(struct gl_context *ctx, struct gl_renderbuffer *rb,
                        GLuint count, const GLint x[], const GLint y[],
                        const void *value, const GLubyte *mask)
 {
@@ -607,7 +606,7 @@ put_mono_values_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb,
  */
 
 static void *
-get_pointer_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb,
+get_pointer_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb,
                    GLint x, GLint y)
 {
    if (!rb->Data)
@@ -619,7 +618,7 @@ get_pointer_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb,
 
 
 static void
-get_row_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+get_row_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                GLint x, GLint y, void *values)
 {
    const GLubyte *src = (const GLubyte *) rb->Data + 4 * (y * rb->Width + x);
@@ -630,7 +629,7 @@ get_row_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-get_values_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+get_values_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                   const GLint x[], const GLint y[], void *values)
 {
    /* treat 4*GLubyte as 1*GLuint */
@@ -646,7 +645,7 @@ get_values_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_row_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_row_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                GLint x, GLint y, const void *values, const GLubyte *mask)
 {
    /* treat 4*GLubyte as 1*GLuint */
@@ -669,7 +668,7 @@ put_row_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_row_rgb_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_row_rgb_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                    GLint x, GLint y, const void *values, const GLubyte *mask)
 {
    /* Store RGB values in RGBA buffer */
@@ -690,7 +689,7 @@ put_row_rgb_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_mono_row_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_mono_row_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                     GLint x, GLint y, const void *value, const GLubyte *mask)
 {
    /* treat 4*GLubyte as 1*GLuint */
@@ -723,7 +722,7 @@ put_mono_row_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_values_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_values_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                   const GLint x[], const GLint y[], const void *values,
                   const GLubyte *mask)
 {
@@ -742,7 +741,7 @@ put_values_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_mono_values_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb,
+put_mono_values_ubyte4(struct gl_context *ctx, struct gl_renderbuffer *rb,
                        GLuint count, const GLint x[], const GLint y[],
                        const void *value, const GLubyte *mask)
 {
@@ -766,7 +765,7 @@ put_mono_values_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb,
  */
 
 static void *
-get_pointer_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb,
+get_pointer_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb,
                     GLint x, GLint y)
 {
    if (!rb->Data)
@@ -777,7 +776,7 @@ get_pointer_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb,
 
 
 static void
-get_row_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+get_row_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                 GLint x, GLint y, void *values)
 {
    const GLshort *src = (const GLshort *) rb->Data + 4 * (y * rb->Width + x);
@@ -787,7 +786,7 @@ get_row_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-get_values_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+get_values_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                    const GLint x[], const GLint y[], void *values)
 {
    GLushort *dst = (GLushort *) values;
@@ -802,7 +801,7 @@ get_values_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_row_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_row_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                 GLint x, GLint y, const void *values, const GLubyte *mask)
 {
    const GLushort *src = (const GLushort *) values;
@@ -826,7 +825,7 @@ put_row_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_row_rgb_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_row_rgb_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                     GLint x, GLint y, const void *values, const GLubyte *mask)
 {
    /* Put RGB values in RGBA buffer */
@@ -851,7 +850,7 @@ put_row_rgb_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_mono_row_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_mono_row_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                      GLint x, GLint y, const void *value, const GLubyte *mask)
 {
    const GLushort val0 = ((const GLushort *) value)[0];
@@ -879,7 +878,7 @@ put_mono_row_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_values_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+put_values_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                    const GLint x[], const GLint y[], const void *values,
                    const GLubyte *mask)
 {
@@ -899,7 +898,7 @@ put_values_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-put_mono_values_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb,
+put_mono_values_ushort4(struct gl_context *ctx, struct gl_renderbuffer *rb,
                         GLuint count, const GLint x[], const GLint y[],
                         const void *value, const GLubyte *mask)
 {
@@ -937,7 +936,7 @@ put_mono_values_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb,
  * Get/PutValues functions.
  */
 GLboolean
-_mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
+_mesa_soft_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
                                 GLenum internalFormat,
                                 GLuint width, GLuint height)
 {
@@ -1146,7 +1145,7 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
 
 
 static GLboolean
-alloc_storage_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb,
+alloc_storage_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb,
                      GLenum internalFormat, GLuint width, GLuint height)
 {
    ASSERT(arb != arb->Wrapped);
@@ -1196,7 +1195,7 @@ delete_renderbuffer_alpha8(struct gl_renderbuffer *arb)
 
 
 static void *
-get_pointer_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb,
+get_pointer_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb,
                    GLint x, GLint y)
 {
    return NULL;   /* don't allow direct access! */
@@ -1204,7 +1203,7 @@ get_pointer_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb,
 
 
 static void
-get_row_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb, GLuint count,
+get_row_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,
                GLint x, GLint y, void *values)
 {
    /* NOTE: 'values' is RGBA format! */
@@ -1223,7 +1222,7 @@ get_row_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb, GLuint count,
 
 
 static void
-get_values_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb, GLuint count,
+get_values_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,
                   const GLint x[], const GLint y[], void *values)
 {
    GLubyte *dst = (GLubyte *) values;
@@ -1241,7 +1240,7 @@ get_values_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb, GLuint count,
 
 
 static void
-put_row_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb, GLuint count,
+put_row_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,
                GLint x, GLint y, const void *values, const GLubyte *mask)
 {
    const GLubyte *src = (const GLubyte *) values;
@@ -1261,7 +1260,7 @@ put_row_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb, GLuint count,
 
 
 static void
-put_row_rgb_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb, GLuint count,
+put_row_rgb_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,
                    GLint x, GLint y, const void *values, const GLubyte *mask)
 {
    const GLubyte *src = (const GLubyte *) values;
@@ -1281,7 +1280,7 @@ put_row_rgb_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb, GLuint count,
 
 
 static void
-put_mono_row_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb, GLuint count,
+put_mono_row_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,
                     GLint x, GLint y, const void *value, const GLubyte *mask)
 {
    const GLubyte val = ((const GLubyte *) value)[3];
@@ -1306,7 +1305,7 @@ put_mono_row_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb, GLuint count,
 
 
 static void
-put_values_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb, GLuint count,
+put_values_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb, GLuint count,
                   const GLint x[], const GLint y[],
                   const void *values, const GLubyte *mask)
 {
@@ -1327,7 +1326,7 @@ put_values_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb, GLuint count,
 
 
 static void
-put_mono_values_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb,
+put_mono_values_alpha8(struct gl_context *ctx, struct gl_renderbuffer *arb,
                        GLuint count, const GLint x[], const GLint y[],
                        const void *value, const GLubyte *mask)
 {
@@ -1369,7 +1368,7 @@ copy_buffer_alpha8(struct gl_renderbuffer* dst, struct gl_renderbuffer* src)
  * direct buffer access is not supported.
  */
 static void *
-nop_get_pointer(GLcontext *ctx, struct gl_renderbuffer *rb, GLint x, GLint y)
+nop_get_pointer(struct gl_context *ctx, struct gl_renderbuffer *rb, GLint x, GLint y)
 {
    return NULL;
 }
@@ -1423,7 +1422,7 @@ _mesa_init_renderbuffer(struct gl_renderbuffer *rb, GLuint name)
  * renderbuffers or window-system renderbuffers.
  */
 struct gl_renderbuffer *
-_mesa_new_renderbuffer(GLcontext *ctx, GLuint name)
+_mesa_new_renderbuffer(struct gl_context *ctx, GLuint name)
 {
    struct gl_renderbuffer *rb = CALLOC_STRUCT(gl_renderbuffer);
    if (rb) {
@@ -1454,7 +1453,7 @@ _mesa_delete_renderbuffer(struct gl_renderbuffer *rb)
  * This would not be used for hardware-based renderbuffers.
  */
 struct gl_renderbuffer *
-_mesa_new_soft_renderbuffer(GLcontext *ctx, GLuint name)
+_mesa_new_soft_renderbuffer(struct gl_context *ctx, GLuint name)
 {
    struct gl_renderbuffer *rb = _mesa_new_renderbuffer(ctx, name);
    if (rb) {
@@ -1477,7 +1476,7 @@ _mesa_new_soft_renderbuffer(GLcontext *ctx, GLuint name)
  * rendering!
  */
 GLboolean
-_mesa_add_color_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_add_color_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,
                               GLuint rgbBits, GLuint alphaBits,
                               GLboolean frontLeft, GLboolean backLeft,
                               GLboolean frontRight, GLboolean backRight)
@@ -1541,7 +1540,7 @@ _mesa_add_color_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
  * rendering!
  */
 GLboolean
-_mesa_add_alpha_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_add_alpha_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,
                               GLuint alphaBits,
                               GLboolean frontLeft, GLboolean backLeft,
                               GLboolean frontRight, GLboolean backRight)
@@ -1625,7 +1624,7 @@ _mesa_add_alpha_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
  * copy the back buffer alpha channel into the front buffer alpha channel.
  */
 void
-_mesa_copy_soft_alpha_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb)
+_mesa_copy_soft_alpha_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb)
 {
    if (fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer &&
        fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer)
@@ -1649,7 +1648,7 @@ _mesa_copy_soft_alpha_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb)
  * rendering!
  */
 GLboolean
-_mesa_add_depth_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_add_depth_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
                              GLuint depthBits)
 {
    struct gl_renderbuffer *rb;
@@ -1697,7 +1696,7 @@ _mesa_add_depth_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
  * rendering!
  */
 GLboolean
-_mesa_add_stencil_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_add_stencil_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
                                GLuint stencilBits)
 {
    struct gl_renderbuffer *rb;
@@ -1736,7 +1735,7 @@ _mesa_add_stencil_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
  * rendering!
  */
 GLboolean
-_mesa_add_accum_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_add_accum_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
                              GLuint redBits, GLuint greenBits,
                              GLuint blueBits, GLuint alphaBits)
 {
@@ -1777,7 +1776,7 @@ _mesa_add_accum_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
  * NOTE: color-index aux buffers not supported.
  */
 GLboolean
-_mesa_add_aux_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_add_aux_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,
                             GLuint colorBits, GLuint numBuffers)
 {
    GLuint i;
@@ -1991,7 +1990,7 @@ _mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,
  * \return new depth/stencil renderbuffer
  */
 struct gl_renderbuffer *
-_mesa_new_depthstencil_renderbuffer(GLcontext *ctx, GLuint name)
+_mesa_new_depthstencil_renderbuffer(struct gl_context *ctx, GLuint name)
 {
    struct gl_renderbuffer *dsrb;
 
diff --git a/src/mesa/main/renderbuffer.h b/src/mesa/main/renderbuffer.h
index bc92b269821..8791369dbee 100644
--- a/src/mesa/main/renderbuffer.h
+++ b/src/mesa/main/renderbuffer.h
@@ -36,52 +36,52 @@ extern void
 _mesa_init_renderbuffer(struct gl_renderbuffer *rb, GLuint name);
 
 extern struct gl_renderbuffer *
-_mesa_new_renderbuffer(GLcontext *ctx, GLuint name);
+_mesa_new_renderbuffer(struct gl_context *ctx, GLuint name);
 
 extern void
 _mesa_delete_renderbuffer(struct gl_renderbuffer *rb);
 
 
 extern struct gl_renderbuffer *
-_mesa_new_soft_renderbuffer(GLcontext *ctx, GLuint name);
+_mesa_new_soft_renderbuffer(struct gl_context *ctx, GLuint name);
 
 
 extern GLboolean
-_mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
+_mesa_soft_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
                                 GLenum internalFormat,
                                 GLuint width, GLuint height);
 
 extern GLboolean
-_mesa_add_color_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_add_color_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,
                               GLuint rgbBits, GLuint alphaBits,
                               GLboolean frontLeft, GLboolean backLeft,
                               GLboolean frontRight, GLboolean backRight);
 
 extern GLboolean
-_mesa_add_alpha_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_add_alpha_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,
                               GLuint alphaBits,
                               GLboolean frontLeft, GLboolean backLeft,
                               GLboolean frontRight, GLboolean backRight);
 
 extern void
-_mesa_copy_soft_alpha_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb);
+_mesa_copy_soft_alpha_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb);
 
 extern GLboolean
-_mesa_add_depth_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_add_depth_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
                              GLuint depthBits);
 
 extern GLboolean
-_mesa_add_stencil_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_add_stencil_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
                                GLuint stencilBits);
 
 
 extern GLboolean
-_mesa_add_accum_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_add_accum_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
                              GLuint redBits, GLuint greenBits,
                              GLuint blueBits, GLuint alphaBits);
 
 extern GLboolean
-_mesa_add_aux_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
+_mesa_add_aux_renderbuffers(struct gl_context *ctx, struct gl_framebuffer *fb,
                             GLuint bits, GLuint numBuffers);
 
 extern void
@@ -105,7 +105,7 @@ _mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,
                              struct gl_renderbuffer *rb);
 
 extern struct gl_renderbuffer *
-_mesa_new_depthstencil_renderbuffer(GLcontext *ctx, GLuint name);
+_mesa_new_depthstencil_renderbuffer(struct gl_context *ctx, GLuint name);
 
 
 #endif /* RENDERBUFFER_H */
diff --git a/src/mesa/main/scissor.c b/src/mesa/main/scissor.c
index 523f3c3ab83..4cf0bc2528c 100644
--- a/src/mesa/main/scissor.c
+++ b/src/mesa/main/scissor.c
@@ -58,12 +58,12 @@ _mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height )
  *
  * \sa glScissor().
  *
- * Verifies the parameters and updates __GLcontextRec::Scissor. On a
+ * Verifies the parameters and updates __struct gl_contextRec::Scissor. On a
  * change flushes the vertices and notifies the driver via
  * the dd_function_table::Scissor callback.
  */
 void
-_mesa_set_scissor(GLcontext *ctx, 
+_mesa_set_scissor(struct gl_context *ctx, 
                   GLint x, GLint y, GLsizei width, GLsizei height)
 {
    if (x == ctx->Scissor.X &&
@@ -88,7 +88,7 @@ _mesa_set_scissor(GLcontext *ctx,
  * \param ctx  the GL context.
  */
 void
-_mesa_init_scissor(GLcontext *ctx)
+_mesa_init_scissor(struct gl_context *ctx)
 {
    /* Scissor group */
    ctx->Scissor.Enabled = GL_FALSE;
diff --git a/src/mesa/main/scissor.h b/src/mesa/main/scissor.h
index b852a2122d0..bd909019db2 100644
--- a/src/mesa/main/scissor.h
+++ b/src/mesa/main/scissor.h
@@ -35,12 +35,12 @@ _mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height );
 
 
 extern void
-_mesa_set_scissor(GLcontext *ctx, 
+_mesa_set_scissor(struct gl_context *ctx, 
                   GLint x, GLint y, GLsizei width, GLsizei height);
 
 
 extern void 
-_mesa_init_scissor(GLcontext *ctx);
+_mesa_init_scissor(struct gl_context *ctx);
 
 
 #endif
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index c25d2a19747..8ecda719287 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -47,7 +47,7 @@
 #include "program/prog_parameter.h"
 #include "program/prog_uniform.h"
 #include "talloc.h"
-
+#include <stdbool.h>
 
 /** Define this to enable shader substitution (see below) */
 #define SHADER_SUBST 0
@@ -89,7 +89,7 @@ get_shader_flags(void)
  * Initialize context's shader state.
  */
 void
-_mesa_init_shader_state(GLcontext *ctx)
+_mesa_init_shader_state(struct gl_context *ctx)
 {
    /* Device drivers may override these to control what kind of instructions
     * are generated by the GLSL compiler.
@@ -114,7 +114,7 @@ _mesa_init_shader_state(GLcontext *ctx)
  * Free the per-context shader-related state.
  */
 void
-_mesa_free_shader_state(GLcontext *ctx)
+_mesa_free_shader_state(struct gl_context *ctx)
 {
    _mesa_reference_shader_program(ctx, &ctx->Shader.CurrentProgram, NULL);
 }
@@ -202,6 +202,35 @@ _mesa_copy_string(GLchar *dst, GLsizei maxLength,
 
 
 /**
+ * Confirm that the a shader type is valid and supported by the implementation
+ *
+ * \param ctx   Current GL context
+ * \param type  Shader target
+ *
+ */
+static bool
+validate_shader_target(const struct gl_context *ctx, GLenum type)
+{
+   switch (type) {
+#if FEATURE_ARB_fragment_shader
+   case GL_FRAGMENT_SHADER:
+      return ctx->Extensions.ARB_fragment_shader;
+#endif
+#if FEATURE_ARB_vertex_shader
+   case GL_VERTEX_SHADER:
+      return ctx->Extensions.ARB_vertex_shader;
+#endif
+#if FEATURE_ARB_geometry_shader4
+   case GL_GEOMETRY_SHADER_ARB:
+      return ctx->Extensions.ARB_geometry_shader4;
+#endif
+   default:
+      return false;
+   }
+}
+
+
+/**
  * Find the length of the longest transform feedback varying name
  * which was specified with glTransformFeedbackVaryings().
  */
@@ -221,7 +250,7 @@ longest_feedback_varying_name(const struct gl_shader_program *shProg)
 
 
 static GLboolean
-is_program(GLcontext *ctx, GLuint name)
+is_program(struct gl_context *ctx, GLuint name)
 {
    struct gl_shader_program *shProg = _mesa_lookup_shader_program(ctx, name);
    return shProg ? GL_TRUE : GL_FALSE;
@@ -229,7 +258,7 @@ is_program(GLcontext *ctx, GLuint name)
 
 
 static GLboolean
-is_shader(GLcontext *ctx, GLuint name)
+is_shader(struct gl_context *ctx, GLuint name)
 {
    struct gl_shader *shader = _mesa_lookup_shader(ctx, name);
    return shader ? GL_TRUE : GL_FALSE;
@@ -240,7 +269,7 @@ is_shader(GLcontext *ctx, GLuint name)
  * Attach shader to a shader program.
  */
 static void
-attach_shader(GLcontext *ctx, GLuint program, GLuint shader)
+attach_shader(struct gl_context *ctx, GLuint program, GLuint shader)
 {
    struct gl_shader_program *shProg;
    struct gl_shader *sh;
@@ -287,7 +316,7 @@ attach_shader(GLcontext *ctx, GLuint program, GLuint shader)
 
 
 static GLint
-get_attrib_location(GLcontext *ctx, GLuint program, const GLchar *name)
+get_attrib_location(struct gl_context *ctx, GLuint program, const GLchar *name)
 {
    struct gl_shader_program *shProg
       = _mesa_lookup_shader_program_err(ctx, program, "glGetAttribLocation");
@@ -320,7 +349,7 @@ get_attrib_location(GLcontext *ctx, GLuint program, const GLchar *name)
 
 
 static void
-bind_attrib_location(GLcontext *ctx, GLuint program, GLuint index,
+bind_attrib_location(struct gl_context *ctx, GLuint program, GLuint index,
                      const GLchar *name)
 {
    struct gl_shader_program *shProg;
@@ -371,24 +400,18 @@ bind_attrib_location(GLcontext *ctx, GLuint program, GLuint index,
 
 
 static GLuint
-create_shader(GLcontext *ctx, GLenum type)
+create_shader(struct gl_context *ctx, GLenum type)
 {
    struct gl_shader *sh;
    GLuint name;
 
-   name = _mesa_HashFindFreeKeyBlock(ctx->Shared->ShaderObjects, 1);
-
-   switch (type) {
-   case GL_FRAGMENT_SHADER:
-   case GL_VERTEX_SHADER:
-   case GL_GEOMETRY_SHADER_ARB:
-      sh = ctx->Driver.NewShader(ctx, name, type);
-      break;
-   default:
+   if (!validate_shader_target(ctx, type)) {
       _mesa_error(ctx, GL_INVALID_ENUM, "CreateShader(type)");
       return 0;
    }
 
+   name = _mesa_HashFindFreeKeyBlock(ctx->Shared->ShaderObjects, 1);
+   sh = ctx->Driver.NewShader(ctx, name, type);
    _mesa_HashInsert(ctx->Shared->ShaderObjects, name, sh);
 
    return name;
@@ -396,7 +419,7 @@ create_shader(GLcontext *ctx, GLenum type)
 
 
 static GLuint 
-create_shader_program(GLcontext *ctx)
+create_shader_program(struct gl_context *ctx)
 {
    GLuint name;
    struct gl_shader_program *shProg;
@@ -418,7 +441,7 @@ create_shader_program(GLcontext *ctx)
  * DeleteProgramARB.
  */
 static void
-delete_shader_program(GLcontext *ctx, GLuint name)
+delete_shader_program(struct gl_context *ctx, GLuint name)
 {
    /*
     * NOTE: deleting shaders/programs works a bit differently than
@@ -442,7 +465,7 @@ delete_shader_program(GLcontext *ctx, GLuint name)
 
 
 static void
-delete_shader(GLcontext *ctx, GLuint shader)
+delete_shader(struct gl_context *ctx, GLuint shader)
 {
    struct gl_shader *sh;
 
@@ -458,7 +481,7 @@ delete_shader(GLcontext *ctx, GLuint shader)
 
 
 static void
-detach_shader(GLcontext *ctx, GLuint program, GLuint shader)
+detach_shader(struct gl_context *ctx, GLuint program, GLuint shader)
 {
    struct gl_shader_program *shProg;
    GLuint n;
@@ -526,7 +549,7 @@ detach_shader(GLcontext *ctx, GLuint program, GLuint shader)
 
 
 static void
-get_active_attrib(GLcontext *ctx, GLuint program, GLuint index,
+get_active_attrib(struct gl_context *ctx, GLuint program, GLuint index,
                   GLsizei maxLength, GLsizei *length, GLint *size,
                   GLenum *type, GLchar *nameOut)
 {
@@ -561,7 +584,7 @@ get_active_attrib(GLcontext *ctx, GLuint program, GLuint index,
  * Return list of shaders attached to shader program.
  */
 static void
-get_attached_shaders(GLcontext *ctx, GLuint program, GLsizei maxCount,
+get_attached_shaders(struct gl_context *ctx, GLuint program, GLsizei maxCount,
                      GLsizei *count, GLuint *obj)
 {
    struct gl_shader_program *shProg =
@@ -581,7 +604,7 @@ get_attached_shaders(GLcontext *ctx, GLuint program, GLsizei maxCount,
  * glGetHandleARB() - return ID/name of currently bound shader program.
  */
 static GLuint
-get_handle(GLcontext *ctx, GLenum pname)
+get_handle(struct gl_context *ctx, GLenum pname)
 {
    if (pname == GL_PROGRAM_OBJECT_ARB) {
       if (ctx->Shader.CurrentProgram)
@@ -602,7 +625,7 @@ get_handle(GLcontext *ctx, GLenum pname)
  * programs (see glGetProgramivARB).
  */
 static void
-get_programiv(GLcontext *ctx, GLuint program, GLenum pname, GLint *params)
+get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *params)
 {
    const struct gl_program_parameter_list *attribs;
    struct gl_shader_program *shProg
@@ -684,7 +707,7 @@ get_programiv(GLcontext *ctx, GLuint program, GLenum pname, GLint *params)
  * glGetShaderiv() - get GLSL shader state
  */
 static void
-get_shaderiv(GLcontext *ctx, GLuint name, GLenum pname, GLint *params)
+get_shaderiv(struct gl_context *ctx, GLuint name, GLenum pname, GLint *params)
 {
    struct gl_shader *shader =
       _mesa_lookup_shader_err(ctx, name, "glGetShaderiv");
@@ -717,7 +740,7 @@ get_shaderiv(GLcontext *ctx, GLuint name, GLenum pname, GLint *params)
 
 
 static void
-get_program_info_log(GLcontext *ctx, GLuint program, GLsizei bufSize,
+get_program_info_log(struct gl_context *ctx, GLuint program, GLsizei bufSize,
                      GLsizei *length, GLchar *infoLog)
 {
    struct gl_shader_program *shProg
@@ -731,7 +754,7 @@ get_program_info_log(GLcontext *ctx, GLuint program, GLsizei bufSize,
 
 
 static void
-get_shader_info_log(GLcontext *ctx, GLuint shader, GLsizei bufSize,
+get_shader_info_log(struct gl_context *ctx, GLuint shader, GLsizei bufSize,
                     GLsizei *length, GLchar *infoLog)
 {
    struct gl_shader *sh = _mesa_lookup_shader(ctx, shader);
@@ -747,7 +770,7 @@ get_shader_info_log(GLcontext *ctx, GLuint shader, GLsizei bufSize,
  * Return shader source code.
  */
 static void
-get_shader_source(GLcontext *ctx, GLuint shader, GLsizei maxLength,
+get_shader_source(struct gl_context *ctx, GLuint shader, GLsizei maxLength,
                   GLsizei *length, GLchar *sourceOut)
 {
    struct gl_shader *sh;
@@ -763,7 +786,7 @@ get_shader_source(GLcontext *ctx, GLuint shader, GLsizei maxLength,
  * Set/replace shader source code.
  */
 static void
-shader_source(GLcontext *ctx, GLuint shader, const GLchar *source)
+shader_source(struct gl_context *ctx, GLuint shader, const GLchar *source)
 {
    struct gl_shader *sh;
 
@@ -787,7 +810,7 @@ shader_source(GLcontext *ctx, GLuint shader, const GLchar *source)
  * Compile a shader.
  */
 static void
-compile_shader(GLcontext *ctx, GLuint shaderObj)
+compile_shader(struct gl_context *ctx, GLuint shaderObj)
 {
    struct gl_shader *sh;
    struct gl_shader_compiler_options *options;
@@ -812,7 +835,7 @@ compile_shader(GLcontext *ctx, GLuint shaderObj)
  * Link a program's shaders.
  */
 static void
-link_program(GLcontext *ctx, GLuint program)
+link_program(struct gl_context *ctx, GLuint program)
 {
    struct gl_shader_program *shProg;
    struct gl_transform_feedback_object *obj =
@@ -888,7 +911,7 @@ print_shader_info(const struct gl_shader_program *shProg)
  * Use the named shader program for subsequent rendering.
  */
 void
-_mesa_use_program(GLcontext *ctx, GLuint program)
+_mesa_use_program(struct gl_context *ctx, GLuint program)
 {
    struct gl_shader_program *shProg;
    struct gl_transform_feedback_object *obj =
@@ -943,7 +966,7 @@ _mesa_use_program(GLcontext *ctx, GLuint program)
  * \return GL_TRUE if valid, GL_FALSE if invalid
  */
 static GLboolean
-validate_samplers(GLcontext *ctx, const struct gl_program *prog, char *errMsg)
+validate_samplers(const struct gl_program *prog, char *errMsg)
 {
    static const char *targetName[] = {
       "TEXTURE_2D_ARRAY",
@@ -975,7 +998,7 @@ validate_samplers(GLcontext *ctx, const struct gl_program *prog, char *errMsg)
       assert(sampler < MAX_TEXTURE_IMAGE_UNITS);
       unit = prog->SamplerUnits[sampler];
       target = prog->SamplerTargets[sampler];
-      if (targetUsed[unit] != -1 && targetUsed[unit] != target) {
+      if (targetUsed[unit] != -1 && targetUsed[unit] != (int) target) {
          _mesa_snprintf(errMsg, 100,
 		  "Texture unit %d is accessed both as %s and %s",
 		  unit, targetName[targetUsed[unit]], targetName[target]);
@@ -995,8 +1018,7 @@ validate_samplers(GLcontext *ctx, const struct gl_program *prog, char *errMsg)
  * \return GL_TRUE if valid, GL_FALSE if invalid (and set errMsg)
  */
 static GLboolean
-validate_shader_program(GLcontext *ctx,
-                        const struct gl_shader_program *shProg,
+validate_shader_program(const struct gl_shader_program *shProg,
                         char *errMsg)
 {
    const struct gl_vertex_program *vp = shProg->VertexProgram;
@@ -1026,10 +1048,10 @@ validate_shader_program(GLcontext *ctx,
     * Check: any two active samplers in the current program object are of
     * different types, but refer to the same texture image unit,
     */
-   if (vp && !validate_samplers(ctx, &vp->Base, errMsg)) {
+   if (vp && !validate_samplers(&vp->Base, errMsg)) {
       return GL_FALSE;
    }
-   if (fp && !validate_samplers(ctx, &fp->Base, errMsg)) {
+   if (fp && !validate_samplers(&fp->Base, errMsg)) {
       return GL_FALSE;
    }
 
@@ -1041,7 +1063,7 @@ validate_shader_program(GLcontext *ctx,
  * Called via glValidateProgram()
  */
 static void
-validate_program(GLcontext *ctx, GLuint program)
+validate_program(struct gl_context *ctx, GLuint program)
 {
    struct gl_shader_program *shProg;
    char errMsg[100];
@@ -1051,7 +1073,7 @@ validate_program(GLcontext *ctx, GLuint program)
       return;
    }
 
-   shProg->Validated = validate_shader_program(ctx, shProg, errMsg);
+   shProg->Validated = validate_shader_program(shProg, errMsg);
    if (!shProg->Validated) {
       /* update info log */
       if (shProg->InfoLog) {
@@ -1498,6 +1520,10 @@ _mesa_GetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype,
                                GLint* range, GLint* precision)
 {
    GET_CURRENT_CONTEXT(ctx);
+   (void) shadertype;
+   (void) precisiontype;
+   (void) range;
+   (void) precision;
    _mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__);
 }
 
@@ -1515,6 +1541,11 @@ _mesa_ShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat,
                    const void* binary, GLint length)
 {
    GET_CURRENT_CONTEXT(ctx);
+   (void) n;
+   (void) shaders;
+   (void) binaryformat;
+   (void) binary;
+   (void) length;
    _mesa_error(ctx, GL_INVALID_OPERATION, __FUNCTION__);
 }
 
@@ -1540,7 +1571,7 @@ _mesa_ProgramParameteriARB(GLuint program, GLenum pname,
    switch (pname) {
    case GL_GEOMETRY_VERTICES_OUT_ARB:
       if (value < 1 ||
-          value > ctx->Const.GeometryProgram.MaxGeometryOutputVertices) {
+          (unsigned) value > ctx->Const.GeometryProgram.MaxGeometryOutputVertices) {
          _mesa_error(ctx, GL_INVALID_VALUE,
                      "glProgramParameteri(GL_GEOMETRY_VERTICES_OUT_ARB=%d",
                      value);
diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h
index 16e22530de5..b55d7ca8b25 100644
--- a/src/mesa/main/shaderapi.h
+++ b/src/mesa/main/shaderapi.h
@@ -39,7 +39,7 @@ _mesa_copy_string(GLchar *dst, GLsizei maxLength,
                   GLsizei *length, const GLchar *src);
 
 extern void
-_mesa_use_program(GLcontext *ctx, GLuint program);
+_mesa_use_program(struct gl_context *ctx, GLuint program);
 
 
 extern void
diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
index 2de8f279818..b6594cbe6f0 100644
--- a/src/mesa/main/shaderobj.c
+++ b/src/mesa/main/shaderobj.c
@@ -50,7 +50,7 @@
  * Then set ptr to point to sh, incrementing its refcount.
  */
 void
-_mesa_reference_shader(GLcontext *ctx, struct gl_shader **ptr,
+_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,
                        struct gl_shader *sh)
 {
    assert(ptr);
@@ -88,7 +88,7 @@ _mesa_reference_shader(GLcontext *ctx, struct gl_shader **ptr,
 }
 
 void
-_mesa_init_shader(GLcontext *ctx, struct gl_shader *shader)
+_mesa_init_shader(struct gl_context *ctx, struct gl_shader *shader)
 {
    shader->RefCount = 1;
 }
@@ -98,7 +98,7 @@ _mesa_init_shader(GLcontext *ctx, struct gl_shader *shader)
  * Called via ctx->Driver.NewShader()
  */
 struct gl_shader *
-_mesa_new_shader(GLcontext *ctx, GLuint name, GLenum type)
+_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type)
 {
    struct gl_shader *shader;
    assert(type == GL_FRAGMENT_SHADER || type == GL_VERTEX_SHADER ||
@@ -118,7 +118,7 @@ _mesa_new_shader(GLcontext *ctx, GLuint name, GLenum type)
  * Called via ctx->Driver.DeleteShader().
  */
 static void
-_mesa_delete_shader(GLcontext *ctx, struct gl_shader *sh)
+_mesa_delete_shader(struct gl_context *ctx, struct gl_shader *sh)
 {
    if (sh->Source)
       free((void *) sh->Source);
@@ -131,7 +131,7 @@ _mesa_delete_shader(GLcontext *ctx, struct gl_shader *sh)
  * Lookup a GLSL shader object.
  */
 struct gl_shader *
-_mesa_lookup_shader(GLcontext *ctx, GLuint name)
+_mesa_lookup_shader(struct gl_context *ctx, GLuint name)
 {
    if (name) {
       struct gl_shader *sh = (struct gl_shader *)
@@ -153,7 +153,7 @@ _mesa_lookup_shader(GLcontext *ctx, GLuint name)
  * As above, but record an error if shader is not found.
  */
 struct gl_shader *
-_mesa_lookup_shader_err(GLcontext *ctx, GLuint name, const char *caller)
+_mesa_lookup_shader_err(struct gl_context *ctx, GLuint name, const char *caller)
 {
    if (!name) {
       _mesa_error(ctx, GL_INVALID_VALUE, "%s", caller);
@@ -188,7 +188,7 @@ _mesa_lookup_shader_err(GLcontext *ctx, GLuint name, const char *caller)
  * Then set ptr to point to shProg, incrementing its refcount.
  */
 void
-_mesa_reference_shader_program(GLcontext *ctx,
+_mesa_reference_shader_program(struct gl_context *ctx,
                                struct gl_shader_program **ptr,
                                struct gl_shader_program *shProg)
 {
@@ -230,7 +230,7 @@ _mesa_reference_shader_program(GLcontext *ctx,
 }
 
 void
-_mesa_init_shader_program(GLcontext *ctx, struct gl_shader_program *prog)
+_mesa_init_shader_program(struct gl_context *ctx, struct gl_shader_program *prog)
 {
    prog->Type = GL_SHADER_PROGRAM_MESA;
    prog->RefCount = 1;
@@ -247,7 +247,7 @@ _mesa_init_shader_program(GLcontext *ctx, struct gl_shader_program *prog)
  * Called via ctx->Driver.NewShaderProgram()
  */
 static struct gl_shader_program *
-_mesa_new_shader_program(GLcontext *ctx, GLuint name)
+_mesa_new_shader_program(struct gl_context *ctx, GLuint name)
 {
    struct gl_shader_program *shProg;
    shProg = talloc_zero(NULL, struct gl_shader_program);
@@ -263,7 +263,7 @@ _mesa_new_shader_program(GLcontext *ctx, GLuint name)
  * Clear (free) the shader program state that gets produced by linking.
  */
 void
-_mesa_clear_shader_program_data(GLcontext *ctx,
+_mesa_clear_shader_program_data(struct gl_context *ctx,
                                 struct gl_shader_program *shProg)
 {
    _mesa_reference_vertprog(ctx, &shProg->VertexProgram, NULL);
@@ -287,7 +287,7 @@ _mesa_clear_shader_program_data(GLcontext *ctx,
  * object itself.
  */
 void
-_mesa_free_shader_program_data(GLcontext *ctx,
+_mesa_free_shader_program_data(struct gl_context *ctx,
                                struct gl_shader_program *shProg)
 {
    GLuint i;
@@ -326,10 +326,12 @@ _mesa_free_shader_program_data(GLcontext *ctx,
    shProg->TransformFeedback.NumVarying = 0;
 
 
-   for (i = 0; i < shProg->_NumLinkedShaders; i++) {
-      ctx->Driver.DeleteShader(ctx, shProg->_LinkedShaders[i]);
+   for (i = 0; i < MESA_SHADER_TYPES; i++) {
+      if (shProg->_LinkedShaders[i] != NULL) {
+	 ctx->Driver.DeleteShader(ctx, shProg->_LinkedShaders[i]);
+	 shProg->_LinkedShaders[i] = NULL;
+      }
    }
-   shProg->_NumLinkedShaders = 0;
 }
 
 
@@ -338,7 +340,7 @@ _mesa_free_shader_program_data(GLcontext *ctx,
  * Called via ctx->Driver.DeleteShaderProgram().
  */
 static void
-_mesa_delete_shader_program(GLcontext *ctx, struct gl_shader_program *shProg)
+_mesa_delete_shader_program(struct gl_context *ctx, struct gl_shader_program *shProg)
 {
    _mesa_free_shader_program_data(ctx, shProg);
 
@@ -350,7 +352,7 @@ _mesa_delete_shader_program(GLcontext *ctx, struct gl_shader_program *shProg)
  * Lookup a GLSL program object.
  */
 struct gl_shader_program *
-_mesa_lookup_shader_program(GLcontext *ctx, GLuint name)
+_mesa_lookup_shader_program(struct gl_context *ctx, GLuint name)
 {
    struct gl_shader_program *shProg;
    if (name) {
@@ -373,7 +375,7 @@ _mesa_lookup_shader_program(GLcontext *ctx, GLuint name)
  * As above, but record an error if program is not found.
  */
 struct gl_shader_program *
-_mesa_lookup_shader_program_err(GLcontext *ctx, GLuint name,
+_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
                                 const char *caller)
 {
    if (!name) {
diff --git a/src/mesa/main/shaderobj.h b/src/mesa/main/shaderobj.h
index cbe7ae7b068..5ea8ddc88d0 100644
--- a/src/mesa/main/shaderobj.h
+++ b/src/mesa/main/shaderobj.h
@@ -27,6 +27,7 @@
 #define SHADEROBJ_H
 
 
+#include "main/compiler.h"
 #include "main/glheader.h"
 #include "main/mtypes.h"
 #include "program/ir_to_mesa.h"
@@ -39,50 +40,50 @@ extern "C" {
  */
 
 extern void
-_mesa_init_shader_state(GLcontext * ctx);
+_mesa_init_shader_state(struct gl_context * ctx);
 
 extern void
-_mesa_free_shader_state(GLcontext *ctx);
+_mesa_free_shader_state(struct gl_context *ctx);
 
 
 extern void
-_mesa_reference_shader(GLcontext *ctx, struct gl_shader **ptr,
+_mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,
                        struct gl_shader *sh);
 
 extern struct gl_shader *
-_mesa_lookup_shader(GLcontext *ctx, GLuint name);
+_mesa_lookup_shader(struct gl_context *ctx, GLuint name);
 
 extern struct gl_shader *
-_mesa_lookup_shader_err(GLcontext *ctx, GLuint name, const char *caller);
+_mesa_lookup_shader_err(struct gl_context *ctx, GLuint name, const char *caller);
 
 
 
 extern void
-_mesa_reference_shader_program(GLcontext *ctx,
+_mesa_reference_shader_program(struct gl_context *ctx,
                                struct gl_shader_program **ptr,
                                struct gl_shader_program *shProg);
 extern void
-_mesa_init_shader(GLcontext *ctx, struct gl_shader *shader);
+_mesa_init_shader(struct gl_context *ctx, struct gl_shader *shader);
 
 extern struct gl_shader *
-_mesa_new_shader(GLcontext *ctx, GLuint name, GLenum type);
+_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type);
 
 extern void
-_mesa_init_shader_program(GLcontext *ctx, struct gl_shader_program *prog);
+_mesa_init_shader_program(struct gl_context *ctx, struct gl_shader_program *prog);
 
 extern struct gl_shader_program *
-_mesa_lookup_shader_program(GLcontext *ctx, GLuint name);
+_mesa_lookup_shader_program(struct gl_context *ctx, GLuint name);
 
 extern struct gl_shader_program *
-_mesa_lookup_shader_program_err(GLcontext *ctx, GLuint name,
+_mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
                                 const char *caller);
 
 extern void
-_mesa_clear_shader_program_data(GLcontext *ctx,
+_mesa_clear_shader_program_data(struct gl_context *ctx,
                                 struct gl_shader_program *shProg);
 
 extern void
-_mesa_free_shader_program_data(GLcontext *ctx,
+_mesa_free_shader_program_data(struct gl_context *ctx,
                                struct gl_shader_program *shProg);
 
 
@@ -91,10 +92,10 @@ extern void
 _mesa_init_shader_object_functions(struct dd_function_table *driver);
 
 extern void
-_mesa_init_shader_state(GLcontext *ctx);
+_mesa_init_shader_state(struct gl_context *ctx);
 
 extern void
-_mesa_free_shader_state(GLcontext *ctx);
+_mesa_free_shader_state(struct gl_context *ctx);
 
 static INLINE GLuint
 _mesa_shader_type_to_index(GLenum v)
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index a56c70fa7f6..3abee0178eb 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -52,7 +52,7 @@
  * failure.
  */
 struct gl_shared_state *
-_mesa_alloc_shared_state(GLcontext *ctx)
+_mesa_alloc_shared_state(struct gl_context *ctx)
 {
    struct gl_shared_state *shared;
    GLuint i;
@@ -133,7 +133,7 @@ static void
 delete_displaylist_cb(GLuint id, void *data, void *userData)
 {
    struct gl_display_list *list = (struct gl_display_list *) data;
-   GLcontext *ctx = (GLcontext *) userData;
+   struct gl_context *ctx = (struct gl_context *) userData;
    _mesa_delete_list(ctx, list);
 }
 
@@ -145,7 +145,7 @@ static void
 delete_texture_cb(GLuint id, void *data, void *userData)
 {
    struct gl_texture_object *texObj = (struct gl_texture_object *) data;
-   GLcontext *ctx = (GLcontext *) userData;
+   struct gl_context *ctx = (struct gl_context *) userData;
    ctx->Driver.DeleteTexture(ctx, texObj);
 }
 
@@ -157,7 +157,7 @@ static void
 delete_program_cb(GLuint id, void *data, void *userData)
 {
    struct gl_program *prog = (struct gl_program *) data;
-   GLcontext *ctx = (GLcontext *) userData;
+   struct gl_context *ctx = (struct gl_context *) userData;
    if(prog != &_mesa_DummyProgram) {
       ASSERT(prog->RefCount == 1); /* should only be referenced by hash table */
       prog->RefCount = 0;  /* now going away */
@@ -175,7 +175,7 @@ static void
 delete_fragshader_cb(GLuint id, void *data, void *userData)
 {
    struct ati_fragment_shader *shader = (struct ati_fragment_shader *) data;
-   GLcontext *ctx = (GLcontext *) userData;
+   struct gl_context *ctx = (struct gl_context *) userData;
    _mesa_delete_ati_fragment_shader(ctx, shader);
 }
 #endif
@@ -188,7 +188,7 @@ static void
 delete_bufferobj_cb(GLuint id, void *data, void *userData)
 {
    struct gl_buffer_object *bufObj = (struct gl_buffer_object *) data;
-   GLcontext *ctx = (GLcontext *) userData;
+   struct gl_context *ctx = (struct gl_context *) userData;
    if (_mesa_bufferobj_mapped(bufObj)) {
       ctx->Driver.UnmapBuffer(ctx, 0, bufObj);
       bufObj->Pointer = NULL;
@@ -204,7 +204,7 @@ delete_bufferobj_cb(GLuint id, void *data, void *userData)
 static void
 free_shader_program_data_cb(GLuint id, void *data, void *userData)
 {
-   GLcontext *ctx = (GLcontext *) userData;
+   struct gl_context *ctx = (struct gl_context *) userData;
    struct gl_shader_program *shProg = (struct gl_shader_program *) data;
 
    if (shProg->Type == GL_SHADER_PROGRAM_MESA) {
@@ -220,7 +220,7 @@ free_shader_program_data_cb(GLuint id, void *data, void *userData)
 static void
 delete_shader_cb(GLuint id, void *data, void *userData)
 {
-   GLcontext *ctx = (GLcontext *) userData;
+   struct gl_context *ctx = (struct gl_context *) userData;
    struct gl_shader *sh = (struct gl_shader *) data;
    if (sh->Type == GL_FRAGMENT_SHADER || sh->Type == GL_VERTEX_SHADER) {
       ctx->Driver.DeleteShader(ctx, sh);
@@ -280,7 +280,7 @@ delete_renderbuffer_cb(GLuint id, void *data, void *userData)
  * \sa alloc_shared_state().
  */
 static void
-free_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
+free_shared_state(struct gl_context *ctx, struct gl_shared_state *shared)
 {
    GLuint i;
 
@@ -373,7 +373,7 @@ free_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
  * \sa free_shared_state().
  */
 void
-_mesa_release_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
+_mesa_release_shared_state(struct gl_context *ctx, struct gl_shared_state *shared)
 {
    GLint RefCount;
 
diff --git a/src/mesa/main/shared.h b/src/mesa/main/shared.h
index 5166a0ce51f..43f8a388e6f 100644
--- a/src/mesa/main/shared.h
+++ b/src/mesa/main/shared.h
@@ -28,11 +28,11 @@
 #include "mtypes.h"
 
 struct gl_shared_state *
-_mesa_alloc_shared_state(GLcontext *ctx);
+_mesa_alloc_shared_state(struct gl_context *ctx);
 
 
 void
-_mesa_release_shared_state(GLcontext *ctx, struct gl_shared_state *shared);
+_mesa_release_shared_state(struct gl_context *ctx, struct gl_shared_state *shared);
 
 
 #endif
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 4a3dffe4cf8..5529732de07 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -27,7 +27,7 @@
  * \file state.c
  * State management.
  * 
- * This file manages recalculation of derived values in GLcontext.
+ * This file manages recalculation of derived values in struct gl_context.
  */
 
 
@@ -51,7 +51,7 @@
 
 
 static void
-update_separate_specular(GLcontext *ctx)
+update_separate_specular(struct gl_context *ctx)
 {
    if (NEED_SECONDARY_COLOR(ctx))
       ctx->_TriangleCaps |= DD_SEPARATE_SPECULAR;
@@ -107,7 +107,7 @@ update_min(GLuint min, struct gl_client_array *array)
  * Need to do this upon new array state or new buffer object state.
  */
 static void
-update_arrays( GLcontext *ctx )
+update_arrays( struct gl_context *ctx )
 {
    struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
    GLuint i, min = ~0;
@@ -219,7 +219,7 @@ update_arrays( GLcontext *ctx )
  * This needs to be done before texture state validation.
  */
 static void
-update_program_enables(GLcontext *ctx)
+update_program_enables(struct gl_context *ctx)
 {
    /* These _Enabled flags indicate if the program is enabled AND valid. */
    ctx->VertexProgram._Enabled = ctx->VertexProgram.Enabled
@@ -245,7 +245,7 @@ update_program_enables(GLcontext *ctx)
  * or fragment program is being used.
  */
 static GLbitfield
-update_program(GLcontext *ctx)
+update_program(struct gl_context *ctx)
 {
    const struct gl_shader_program *shProg = ctx->Shader.CurrentProgram;
    const struct gl_vertex_program *prevVP = ctx->VertexProgram._Current;
@@ -362,7 +362,7 @@ update_program(GLcontext *ctx)
  * Examine shader constants and return either _NEW_PROGRAM_CONSTANTS or 0.
  */
 static GLbitfield
-update_program_constants(GLcontext *ctx)
+update_program_constants(struct gl_context *ctx)
 {
    GLbitfield new_state = 0x0;
 
@@ -399,7 +399,7 @@ update_program_constants(GLcontext *ctx)
 
 
 static void
-update_viewport_matrix(GLcontext *ctx)
+update_viewport_matrix(struct gl_context *ctx)
 {
    const GLfloat depthMax = ctx->DrawBuffer->_DepthMaxF;
 
@@ -421,7 +421,7 @@ update_viewport_matrix(GLcontext *ctx)
  * Update derived multisample state.
  */
 static void
-update_multisample(GLcontext *ctx)
+update_multisample(struct gl_context *ctx)
 {
    ctx->Multisample._Enabled = GL_FALSE;
    if (ctx->Multisample.Enabled &&
@@ -435,7 +435,7 @@ update_multisample(GLcontext *ctx)
  * Update derived color/blend/logicop state.
  */
 static void
-update_color(GLcontext *ctx)
+update_color(struct gl_context *ctx)
 {
    /* This is needed to support 1.1's RGB logic ops AND
     * 1.0's blending logicops.
@@ -449,7 +449,7 @@ update_color(GLcontext *ctx)
  * in ctx->_TriangleCaps if needed.
  */
 static void
-update_polygon(GLcontext *ctx)
+update_polygon(struct gl_context *ctx)
 {
    ctx->_TriangleCaps &= ~(DD_TRI_CULL_FRONT_BACK | DD_TRI_OFFSET);
 
@@ -471,7 +471,7 @@ update_polygon(GLcontext *ctx)
  */
 #if 0
 static void
-update_tricaps(GLcontext *ctx, GLbitfield new_state)
+update_tricaps(struct gl_context *ctx, GLbitfield new_state)
 {
    ctx->_TriangleCaps = 0;
 
@@ -540,7 +540,7 @@ update_tricaps(GLcontext *ctx, GLbitfield new_state)
 
 /**
  * Compute derived GL state.
- * If __GLcontextRec::NewState is non-zero then this function \b must
+ * If __struct gl_contextRec::NewState is non-zero then this function \b must
  * be called before rendering anything.
  *
  * Calls dd_function_table::UpdateState to perform any internal state
@@ -551,7 +551,7 @@ update_tricaps(GLcontext *ctx, GLbitfield new_state)
  * _mesa_update_lighting() and _mesa_update_tnl_spaces().
  */
 void
-_mesa_update_state_locked( GLcontext *ctx )
+_mesa_update_state_locked( struct gl_context *ctx )
 {
    GLbitfield new_state = ctx->NewState;
    GLbitfield prog_flags = _NEW_PROGRAM;
@@ -670,7 +670,7 @@ _mesa_update_state_locked( GLcontext *ctx )
 /* This is the usual entrypoint for state updates:
  */
 void
-_mesa_update_state( GLcontext *ctx )
+_mesa_update_state( struct gl_context *ctx )
 {
    _mesa_lock_context_textures(ctx);
    _mesa_update_state_locked(ctx);
@@ -703,7 +703,7 @@ _mesa_update_state( GLcontext *ctx )
  * Otherwise, the fp should track them as state values instead.
  */
 void
-_mesa_set_varying_vp_inputs( GLcontext *ctx,
+_mesa_set_varying_vp_inputs( struct gl_context *ctx,
                              GLbitfield varying_inputs )
 {
    if (ctx->varying_vp_inputs != varying_inputs) {
@@ -721,7 +721,7 @@ _mesa_set_varying_vp_inputs( GLcontext *ctx,
  * of ordinary varyings/inputs.
  */
 void
-_mesa_set_vp_override(GLcontext *ctx, GLboolean flag)
+_mesa_set_vp_override(struct gl_context *ctx, GLboolean flag)
 {
    if (ctx->VertexProgram._Overriden != flag) {
       ctx->VertexProgram._Overriden = flag;
diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h
index 29db08a0b95..f0eb43d8ee3 100644
--- a/src/mesa/main/state.h
+++ b/src/mesa/main/state.h
@@ -29,21 +29,21 @@
 #include "mtypes.h"
 
 extern void
-_mesa_update_state(GLcontext *ctx);
+_mesa_update_state(struct gl_context *ctx);
 
 /* As above but can only be called between _mesa_lock_context_textures() and 
  * _mesa_unlock_context_textures().
  */
 extern void
-_mesa_update_state_locked(GLcontext *ctx);
+_mesa_update_state_locked(struct gl_context *ctx);
 
 
 extern void
-_mesa_set_varying_vp_inputs(GLcontext *ctx, GLbitfield varying_inputs);
+_mesa_set_varying_vp_inputs(struct gl_context *ctx, GLbitfield varying_inputs);
 
 
 extern void
-_mesa_set_vp_override(GLcontext *ctx, GLboolean flag);
+_mesa_set_vp_override(struct gl_context *ctx, GLboolean flag);
 
 
 #endif
diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c
index 15c98e20156..93e2e97ce0c 100644
--- a/src/mesa/main/stencil.c
+++ b/src/mesa/main/stencil.c
@@ -56,7 +56,7 @@
 
 
 static GLboolean
-validate_stencil_op(GLcontext *ctx, GLenum op)
+validate_stencil_op(struct gl_context *ctx, GLenum op)
 {
    switch (op) {
    case GL_KEEP:
@@ -79,7 +79,7 @@ validate_stencil_op(GLcontext *ctx, GLenum op)
 
 
 static GLboolean
-validate_stencil_func(GLcontext *ctx, GLenum func)
+validate_stencil_func(struct gl_context *ctx, GLenum func)
 {
    switch (func) {
    case GL_NEVER:
@@ -137,7 +137,7 @@ _mesa_ClearStencil( GLint s )
  * \sa glStencilFunc().
  *
  * Verifies the parameters and updates the respective values in
- * __GLcontextRec::Stencil. On change flushes the vertices and notifies the
+ * __struct gl_contextRec::Stencil. On change flushes the vertices and notifies the
  * driver via the dd_function_table::StencilFunc callback.
  */
 void GLAPIENTRY
@@ -192,7 +192,7 @@ _mesa_StencilFuncSeparateATI( GLenum frontfunc, GLenum backfunc, GLint ref, GLui
  * \sa glStencilFunc().
  *
  * Verifies the parameters and updates the respective values in
- * __GLcontextRec::Stencil. On change flushes the vertices and notifies the
+ * __struct gl_contextRec::Stencil. On change flushes the vertices and notifies the
  * driver via the dd_function_table::StencilFunc callback.
  */
 void GLAPIENTRY
@@ -312,7 +312,7 @@ _mesa_StencilMask( GLuint mask )
  * \sa glStencilOp().
  * 
  * Verifies the parameters and updates the respective fields in
- * __GLcontextRec::Stencil. On change flushes the vertices and notifies the
+ * __struct gl_contextRec::Stencil. On change flushes the vertices and notifies the
  * driver via the dd_function_table::StencilOp callback.
  */
 void GLAPIENTRY
@@ -532,7 +532,7 @@ _mesa_StencilMaskSeparate(GLenum face, GLuint mask)
  * Update derived stencil state.
  */
 void
-_mesa_update_stencil(GLcontext *ctx)
+_mesa_update_stencil(struct gl_context *ctx)
 {
    const GLint face = ctx->Stencil._BackFace;
 
@@ -556,10 +556,10 @@ _mesa_update_stencil(GLcontext *ctx)
  *
  * \param ctx GL context.
  *
- * Initializes __GLcontextRec::Stencil attribute group.
+ * Initializes __struct gl_contextRec::Stencil attribute group.
  */
 void
-_mesa_init_stencil(GLcontext *ctx)
+_mesa_init_stencil(struct gl_context *ctx)
 {
    ctx->Stencil.Enabled = GL_FALSE;
    ctx->Stencil.TestTwoSide = GL_FALSE;
diff --git a/src/mesa/main/stencil.h b/src/mesa/main/stencil.h
index 252ac932acd..38a7183a811 100644
--- a/src/mesa/main/stencil.h
+++ b/src/mesa/main/stencil.h
@@ -71,10 +71,10 @@ _mesa_StencilMaskSeparate(GLenum face, GLuint mask);
 
 
 extern void
-_mesa_update_stencil(GLcontext *ctx);
+_mesa_update_stencil(struct gl_context *ctx);
 
 
 extern void 
-_mesa_init_stencil( GLcontext * ctx );
+_mesa_init_stencil( struct gl_context * ctx );
 
 #endif
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index ac948cc1efe..2c8bcbeaf7c 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -66,7 +66,7 @@
 #include "syncobj.h"
 
 static struct gl_sync_object *
-_mesa_new_sync_object(GLcontext *ctx, GLenum type)
+_mesa_new_sync_object(struct gl_context *ctx, GLenum type)
 {
    struct gl_sync_object *s = MALLOC_STRUCT(gl_sync_object);
    (void) ctx;
@@ -77,7 +77,7 @@ _mesa_new_sync_object(GLcontext *ctx, GLenum type)
 
 
 static void
-_mesa_delete_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
+_mesa_delete_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
 {
    (void) ctx;
    free(syncObj);
@@ -85,7 +85,7 @@ _mesa_delete_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
 
 
 static void
-_mesa_fence_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
+_mesa_fence_sync(struct gl_context *ctx, struct gl_sync_object *syncObj,
 		 GLenum condition, GLbitfield flags)
 {
    (void) ctx;
@@ -97,7 +97,7 @@ _mesa_fence_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
 
 
 static void
-_mesa_check_sync(GLcontext *ctx, struct gl_sync_object *syncObj)
+_mesa_check_sync(struct gl_context *ctx, struct gl_sync_object *syncObj)
 {
    (void) ctx;
    (void) syncObj;
@@ -109,7 +109,7 @@ _mesa_check_sync(GLcontext *ctx, struct gl_sync_object *syncObj)
 
 
 static void
-_mesa_wait_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
+_mesa_wait_sync(struct gl_context *ctx, struct gl_sync_object *syncObj,
 		GLbitfield flags, GLuint64 timeout)
 {
    (void) ctx;
@@ -155,7 +155,7 @@ _mesa_init_sync_dispatch(struct _glapi_table *disp)
  * Allocate/init the context state related to sync objects.
  */
 void
-_mesa_init_sync(GLcontext *ctx)
+_mesa_init_sync(struct gl_context *ctx)
 {
    (void) ctx;
 }
@@ -165,7 +165,7 @@ _mesa_init_sync(GLcontext *ctx)
  * Free the context state related to sync objects.
  */
 void
-_mesa_free_sync_data(GLcontext *ctx)
+_mesa_free_sync_data(struct gl_context *ctx)
 {
    (void) ctx;
 }
@@ -181,7 +181,7 @@ _mesa_validate_sync(struct gl_sync_object *syncObj)
 
 
 void
-_mesa_ref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
+_mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
 {
    _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
    syncObj->RefCount++;
@@ -190,7 +190,7 @@ _mesa_ref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
 
 
 void
-_mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
+_mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
 {
    _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
    syncObj->RefCount--;
diff --git a/src/mesa/main/syncobj.h b/src/mesa/main/syncobj.h
index 82e141d408b..f3c0046cf3d 100644
--- a/src/mesa/main/syncobj.h
+++ b/src/mesa/main/syncobj.h
@@ -44,16 +44,16 @@ extern void
 _mesa_init_sync_dispatch(struct _glapi_table *disp);
 
 extern void
-_mesa_init_sync(GLcontext *);
+_mesa_init_sync(struct gl_context *);
 
 extern void
-_mesa_free_sync_data(GLcontext *);
+_mesa_free_sync_data(struct gl_context *);
 
 extern void
-_mesa_ref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj);
+_mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj);
 
 extern void
-_mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj);
+_mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj);
 
 extern GLboolean GLAPIENTRY
 _mesa_IsSync(GLsync sync);
@@ -89,23 +89,23 @@ _mesa_init_sync_dispatch(struct _glapi_table *disp)
 }
 
 static INLINE void
-_mesa_init_sync(GLcontext *ctx)
+_mesa_init_sync(struct gl_context *ctx)
 {
 }
 
 static INLINE void
-_mesa_free_sync_data(GLcontext *ctx)
+_mesa_free_sync_data(struct gl_context *ctx)
 {
 }
 
 static INLINE void
-_mesa_ref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
+_mesa_ref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
 {
    ASSERT_NO_FEATURE();
 }
 
 static INLINE void
-_mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
+_mesa_unref_sync_object(struct gl_context *ctx, struct gl_sync_object *syncObj)
 {
    ASSERT_NO_FEATURE();
 }
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index e911524cbc5..e3d2a786b3e 100644
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -50,7 +50,7 @@
  * \return number of formats.
  */
 GLuint
-_mesa_get_compressed_formats(GLcontext *ctx, GLint *formats, GLboolean all)
+_mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats, GLboolean all)
 {
    GLuint n = 0;
    if (ctx->Extensions.TDFX_texture_compression_FXT1) {
@@ -178,7 +178,7 @@ _mesa_glenum_to_compressed_format(GLenum format)
  * internal format unchanged.
  */
 GLenum
-_mesa_compressed_format_to_glenum(GLcontext *ctx, GLuint mesaFormat)
+_mesa_compressed_format_to_glenum(struct gl_context *ctx, GLuint mesaFormat)
 {
    switch (mesaFormat) {
 #if FEATURE_texture_fxt1
diff --git a/src/mesa/main/texcompress.h b/src/mesa/main/texcompress.h
index 5e73a3149bd..83856429c54 100644
--- a/src/mesa/main/texcompress.h
+++ b/src/mesa/main/texcompress.h
@@ -31,13 +31,13 @@
 #if _HAVE_FULL_GL
 
 extern GLuint
-_mesa_get_compressed_formats(GLcontext *ctx, GLint *formats, GLboolean all);
+_mesa_get_compressed_formats(struct gl_context *ctx, GLint *formats, GLboolean all);
 
 extern gl_format
 _mesa_glenum_to_compressed_format(GLenum format);
 
 extern GLenum
-_mesa_compressed_format_to_glenum(GLcontext *ctx, GLuint mesaFormat);
+_mesa_compressed_format_to_glenum(struct gl_context *ctx, GLuint mesaFormat);
 
 extern GLubyte *
 _mesa_compressed_image_address(GLint col, GLint row, GLint img,
diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index c8b45bd3a55..33f46d4c8bb 100644
--- a/src/mesa/main/texcompress_fxt1.c
+++ b/src/mesa/main/texcompress_fxt1.c
@@ -25,14 +25,13 @@
 
 /**
  * \file texcompress_fxt1.c
- * GL_EXT_texture_compression_fxt1 support.
+ * GL_3DFX_texture_compression_FXT1 support.
  */
 
 
 #include "glheader.h"
 #include "imports.h"
 #include "colormac.h"
-#include "convolve.h"
 #include "image.h"
 #include "macros.h"
 #include "mipmap.h"
@@ -86,7 +85,6 @@ _mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS)
                                              srcPacking);
       if (!tempImage)
          return GL_FALSE; /* out of memory */
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       pixels = tempImage;
       srcRowStride = 3 * srcWidth;
       srcFormat = GL_RGB;
@@ -143,7 +141,6 @@ _mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS)
                                              srcPacking);
       if (!tempImage)
          return GL_FALSE; /* out of memory */
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       pixels = tempImage;
       srcRowStride = 4 * srcWidth;
       srcFormat = GL_RGBA;
diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
index 8e059802625..0e893a59fa3 100644
--- a/src/mesa/main/texcompress_s3tc.c
+++ b/src/mesa/main/texcompress_s3tc.c
@@ -36,7 +36,6 @@
 #include "glheader.h"
 #include "imports.h"
 #include "colormac.h"
-#include "convolve.h"
 #include "dlopen.h"
 #include "image.h"
 #include "macros.h"
@@ -105,7 +104,7 @@ static void *dxtlibhandle = NULL;
 
 
 void
-_mesa_init_texture_s3tc( GLcontext *ctx )
+_mesa_init_texture_s3tc( struct gl_context *ctx )
 {
    /* called during context initialization */
    ctx->Mesa_DXTn = GL_FALSE;
@@ -167,7 +166,8 @@ _mesa_texstore_rgb_dxt1(TEXSTORE_PARAMS)
    const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */
    const GLchan *tempImage = NULL;
 
-   ASSERT(dstFormat == MESA_FORMAT_RGB_DXT1);
+   ASSERT(dstFormat == MESA_FORMAT_RGB_DXT1 ||
+          dstFormat == MESA_FORMAT_SRGB_DXT1);
    ASSERT(dstXoffset % 4 == 0);
    ASSERT(dstYoffset % 4 == 0);
    ASSERT(dstZoffset % 4 == 0);
@@ -187,7 +187,6 @@ _mesa_texstore_rgb_dxt1(TEXSTORE_PARAMS)
                                              srcPacking);
       if (!tempImage)
          return GL_FALSE; /* out of memory */
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       pixels = tempImage;
       srcRowStride = 3 * srcWidth;
       srcFormat = GL_RGB;
@@ -230,7 +229,8 @@ _mesa_texstore_rgba_dxt1(TEXSTORE_PARAMS)
    const GLint texWidth = dstRowStride * 4 / 8; /* a bit of a hack */
    const GLchan *tempImage = NULL;
 
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT1);
+   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT1 ||
+          dstFormat == MESA_FORMAT_SRGBA_DXT1);
    ASSERT(dstXoffset % 4 == 0);
    ASSERT(dstYoffset % 4 == 0);
    ASSERT(dstZoffset % 4 == 0);
@@ -250,7 +250,6 @@ _mesa_texstore_rgba_dxt1(TEXSTORE_PARAMS)
                                              srcPacking);
       if (!tempImage)
          return GL_FALSE; /* out of memory */
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       pixels = tempImage;
       srcRowStride = 4 * srcWidth;
       srcFormat = GL_RGBA;
@@ -292,7 +291,8 @@ _mesa_texstore_rgba_dxt3(TEXSTORE_PARAMS)
    const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */
    const GLchan *tempImage = NULL;
 
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT3);
+   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT3 ||
+          dstFormat == MESA_FORMAT_SRGBA_DXT3);
    ASSERT(dstXoffset % 4 == 0);
    ASSERT(dstYoffset % 4 == 0);
    ASSERT(dstZoffset % 4 == 0);
@@ -312,7 +312,6 @@ _mesa_texstore_rgba_dxt3(TEXSTORE_PARAMS)
                                              srcPacking);
       if (!tempImage)
          return GL_FALSE; /* out of memory */
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       pixels = tempImage;
       srcRowStride = 4 * srcWidth;
    }
@@ -353,7 +352,8 @@ _mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS)
    const GLint texWidth = dstRowStride * 4 / 16; /* a bit of a hack */
    const GLchan *tempImage = NULL;
 
-   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT5);
+   ASSERT(dstFormat == MESA_FORMAT_RGBA_DXT5 ||
+          dstFormat == MESA_FORMAT_SRGBA_DXT5);
    ASSERT(dstXoffset % 4 == 0);
    ASSERT(dstYoffset % 4 == 0);
    ASSERT(dstZoffset % 4 == 0);
@@ -373,7 +373,6 @@ _mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS)
                                              srcPacking);
       if (!tempImage)
          return GL_FALSE; /* out of memory */
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       pixels = tempImage;
       srcRowStride = 4 * srcWidth;
    }
diff --git a/src/mesa/main/texcompress_s3tc.h b/src/mesa/main/texcompress_s3tc.h
index 2e7688d3669..d0a5b186b71 100644
--- a/src/mesa/main/texcompress_s3tc.h
+++ b/src/mesa/main/texcompress_s3tc.h
@@ -76,7 +76,7 @@ _mesa_fetch_texel_2d_f_srgba_dxt5(const struct gl_texture_image *texImage,
                                   GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_init_texture_s3tc(GLcontext *ctx);
+_mesa_init_texture_s3tc(struct gl_context *ctx);
 
 #else /* FEATURE_texture_s3tc */
 
@@ -97,7 +97,7 @@ _mesa_init_texture_s3tc(GLcontext *ctx);
 #define _mesa_fetch_texel_2d_f_srgba_dxt5 NULL
 
 static INLINE void
-_mesa_init_texture_s3tc(GLcontext *ctx)
+_mesa_init_texture_s3tc(struct gl_context *ctx)
 {
 }
 
diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c
index 3a55128c736..508dbf4887d 100644
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -44,7 +44,7 @@
 
 /** Set texture env mode */
 static void
-set_env_mode(GLcontext *ctx,
+set_env_mode(struct gl_context *ctx,
              struct gl_texture_unit *texUnit,
              GLenum mode)
 {
@@ -89,7 +89,7 @@ set_env_mode(GLcontext *ctx,
 
 
 static void
-set_env_color(GLcontext *ctx,
+set_env_color(struct gl_context *ctx,
               struct gl_texture_unit *texUnit,
               const GLfloat *color)
 {
@@ -107,7 +107,7 @@ set_env_color(GLcontext *ctx,
 
 /** Set an RGB or A combiner mode/function */
 static void
-set_combiner_mode(GLcontext *ctx,
+set_combiner_mode(struct gl_context *ctx,
                   struct gl_texture_unit *texUnit,
                   GLenum pname, GLenum mode)
 {
@@ -181,7 +181,7 @@ set_combiner_mode(GLcontext *ctx,
 
 /** Set an RGB or A combiner source term */
 static void
-set_combiner_source(GLcontext *ctx,
+set_combiner_source(struct gl_context *ctx,
                     struct gl_texture_unit *texUnit,
                     GLenum pname, GLenum param)
 {
@@ -274,7 +274,7 @@ set_combiner_source(GLcontext *ctx,
 
 /** Set an RGB or A combiner operand term */
 static void
-set_combiner_operand(GLcontext *ctx,
+set_combiner_operand(struct gl_context *ctx,
                      struct gl_texture_unit *texUnit,
                      GLenum pname, GLenum param)
 {
@@ -360,7 +360,7 @@ set_combiner_operand(GLcontext *ctx,
 
 
 static void
-set_combiner_scale(GLcontext *ctx,
+set_combiner_scale(struct gl_context *ctx,
                    struct gl_texture_unit *texUnit,
                    GLenum pname, GLfloat scale)
 {
@@ -595,7 +595,7 @@ _mesa_TexEnviv( GLenum target, GLenum pname, const GLint *param )
  * \return  value of queried pname or -1 if error.
  */
 static GLint
-get_texenvi(GLcontext *ctx, const struct gl_texture_unit *texUnit,
+get_texenvi(struct gl_context *ctx, const struct gl_texture_unit *texUnit,
             GLenum pname)
 {
    switch (pname) {
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 20f02cefe94..4647a9c4405 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -62,7 +62,7 @@ struct texenvprog_cache_item
 };
 
 static GLboolean
-texenv_doing_secondary_color(GLcontext *ctx)
+texenv_doing_secondary_color(struct gl_context *ctx)
 {
    if (ctx->Light.Enabled &&
        (ctx->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR))
@@ -307,7 +307,7 @@ static GLuint translate_tex_src_bit( GLbitfield bit )
  * has access to.  The bitmask is later reduced to just those which
  * are actually referenced.
  */
-static GLbitfield get_fp_input_mask( GLcontext *ctx )
+static GLbitfield get_fp_input_mask( struct gl_context *ctx )
 {
    /* _NEW_PROGRAM */
    const GLboolean vertexShader = (ctx->Shader.CurrentProgram &&
@@ -407,7 +407,7 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
  * Examine current texture environment state and generate a unique
  * key to identify it.
  */
-static GLuint make_state_key( GLcontext *ctx,  struct state_key *key )
+static GLuint make_state_key( struct gl_context *ctx,  struct state_key *key )
 {
    GLuint i, j;
    GLbitfield inputs_referenced = FRAG_BIT_COL0;
@@ -663,7 +663,7 @@ static void reserve_temp( struct texenv_fragment_program *p, struct ureg r )
 }
 
 
-static void release_temps(GLcontext *ctx, struct texenv_fragment_program *p )
+static void release_temps(struct gl_context *ctx, struct texenv_fragment_program *p )
 {
    GLuint max_temp = ctx->Const.FragmentProgram.MaxTemps;
 
@@ -1415,7 +1415,7 @@ load_texunit_bumpmap( struct texenv_fragment_program *p, GLuint unit )
  * current texture env/combine mode.
  */
 static void
-create_new_program(GLcontext *ctx, struct state_key *key,
+create_new_program(struct gl_context *ctx, struct state_key *key,
                    struct gl_fragment_program *program)
 {
    struct prog_instruction instBuffer[MAX_INSTRUCTIONS];
@@ -1526,7 +1526,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
    emit_arith( &p, OPCODE_END, undef, WRITEMASK_XYZW, 0, undef, undef, undef);
 
    if (key->fog_enabled) {
-      /* Pull fog mode from GLcontext, the value in the state key is
+      /* Pull fog mode from struct gl_context, the value in the state key is
        * a reduced value and not what is expected in FogOption
        */
       p.program->FogOption = ctx->Fog.Mode;
@@ -1590,7 +1590,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
  * fixed-function texture, fog and color-sum operations.
  */
 struct gl_fragment_program *
-_mesa_get_fixed_func_fragment_program(GLcontext *ctx)
+_mesa_get_fixed_func_fragment_program(struct gl_context *ctx)
 {
    struct gl_fragment_program *prog;
    struct state_key key;
diff --git a/src/mesa/main/texenvprogram.h b/src/mesa/main/texenvprogram.h
index 0a162d2e7a2..abfb916d21b 100644
--- a/src/mesa/main/texenvprogram.h
+++ b/src/mesa/main/texenvprogram.h
@@ -30,6 +30,6 @@
 #include "mtypes.h"
 
 extern struct gl_fragment_program *
-_mesa_get_fixed_func_fragment_program(GLcontext *ctx);
+_mesa_get_fixed_func_fragment_program(struct gl_context *ctx);
 
 #endif
diff --git a/src/mesa/main/texfetch.c b/src/mesa/main/texfetch.c
index c03bc71cd7a..aa3a6961b64 100644
--- a/src/mesa/main/texfetch.c
+++ b/src/mesa/main/texfetch.c
@@ -314,6 +314,48 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       store_texel_ycbcr_rev
    },
    {
+      MESA_FORMAT_R8,
+      fetch_texel_1d_f_r8,
+      fetch_texel_2d_f_r8,
+      fetch_texel_3d_f_r8,
+      store_texel_r8,
+   },
+   {
+      MESA_FORMAT_RG88,
+      fetch_texel_1d_f_rg88,
+      fetch_texel_2d_f_rg88,
+      fetch_texel_3d_f_rg88,
+      store_texel_rg88,
+   },
+   {
+      MESA_FORMAT_RG88_REV,
+      fetch_texel_1d_f_rg88_rev,
+      fetch_texel_2d_f_rg88_rev,
+      fetch_texel_3d_f_rg88_rev,
+      store_texel_rg88_rev,
+   },
+   {
+      MESA_FORMAT_R16,
+      fetch_texel_1d_f_r16,
+      fetch_texel_2d_f_r16,
+      fetch_texel_3d_f_r16,
+      store_texel_r16,
+   },
+   {
+      MESA_FORMAT_RG1616,
+      fetch_texel_1d_f_rg1616,
+      fetch_texel_2d_f_rg1616,
+      fetch_texel_3d_f_rg1616,
+      store_texel_rg1616,
+   },
+   {
+      MESA_FORMAT_RG1616_REV,
+      fetch_texel_1d_f_rg1616_rev,
+      fetch_texel_2d_f_rg1616_rev,
+      fetch_texel_3d_f_rg1616_rev,
+      store_texel_rg1616_rev,
+   },
+   {
       MESA_FORMAT_Z24_S8,
       fetch_texel_1d_f_z24_s8,
       fetch_texel_2d_f_z24_s8,
diff --git a/src/mesa/main/texfetch_tmp.h b/src/mesa/main/texfetch_tmp.h
index f943554370f..2f583ed5223 100644
--- a/src/mesa/main/texfetch_tmp.h
+++ b/src/mesa/main/texfetch_tmp.h
@@ -810,6 +810,54 @@ static void store_texel_argb1555_rev(struct gl_texture_image *texImage,
 #endif
 
 
+/* MESA_FORMAT_RG88 **********************************************************/
+
+/* Fetch texel from 1D, 2D or 3D rg88 texture, return 4 GLchans */
+static void FETCH(f_rg88)( const struct gl_texture_image *texImage,
+                           GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
+   texel[RCOMP] = UBYTE_TO_FLOAT( s & 0xff );
+   texel[GCOMP] = UBYTE_TO_FLOAT( s >> 8 );
+   texel[BCOMP] = 0.0;
+   texel[ACOMP] = 1.0;
+}
+
+#if DIM == 3
+static void store_texel_rg88(struct gl_texture_image *texImage,
+                             GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLubyte *rgba = (const GLubyte *) texel;
+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
+   *dst = PACK_COLOR_88(rgba[RCOMP], rgba[GCOMP]);
+}
+#endif
+
+
+/* MESA_FORMAT_RG88_REV ******************************************************/
+
+/* Fetch texel from 1D, 2D or 3D rg88_rev texture, return 4 GLchans */
+static void FETCH(f_rg88_rev)( const struct gl_texture_image *texImage,
+                           GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
+   texel[RCOMP] = UBYTE_TO_FLOAT( s & 0xff );
+   texel[GCOMP] = UBYTE_TO_FLOAT( s >> 8 );
+   texel[BCOMP] = 0.0;
+   texel[ACOMP] = 1.0;
+}
+
+#if DIM == 3
+static void store_texel_rg88_rev(struct gl_texture_image *texImage,
+                             GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLubyte *rgba = (const GLubyte *) texel;
+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
+   *dst = PACK_COLOR_88(rgba[GCOMP], rgba[RCOMP]);
+}
+#endif
+
+
 /* MESA_FORMAT_AL88 **********************************************************/
 
 /* Fetch texel from 1D, 2D or 3D al88 texture, return 4 GLchans */
@@ -834,6 +882,54 @@ static void store_texel_al88(struct gl_texture_image *texImage,
 #endif
 
 
+/* MESA_FORMAT_R8 ************************************************************/
+
+/* Fetch texel from 1D, 2D or 3D rg88 texture, return 4 GLchans */
+static void FETCH(f_r8)(const struct gl_texture_image *texImage,
+			GLint i, GLint j, GLint k, GLfloat *texel)
+{
+   const GLubyte s = *TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
+   texel[RCOMP] = UBYTE_TO_FLOAT(s);
+   texel[GCOMP] = 0.0;
+   texel[BCOMP] = 0.0;
+   texel[ACOMP] = 1.0;
+}
+
+#if DIM == 3
+static void store_texel_r8(struct gl_texture_image *texImage,
+			   GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLubyte *rgba = (const GLubyte *) texel;
+   GLubyte *dst = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
+   *dst = rgba[RCOMP];
+}
+#endif
+
+
+/* MESA_FORMAT_R16 ***********************************************************/
+
+/* Fetch texel from 1D, 2D or 3D r16 texture, return 4 GLchans */
+static void FETCH(f_r16)(const struct gl_texture_image *texImage,
+			GLint i, GLint j, GLint k, GLfloat *texel)
+{
+   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
+   texel[RCOMP] = USHORT_TO_FLOAT(s);
+   texel[GCOMP] = 0.0;
+   texel[BCOMP] = 0.0;
+   texel[ACOMP] = 1.0;
+}
+
+#if DIM == 3
+static void store_texel_r16(struct gl_texture_image *texImage,
+			    GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLushort *rgba = (const GLushort *) texel;
+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
+   *dst = rgba[RCOMP];
+}
+#endif
+
+
 /* MESA_FORMAT_AL88_REV ******************************************************/
 
 /* Fetch texel from 1D, 2D or 3D al88_rev texture, return 4 GLchans */
@@ -858,6 +954,54 @@ static void store_texel_al88_rev(struct gl_texture_image *texImage,
 #endif
 
 
+/* MESA_FORMAT_RG1616 ********************************************************/
+
+/* Fetch texel from 1D, 2D or 3D rg1616 texture, return 4 GLchans */
+static void FETCH(f_rg1616)( const struct gl_texture_image *texImage,
+                           GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+   texel[RCOMP] = USHORT_TO_FLOAT( s & 0xffff );
+   texel[GCOMP] = USHORT_TO_FLOAT( s >> 16 );
+   texel[BCOMP] = 0.0;
+   texel[ACOMP] = 1.0;
+}
+
+#if DIM == 3
+static void store_texel_rg1616(struct gl_texture_image *texImage,
+                             GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLubyte *rgba = (const GLubyte *) texel;
+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
+   *dst = PACK_COLOR_1616(rgba[RCOMP], rgba[GCOMP]);
+}
+#endif
+
+
+/* MESA_FORMAT_RG1616_REV ****************************************************/
+
+/* Fetch texel from 1D, 2D or 3D rg1616_rev texture, return 4 GLchans */
+static void FETCH(f_rg1616_rev)( const struct gl_texture_image *texImage,
+                           GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+   texel[RCOMP] = USHORT_TO_FLOAT( s >> 16 );
+   texel[GCOMP] = USHORT_TO_FLOAT( s & 0xffff );
+   texel[BCOMP] = 0.0;
+   texel[ACOMP] = 1.0;
+}
+
+#if DIM == 3
+static void store_texel_rg1616_rev(struct gl_texture_image *texImage,
+                             GLint i, GLint j, GLint k, const void *texel)
+{
+   const GLubyte *rgba = (const GLubyte *) texel;
+   GLushort *dst = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
+   *dst = PACK_COLOR_1616(rgba[GCOMP], rgba[RCOMP]);
+}
+#endif
+
+
 /* MESA_FORMAT_AL1616 ********************************************************/
 
 /* Fetch texel from 1D, 2D or 3D al1616 texture, return 4 GLchans */
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index b9271ef58ef..894c0130b47 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -54,7 +54,7 @@
  * will typically override this function with a specialized version.
  */
 gl_format
-_mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
+_mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
                          GLenum format, GLenum type )
 {
    (void) format;
@@ -429,6 +429,29 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
       }
    }
 
+   if (ctx->Extensions.ARB_texture_rg) {
+      switch (internalFormat) {
+      case GL_R8:
+      case GL_RED:
+      case GL_COMPRESSED_RED:
+	 return MESA_FORMAT_R8;
+
+      case GL_R16:
+         return MESA_FORMAT_R16;
+
+      case GL_RG:
+      case GL_RG8:
+      case GL_COMPRESSED_RG:
+	 return MESA_FORMAT_RG88;
+
+      case GL_RG16:
+	 return MESA_FORMAT_RG1616;
+
+      default:
+         ; /* fallthrough */
+      }
+   }
+
    _mesa_problem(ctx, "unexpected format in _mesa_choose_tex_format()");
    return MESA_FORMAT_NONE;
 }
diff --git a/src/mesa/main/texformat.h b/src/mesa/main/texformat.h
index bda5fd6d8ce..8bd15076753 100644
--- a/src/mesa/main/texformat.h
+++ b/src/mesa/main/texformat.h
@@ -32,7 +32,7 @@
 
 
 extern gl_format
-_mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
+_mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
                          GLenum format, GLenum type );
 
 
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 00134ea9ffb..30d1062a415 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -63,7 +63,7 @@ type_with_negative_values(GLenum type)
  * glGetTexImage for color index pixels.
  */
 static void
-get_tex_color_index(GLcontext *ctx, GLuint dimensions,
+get_tex_color_index(struct gl_context *ctx, GLuint dimensions,
                     GLenum format, GLenum type, GLvoid *pixels,
                     const struct gl_texture_image *texImage)
 {
@@ -111,7 +111,7 @@ get_tex_color_index(GLcontext *ctx, GLuint dimensions,
  * glGetTexImage for depth/Z pixels.
  */
 static void
-get_tex_depth(GLcontext *ctx, GLuint dimensions,
+get_tex_depth(struct gl_context *ctx, GLuint dimensions,
               GLenum format, GLenum type, GLvoid *pixels,
               const struct gl_texture_image *texImage)
 {
@@ -141,7 +141,7 @@ get_tex_depth(GLcontext *ctx, GLuint dimensions,
  * glGetTexImage for depth/stencil pixels.
  */
 static void
-get_tex_depth_stencil(GLcontext *ctx, GLuint dimensions,
+get_tex_depth_stencil(struct gl_context *ctx, GLuint dimensions,
                       GLenum format, GLenum type, GLvoid *pixels,
                       const struct gl_texture_image *texImage)
 {
@@ -171,7 +171,7 @@ get_tex_depth_stencil(GLcontext *ctx, GLuint dimensions,
  * glGetTexImage for YCbCr pixels.
  */
 static void
-get_tex_ycbcr(GLcontext *ctx, GLuint dimensions,
+get_tex_ycbcr(struct gl_context *ctx, GLuint dimensions,
               GLenum format, GLenum type, GLvoid *pixels,
               const struct gl_texture_image *texImage)
 {
@@ -234,7 +234,7 @@ linear_to_nonlinear(GLfloat cl)
  * glGetTexImagefor sRGB pixels;
  */
 static void
-get_tex_srgb(GLcontext *ctx, GLuint dimensions,
+get_tex_srgb(struct gl_context *ctx, GLuint dimensions,
              GLenum format, GLenum type, GLvoid *pixels,
              const struct gl_texture_image *texImage)
 {
@@ -285,7 +285,7 @@ get_tex_srgb(GLcontext *ctx, GLuint dimensions,
 
 
 static INLINE void
-get_tex_srgb(GLcontext *ctx, GLuint dimensions,
+get_tex_srgb(struct gl_context *ctx, GLuint dimensions,
              GLenum format, GLenum type, GLvoid *pixels,
              const struct gl_texture_image *texImage)
 {
@@ -301,7 +301,7 @@ get_tex_srgb(GLcontext *ctx, GLuint dimensions,
  * This is the slow way since we use texture sampling.
  */
 static void
-get_tex_rgba(GLcontext *ctx, GLuint dimensions,
+get_tex_rgba(struct gl_context *ctx, GLuint dimensions,
              GLenum format, GLenum type, GLvoid *pixels,
              const struct gl_texture_image *texImage)
 {
@@ -371,7 +371,7 @@ get_tex_rgba(GLcontext *ctx, GLuint dimensions,
  * \return GL_TRUE if done, GL_FALSE otherwise
  */
 static GLboolean
-get_tex_memcpy(GLcontext *ctx, GLenum format, GLenum type, GLvoid *pixels,
+get_tex_memcpy(struct gl_context *ctx, GLenum format, GLenum type, GLvoid *pixels,
                const struct gl_texture_object *texObj,
                const struct gl_texture_image *texImage)
 {
@@ -451,7 +451,7 @@ get_tex_memcpy(GLcontext *ctx, GLenum format, GLenum type, GLvoid *pixels,
  * The texture image must be mapped.
  */
 void
-_mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
+_mesa_get_teximage(struct gl_context *ctx, GLenum target, GLint level,
                    GLenum format, GLenum type, GLvoid *pixels,
                    struct gl_texture_object *texObj,
                    struct gl_texture_image *texImage)
@@ -528,7 +528,7 @@ _mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
  * All error checking will have been done before this routine is called.
  */
 void
-_mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level,
+_mesa_get_compressed_teximage(struct gl_context *ctx, GLenum target, GLint level,
                               GLvoid *img,
                               struct gl_texture_object *texObj,
                               struct gl_texture_image *texImage)
@@ -585,7 +585,7 @@ _mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level,
  * \return GL_TRUE if any error, GL_FALSE if no errors.
  */
 static GLboolean
-getteximage_error_check(GLcontext *ctx, GLenum target, GLint level,
+getteximage_error_check(struct gl_context *ctx, GLenum target, GLint level,
                         GLenum format, GLenum type, GLvoid *pixels )
 {
    struct gl_texture_object *texObj;
@@ -771,7 +771,7 @@ _mesa_GetTexImage( GLenum target, GLint level, GLenum format,
  * \return GL_TRUE if any error, GL_FALSE if no errors.
  */
 static GLboolean
-getcompressedteximage_error_check(GLcontext *ctx, GLenum target, GLint level,
+getcompressedteximage_error_check(struct gl_context *ctx, GLenum target, GLint level,
                                   GLvoid *img)
 {
    struct gl_texture_object *texObj;
diff --git a/src/mesa/main/texgetimage.h b/src/mesa/main/texgetimage.h
index 866ab704945..81a3bbbd9a7 100644
--- a/src/mesa/main/texgetimage.h
+++ b/src/mesa/main/texgetimage.h
@@ -30,14 +30,14 @@
 #include "mtypes.h"
 
 extern void
-_mesa_get_teximage(GLcontext *ctx, GLenum target, GLint level,
+_mesa_get_teximage(struct gl_context *ctx, GLenum target, GLint level,
                    GLenum format, GLenum type, GLvoid *pixels,
                    struct gl_texture_object *texObj,
                    struct gl_texture_image *texImage);
 
 
 extern void
-_mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level,
+_mesa_get_compressed_teximage(struct gl_context *ctx, GLenum target, GLint level,
                               GLvoid *img,
                               struct gl_texture_object *texObj,
                               struct gl_texture_image *texImage);
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index ca1bd6096e2..bc66e5d76e0 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -33,7 +33,6 @@
 #include "glheader.h"
 #include "bufferobj.h"
 #include "context.h"
-#include "convolve.h"
 #include "enums.h"
 #include "fbobject.h"
 #include "framebuffer.h"
@@ -128,7 +127,7 @@ logbase2( int n )
  * XXX this could be static
  */
 GLint
-_mesa_base_tex_format( GLcontext *ctx, GLint internalFormat )
+_mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat )
 {
    switch (internalFormat) {
       case GL_ALPHA:
@@ -404,29 +403,54 @@ _mesa_base_tex_format( GLcontext *ctx, GLint internalFormat )
 
    if (ctx->Extensions.ARB_texture_rg) {
       switch (internalFormat) {
-      case GL_R8:
-      case GL_R16:
       case GL_R16F:
+	 /* R16F depends on both ARB_half_float_pixel and ARB_texture_float.
+	  */
+	 if (!ctx->Extensions.ARB_half_float_pixel)
+	    break;
+	 /* FALLTHROUGH */
       case GL_R32F:
+	 if (!ctx->Extensions.ARB_texture_float)
+	    break;
+         return GL_RED;
       case GL_R8I:
       case GL_R8UI:
       case GL_R16I:
       case GL_R16UI:
       case GL_R32I:
       case GL_R32UI:
-         return GL_R;
-      case GL_RG:
-      case GL_RG_INTEGER:
-      case GL_RG8:
-      case GL_RG16:
+	 if (!ctx->Extensions.EXT_texture_integer)
+	    break;
+	 /* FALLTHROUGH */
+      case GL_R8:
+      case GL_R16:
+      case GL_RED:
+      case GL_COMPRESSED_RED:
+         return GL_RED;
+
       case GL_RG16F:
+	 /* RG16F depends on both ARB_half_float_pixel and ARB_texture_float.
+	  */
+	 if (!ctx->Extensions.ARB_half_float_pixel)
+	    break;
+	 /* FALLTHROUGH */
       case GL_RG32F:
+	 if (!ctx->Extensions.ARB_texture_float)
+	    break;
+         return GL_RG;
       case GL_RG8I:
       case GL_RG8UI:
       case GL_RG16I:
       case GL_RG16UI:
       case GL_RG32I:
       case GL_RG32UI:
+	 if (!ctx->Extensions.EXT_texture_integer)
+	    break;
+	 /* FALLTHROUGH */
+      case GL_RG:
+      case GL_RG8:
+      case GL_RG16:
+      case GL_COMPRESSED_RG:
          return GL_RG;
       default:
          ; /* fallthrough */
@@ -462,15 +486,13 @@ _mesa_base_tex_format( GLcontext *ctx, GLint internalFormat )
       }
    }
 
-   if (ctx->Extensions.EXT_texture_compression_rgtc) {
+   if (ctx->Extensions.ARB_texture_compression_rgtc) {
       switch (internalFormat) {
-      case GL_COMPRESSED_RED:
-      case GL_COMPRESSED_RED_RGTC1_EXT:
-      case GL_COMPRESSED_SIGNED_RED_RGTC1_EXT:
+      case GL_COMPRESSED_RED_RGTC1:
+      case GL_COMPRESSED_SIGNED_RED_RGTC1:
          return GL_RED;
-      case GL_COMPRESSED_RG:
-      case GL_COMPRESSED_RED_GREEN_RGTC2_EXT:
-      case GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT:
+      case GL_COMPRESSED_RG_RGTC2:
+      case GL_COMPRESSED_SIGNED_RG_RGTC2:
          return GL_RG;
       default:
          ; /* fallthrough */
@@ -536,7 +558,7 @@ _mesa_set_tex_image(struct gl_texture_object *tObj,
  * zero.
  */
 struct gl_texture_image *
-_mesa_new_texture_image( GLcontext *ctx )
+_mesa_new_texture_image( struct gl_context *ctx )
 {
    (void) ctx;
    return CALLOC_STRUCT(gl_texture_image);
@@ -552,7 +574,7 @@ _mesa_new_texture_image( GLcontext *ctx )
  * Free the texture image data if it's not marked as client data.
  */
 void
-_mesa_free_texture_image_data(GLcontext *ctx,
+_mesa_free_texture_image_data(struct gl_context *ctx,
                               struct gl_texture_image *texImage)
 {
    (void) ctx;
@@ -574,7 +596,7 @@ _mesa_free_texture_image_data(GLcontext *ctx,
  * Free the texture image structure and the associated image data.
  */
 void
-_mesa_delete_texture_image( GLcontext *ctx, struct gl_texture_image *texImage )
+_mesa_delete_texture_image( struct gl_context *ctx, struct gl_texture_image *texImage )
 {
    /* Free texImage->Data and/or any other driver-specific texture
     * image storage.
@@ -624,7 +646,7 @@ _mesa_is_proxy_texture(GLenum target)
  * \sa gl_texture_unit.
  */
 struct gl_texture_object *
-_mesa_select_tex_object(GLcontext *ctx, const struct gl_texture_unit *texUnit,
+_mesa_select_tex_object(struct gl_context *ctx, const struct gl_texture_unit *texUnit,
                         GLenum target)
 {
    switch (target) {
@@ -681,7 +703,7 @@ _mesa_select_tex_object(GLcontext *ctx, const struct gl_texture_unit *texUnit,
  * Return pointer to texture object for given target on current texture unit.
  */
 struct gl_texture_object *
-_mesa_get_current_tex_object(GLcontext *ctx, GLenum target)
+_mesa_get_current_tex_object(struct gl_context *ctx, GLenum target)
 {
    struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);
    return _mesa_select_tex_object(ctx, texUnit, target);
@@ -701,7 +723,7 @@ _mesa_get_current_tex_object(GLcontext *ctx, GLenum target)
  * \return pointer to the texture image structure, or NULL on failure.
  */
 struct gl_texture_image *
-_mesa_select_tex_image(GLcontext *ctx, const struct gl_texture_object *texObj,
+_mesa_select_tex_image(struct gl_context *ctx, const struct gl_texture_object *texObj,
 		       GLenum target, GLint level)
 {
    const GLuint face = _mesa_tex_target_to_face(target);
@@ -720,7 +742,7 @@ _mesa_select_tex_image(GLcontext *ctx, const struct gl_texture_object *texObj,
  * out of memory.
  */
 struct gl_texture_image *
-_mesa_get_tex_image(GLcontext *ctx, struct gl_texture_object *texObj,
+_mesa_get_tex_image(struct gl_context *ctx, struct gl_texture_object *texObj,
                     GLenum target, GLint level)
 {
    struct gl_texture_image *texImage;
@@ -750,7 +772,7 @@ _mesa_get_tex_image(GLcontext *ctx, struct gl_texture_object *texObj,
  *         level, or out of memory.
  */
 struct gl_texture_image *
-_mesa_get_proxy_tex_image(GLcontext *ctx, GLenum target, GLint level)
+_mesa_get_proxy_tex_image(struct gl_context *ctx, GLenum target, GLint level)
 {
    struct gl_texture_image *texImage;
    GLuint texIndex;
@@ -825,7 +847,7 @@ _mesa_get_proxy_tex_image(GLcontext *ctx, GLenum target, GLint level)
  * \sa gl_constants.
  */
 GLint
-_mesa_max_texture_levels(GLcontext *ctx, GLenum target)
+_mesa_max_texture_levels(struct gl_context *ctx, GLenum target)
 {
    switch (target) {
    case GL_TEXTURE_1D:
@@ -971,7 +993,7 @@ clear_teximage_fields(struct gl_texture_image *img)
  * Note: width, height and depth include the border.
  */
 void
-_mesa_init_teximage_fields(GLcontext *ctx, GLenum target,
+_mesa_init_teximage_fields(struct gl_context *ctx, GLenum target,
                            struct gl_texture_image *img,
                            GLsizei width, GLsizei height, GLsizei depth,
                            GLint border, GLenum internalFormat)
@@ -1062,7 +1084,7 @@ _mesa_init_teximage_fields(GLcontext *ctx, GLenum target,
  * fields are cleared so that its parent object will test incomplete.
  */
 void
-_mesa_clear_texture_image(GLcontext *ctx, struct gl_texture_image *texImage)
+_mesa_clear_texture_image(struct gl_context *ctx, struct gl_texture_image *texImage)
 {
    ctx->Driver.FreeTexImageData(ctx, texImage);
    clear_teximage_fields(texImage);
@@ -1094,7 +1116,7 @@ _mesa_clear_texture_image(GLcontext *ctx, struct gl_texture_image *texImage)
  * \return GL_TRUE if the image is acceptable, GL_FALSE if not acceptable.
  */
 GLboolean
-_mesa_test_proxy_teximage(GLcontext *ctx, GLenum target, GLint level,
+_mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
                           GLint internalFormat, GLenum format, GLenum type,
                           GLint width, GLint height, GLint depth, GLint border)
 {
@@ -1206,7 +1228,7 @@ _mesa_test_proxy_teximage(GLcontext *ctx, GLenum target, GLint level,
  * Helper function to determine whether a target supports compressed textures
  */
 static GLboolean
-target_can_be_compressed(GLcontext *ctx, GLenum target)
+target_can_be_compressed(struct gl_context *ctx, GLenum target)
 {
    return (((target == GL_TEXTURE_2D || target == GL_PROXY_TEXTURE_2D))
            || ((ctx->Extensions.ARB_texture_cube_map &&
@@ -1237,11 +1259,11 @@ target_can_be_compressed(GLcontext *ctx, GLenum target)
  * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.
  *
  * Verifies each of the parameters against the constants specified in
- * __GLcontextRec::Const and the supported extensions, and according to the
+ * __struct gl_contextRec::Const and the supported extensions, and according to the
  * OpenGL specification.
  */
 static GLboolean
-texture_error_check( GLcontext *ctx, GLenum target,
+texture_error_check( struct gl_context *ctx, GLenum target,
                      GLint level, GLint internalFormat,
                      GLenum format, GLenum type,
                      GLuint dimensions,
@@ -1484,11 +1506,11 @@ texture_error_check( GLcontext *ctx, GLenum target,
  * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.
  *
  * Verifies each of the parameters against the constants specified in
- * __GLcontextRec::Const and the supported extensions, and according to the
+ * __struct gl_contextRec::Const and the supported extensions, and according to the
  * OpenGL specification.
  */
 static GLboolean
-subtexture_error_check( GLcontext *ctx, GLuint dimensions,
+subtexture_error_check( struct gl_context *ctx, GLuint dimensions,
                         GLenum target, GLint level,
                         GLint xoffset, GLint yoffset, GLint zoffset,
                         GLint width, GLint height, GLint depth,
@@ -1581,7 +1603,7 @@ subtexture_error_check( GLcontext *ctx, GLuint dimensions,
  * \return GL_TRUE if error recorded, GL_FALSE otherwise
  */
 static GLboolean
-subtexture_error_check2( GLcontext *ctx, GLuint dimensions,
+subtexture_error_check2( struct gl_context *ctx, GLuint dimensions,
 			 GLenum target, GLint level,
 			 GLint xoffset, GLint yoffset, GLint zoffset,
 			 GLint width, GLint height, GLint depth,
@@ -1679,11 +1701,11 @@ subtexture_error_check2( GLcontext *ctx, GLuint dimensions,
  * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.
  * 
  * Verifies each of the parameters against the constants specified in
- * __GLcontextRec::Const and the supported extensions, and according to the
+ * __struct gl_contextRec::Const and the supported extensions, and according to the
  * OpenGL specification.
  */
 static GLboolean
-copytexture_error_check( GLcontext *ctx, GLuint dimensions,
+copytexture_error_check( struct gl_context *ctx, GLuint dimensions,
                          GLenum target, GLint level, GLint internalFormat,
                          GLint width, GLint height, GLint border )
 {
@@ -1858,7 +1880,7 @@ copytexture_error_check( GLcontext *ctx, GLuint dimensions,
  * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.
  */
 static GLboolean
-copytexsubimage_error_check1( GLcontext *ctx, GLuint dimensions,
+copytexsubimage_error_check1( struct gl_context *ctx, GLuint dimensions,
                               GLenum target, GLint level)
 {
    /* Check that the source buffer is complete */
@@ -1932,7 +1954,7 @@ copytexsubimage_error_check1( GLcontext *ctx, GLuint dimensions,
  * \param height image height given by the user.
  */
 static GLboolean
-copytexsubimage_error_check2( GLcontext *ctx, GLuint dimensions,
+copytexsubimage_error_check2( struct gl_context *ctx, GLuint dimensions,
 			      GLenum target, GLint level,
 			      GLint xoffset, GLint yoffset, GLint zoffset,
 			      GLsizei width, GLsizei height,
@@ -2059,7 +2081,7 @@ copytexsubimage_error_check2( GLcontext *ctx, GLuint dimensions,
 /** Callback info for walking over FBO hash table */
 struct cb_info
 {
-   GLcontext *ctx;
+   struct gl_context *ctx;
    struct gl_texture_object *texObj;
    GLuint level, face;
 };
@@ -2073,7 +2095,7 @@ check_rtt_cb(GLuint key, void *data, void *userData)
 {
    struct gl_framebuffer *fb = (struct gl_framebuffer *) data;
    const struct cb_info *info = (struct cb_info *) userData;
-   GLcontext *ctx = info->ctx;
+   struct gl_context *ctx = info->ctx;
    const struct gl_texture_object *texObj = info->texObj;
    const GLuint level = info->level, face = info->face;
 
@@ -2105,7 +2127,7 @@ check_rtt_cb(GLuint key, void *data, void *userData)
  * Any FBOs rendering into the texture must be re-validated.
  */
 static void
-update_fbo_texture(GLcontext *ctx, struct gl_texture_object *texObj,
+update_fbo_texture(struct gl_context *ctx, struct gl_texture_object *texObj,
                    GLuint face, GLuint level)
 {
    /* Only check this texture if it's been marked as RenderToTexture */
@@ -2126,7 +2148,7 @@ update_fbo_texture(GLcontext *ctx, struct gl_texture_object *texObj,
  * mipmap levels now.
  */
 static INLINE void
-check_gen_mipmap(GLcontext *ctx, GLenum target,
+check_gen_mipmap(struct gl_context *ctx, GLenum target,
                  struct gl_texture_object *texObj, GLint level)
 {
    ASSERT(target != GL_TEXTURE_CUBE_MAP);
@@ -2192,7 +2214,7 @@ override_internal_format(GLenum internalFormat, GLint width, GLint height)
  * comes up during automatic mipmap generation.
  */
 void
-_mesa_choose_texture_format(GLcontext *ctx,
+_mesa_choose_texture_format(struct gl_context *ctx,
                             struct gl_texture_object *texObj,
                             struct gl_texture_image *texImage,
                             GLenum target, GLint level,
@@ -2230,7 +2252,6 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
                   GLsizei width, GLint border, GLenum format,
                   GLenum type, const GLvoid *pixels )
 {
-   GLsizei postConvWidth = width;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
@@ -2243,12 +2264,6 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
 
    internalFormat = override_internal_format(internalFormat, width, 1);
 
-#if FEATURE_convolve
-   if (_mesa_is_color_format(internalFormat)) {
-      _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
-   }
-#endif
-
    if (target == GL_TEXTURE_1D) {
       /* non-proxy target */
       struct gl_texture_object *texObj;
@@ -2256,7 +2271,7 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
       const GLuint face = _mesa_tex_target_to_face(target);
 
       if (texture_error_check(ctx, target, level, internalFormat,
-                              format, type, 1, postConvWidth, 1, 1, border)) {
+                              format, type, 1, width, 1, 1, border)) {
          return;   /* error was recorded */
       }
 
@@ -2279,7 +2294,7 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
 
             clear_teximage_fields(texImage); /* not really needed, but helpful */
             _mesa_init_teximage_fields(ctx, target, texImage,
-                                       postConvWidth, 1, 1,
+                                       width, 1, 1,
                                        border, internalFormat);
 
             _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
@@ -2311,7 +2326,7 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
       struct gl_texture_image *texImage;
       texImage = _mesa_get_proxy_tex_image(ctx, target, level);
       if (texture_error_check(ctx, target, level, internalFormat,
-                              format, type, 1, postConvWidth, 1, 1, border)) {
+                              format, type, 1, width, 1, 1, border)) {
          /* when error, clear all proxy texture image parameters */
          if (texImage)
             clear_teximage_fields(texImage);
@@ -2322,7 +2337,7 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
             _mesa_get_current_tex_object(ctx, target);
          ASSERT(texImage);
          _mesa_init_teximage_fields(ctx, target, texImage,
-                                    postConvWidth, 1, 1,
+                                    width, 1, 1,
                                     border, internalFormat);
          _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
                                      internalFormat, format, type);
@@ -2341,7 +2356,6 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
                   GLenum format, GLenum type,
                   const GLvoid *pixels )
 {
-   GLsizei postConvWidth = width, postConvHeight = height;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
@@ -2354,13 +2368,6 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
 
    internalFormat = override_internal_format(internalFormat, width, height);
 
-#if FEATURE_convolve
-   if (_mesa_is_color_format(internalFormat)) {
-      _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
-					 &postConvHeight);
-   }
-#endif
-
    if (target == GL_TEXTURE_2D ||
        (ctx->Extensions.ARB_texture_cube_map &&
         target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB &&
@@ -2375,8 +2382,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
       const GLuint face = _mesa_tex_target_to_face(target);
 
       if (texture_error_check(ctx, target, level, internalFormat,
-                              format, type, 2, postConvWidth, postConvHeight,
-                              1, border)) {
+                              format, type, 2, width, height, 1, border)) {
          return;   /* error was recorded */
       }
 
@@ -2398,7 +2404,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
             ASSERT(texImage->Data == NULL);
             clear_teximage_fields(texImage); /* not really needed, but helpful */
             _mesa_init_teximage_fields(ctx, target, texImage,
-                                       postConvWidth, postConvHeight, 1,
+                                       width, height, 1,
                                        border, internalFormat);
 
             _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
@@ -2436,8 +2442,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
       struct gl_texture_image *texImage;
       texImage = _mesa_get_proxy_tex_image(ctx, target, level);
       if (texture_error_check(ctx, target, level, internalFormat,
-                              format, type, 2, postConvWidth, postConvHeight,
-                              1, border)) {
+                              format, type, 2, width, height, 1, border)) {
          /* when error, clear all proxy texture image parameters */
          if (texImage)
             clear_teximage_fields(texImage);
@@ -2447,7 +2452,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
          struct gl_texture_object *texObj =
             _mesa_get_current_tex_object(ctx, target);
          _mesa_init_teximage_fields(ctx, target, texImage,
-                                    postConvWidth, postConvHeight, 1,
+                                    width, height, 1,
                                     border, internalFormat);
          _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
                                      internalFormat, format, type);
@@ -2634,7 +2639,6 @@ _mesa_TexSubImage1D( GLenum target, GLint level,
                      GLenum format, GLenum type,
                      const GLvoid *pixels )
 {
-   GLsizei postConvWidth = width;
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
    GET_CURRENT_CONTEXT(ctx);
@@ -2649,15 +2653,8 @@ _mesa_TexSubImage1D( GLenum target, GLint level,
    if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
-#if FEATURE_convolve
-   /* XXX should test internal format */
-   if (_mesa_is_color_format(format)) {
-      _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
-   }
-#endif
-
    if (subtexture_error_check(ctx, 1, target, level, xoffset, 0, 0,
-			       postConvWidth, 1, 1, format, type)) {
+			       width, 1, 1, format, type)) {
       return;   /* error was detected */
    }
 
@@ -2670,8 +2667,7 @@ _mesa_TexSubImage1D( GLenum target, GLint level,
       texImage = _mesa_select_tex_image(ctx, texObj, target, level);
 
       if (subtexture_error_check2(ctx, 1, target, level, xoffset, 0, 0,
-				  postConvWidth, 1, 1,
-                                  format, type, texImage)) {
+				  width, 1, 1, format, type, texImage)) {
          /* error was recorded */
       }
       else if (width > 0) {
@@ -2699,7 +2695,6 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
                      GLenum format, GLenum type,
                      const GLvoid *pixels )
 {
-   GLsizei postConvWidth = width, postConvHeight = height;
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
    GET_CURRENT_CONTEXT(ctx);
@@ -2715,16 +2710,8 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
    if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
       _mesa_update_state(ctx);
 
-#if FEATURE_convolve
-   /* XXX should test internal format */
-   if (_mesa_is_color_format(format)) {
-      _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
-                                         &postConvHeight);
-   }
-#endif
-
    if (subtexture_error_check(ctx, 2, target, level, xoffset, yoffset, 0,
-			      postConvWidth, postConvHeight, 1, format, type)) {
+			      width, height, 1, format, type)) {
       return;   /* error was detected */
    }
 
@@ -2735,8 +2722,7 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
       texImage = _mesa_select_tex_image(ctx, texObj, target, level);
 
       if (subtexture_error_check2(ctx, 2, target, level, xoffset, yoffset, 0,
-				  postConvWidth, postConvHeight, 1,
-                                  format, type, texImage)) {
+				  width, height, 1, format, type, texImage)) {
 	 /* error was recorded */
       }
       else if (width > 0 && height >= 0) {
@@ -2829,7 +2815,6 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
 {
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
-   GLsizei postConvWidth = width;
    const GLuint face = _mesa_tex_target_to_face(target);
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
@@ -2843,14 +2828,8 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
    if (ctx->NewState & NEW_COPY_TEX_STATE)
       _mesa_update_state(ctx);
 
-#if FEATURE_convolve
-   if (_mesa_is_color_format(internalFormat)) {
-      _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
-   }
-#endif
-
    if (copytexture_error_check(ctx, 1, target, level, internalFormat,
-                               postConvWidth, 1, border))
+                               width, 1, border))
       return;
 
    texObj = _mesa_get_current_tex_object(ctx, target);
@@ -2869,7 +2848,7 @@ _mesa_CopyTexImage1D( GLenum target, GLint level,
          ASSERT(texImage->Data == NULL);
 
          clear_teximage_fields(texImage); /* not really needed, but helpful */
-         _mesa_init_teximage_fields(ctx, target, texImage, postConvWidth, 1, 1,
+         _mesa_init_teximage_fields(ctx, target, texImage, width, 1, 1,
                                     border, internalFormat);
 
          _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
@@ -2904,7 +2883,6 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
 {
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
-   GLsizei postConvWidth = width, postConvHeight = height;
    const GLuint face = _mesa_tex_target_to_face(target);
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
@@ -2918,15 +2896,8 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
    if (ctx->NewState & NEW_COPY_TEX_STATE)
       _mesa_update_state(ctx);
 
-#if FEATURE_convolve
-   if (_mesa_is_color_format(internalFormat)) {
-      _mesa_adjust_image_for_convolution(ctx, 2, &postConvWidth,
-                                         &postConvHeight);
-   }
-#endif
-
    if (copytexture_error_check(ctx, 2, target, level, internalFormat,
-                               postConvWidth, postConvHeight, border))
+                               width, height, border))
       return;
 
    texObj = _mesa_get_current_tex_object(ctx, target);
@@ -2947,7 +2918,7 @@ _mesa_CopyTexImage2D( GLenum target, GLint level, GLenum internalFormat,
 
          clear_teximage_fields(texImage); /* not really needed, but helpful */
          _mesa_init_teximage_fields(ctx, target, texImage,
-                                    postConvWidth, postConvHeight, 1,
+                                    width, height, 1,
                                     border, internalFormat);
 
          _mesa_choose_texture_format(ctx, texObj, texImage, target, level,
@@ -2980,7 +2951,6 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
 {
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
-   GLsizei postConvWidth = width;
    GLint yoffset = 0;
    GLsizei height = 1;
 
@@ -3004,15 +2974,8 @@ _mesa_CopyTexSubImage1D( GLenum target, GLint level,
    {
       texImage = _mesa_select_tex_image(ctx, texObj, target, level);
 
-#if FEATURE_convolve
-      if (texImage && _mesa_is_color_format(texImage->InternalFormat)) {
-         _mesa_adjust_image_for_convolution(ctx, 1, &postConvWidth, NULL);
-      }
-#endif
-
       if (copytexsubimage_error_check2(ctx, 1, target, level,
-				       xoffset, 0, 0, postConvWidth, 1,
-				       texImage)) {
+				       xoffset, 0, 0, width, 1, texImage)) {
          /* error was recorded */
       }
       else {
@@ -3043,7 +3006,6 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
 {
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
-   GLsizei postConvWidth = width, postConvHeight = height;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
@@ -3064,17 +3026,9 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
    {
       texImage = _mesa_select_tex_image(ctx, texObj, target, level);
 
-#if FEATURE_convolve
-      if (texImage && _mesa_is_color_format(texImage->InternalFormat)) {
-         _mesa_adjust_image_for_convolution(ctx, 2,
-                                            &postConvWidth, &postConvHeight);
-      }
-#endif
-
       if (copytexsubimage_error_check2(ctx, 2, target, level,
                                        xoffset, yoffset, 0,
-				       postConvWidth, postConvHeight,
-                                       texImage)) {
+				       width, height, texImage)) {
          /* error was recorded */
       }
       else {
@@ -3106,7 +3060,6 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
 {
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
-   GLsizei postConvWidth = width, postConvHeight = height;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
@@ -3127,16 +3080,8 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
    {
       texImage = _mesa_select_tex_image(ctx, texObj, target, level);
 
-#if FEATURE_convolve
-      if (texImage && _mesa_is_color_format(texImage->InternalFormat)) {
-         _mesa_adjust_image_for_convolution(ctx, 2,
-                                            &postConvWidth, &postConvHeight);
-      }
-#endif
-
       if (copytexsubimage_error_check2(ctx, 3, target, level, xoffset, yoffset,
-				       zoffset, postConvWidth, postConvHeight,
-				       texImage)) {
+				       zoffset, width, height, texImage)) {
          /* error was recored */
       }
       else {
@@ -3197,7 +3142,7 @@ get_compressed_block_size(GLenum glformat, GLuint *bw, GLuint *bh)
  * \return error code or GL_NO_ERROR.
  */
 static GLenum
-compressed_texture_error_check(GLcontext *ctx, GLint dimensions,
+compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
                                GLenum target, GLint level,
                                GLenum internalFormat, GLsizei width,
                                GLsizei height, GLsizei depth, GLint border,
@@ -3304,7 +3249,7 @@ compressed_texture_error_check(GLcontext *ctx, GLint dimensions,
  * \return error code or GL_NO_ERROR.
  */
 static GLenum
-compressed_subtexture_error_check(GLcontext *ctx, GLint dimensions,
+compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,
                                   GLenum target, GLint level,
                                   GLint xoffset, GLint yoffset, GLint zoffset,
                                   GLsizei width, GLsizei height, GLsizei depth,
@@ -3388,7 +3333,7 @@ compressed_subtexture_error_check(GLcontext *ctx, GLint dimensions,
  * \return GL_TRUE if error found, GL_FALSE otherwise.
  */
 static GLboolean
-compressed_subtexture_error_check2(GLcontext *ctx, GLuint dims,
+compressed_subtexture_error_check2(struct gl_context *ctx, GLuint dims,
                                    GLsizei width, GLsizei height,
                                    GLsizei depth, GLenum format,
                                    struct gl_texture_image *texImage)
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index 0dcacab3cd0..d4317c301b7 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -46,7 +46,7 @@ _mesa_free_texmemory(void *m);
 /*@{*/
 
 extern GLint
-_mesa_base_tex_format( GLcontext *ctx, GLint internalFormat );
+_mesa_base_tex_format( struct gl_context *ctx, GLint internalFormat );
 
 
 extern GLboolean
@@ -54,26 +54,26 @@ _mesa_is_proxy_texture(GLenum target);
 
 
 extern struct gl_texture_image *
-_mesa_new_texture_image( GLcontext *ctx );
+_mesa_new_texture_image( struct gl_context *ctx );
 
 
 extern void
-_mesa_delete_texture_image( GLcontext *ctx, struct gl_texture_image *teximage );
+_mesa_delete_texture_image( struct gl_context *ctx, struct gl_texture_image *teximage );
 
 extern void
-_mesa_free_texture_image_data( GLcontext *ctx, 
+_mesa_free_texture_image_data( struct gl_context *ctx, 
 			       struct gl_texture_image *texImage );
 
 
 extern void
-_mesa_init_teximage_fields(GLcontext *ctx, GLenum target,
+_mesa_init_teximage_fields(struct gl_context *ctx, GLenum target,
                            struct gl_texture_image *img,
                            GLsizei width, GLsizei height, GLsizei depth,
                            GLint border, GLenum internalFormat);
 
 
 extern void
-_mesa_choose_texture_format(GLcontext *ctx,
+_mesa_choose_texture_format(struct gl_context *ctx,
                             struct gl_texture_object *texObj,
                             struct gl_texture_image *texImage,
                             GLenum target, GLint level,
@@ -81,7 +81,7 @@ _mesa_choose_texture_format(GLcontext *ctx,
 
 
 extern void
-_mesa_clear_texture_image(GLcontext *ctx, struct gl_texture_image *texImage);
+_mesa_clear_texture_image(struct gl_context *ctx, struct gl_texture_image *texImage);
 
 
 extern void
@@ -91,33 +91,33 @@ _mesa_set_tex_image(struct gl_texture_object *tObj,
 
 
 extern struct gl_texture_object *
-_mesa_select_tex_object(GLcontext *ctx, const struct gl_texture_unit *texUnit,
+_mesa_select_tex_object(struct gl_context *ctx, const struct gl_texture_unit *texUnit,
                         GLenum target);
 
 extern struct gl_texture_object *
-_mesa_get_current_tex_object(GLcontext *ctx, GLenum target);
+_mesa_get_current_tex_object(struct gl_context *ctx, GLenum target);
 
 
 extern struct gl_texture_image *
-_mesa_select_tex_image(GLcontext *ctx, const struct gl_texture_object *texObj,
+_mesa_select_tex_image(struct gl_context *ctx, const struct gl_texture_object *texObj,
                        GLenum target, GLint level);
 
 
 extern struct gl_texture_image *
-_mesa_get_tex_image(GLcontext *ctx, struct gl_texture_object *texObj,
+_mesa_get_tex_image(struct gl_context *ctx, struct gl_texture_object *texObj,
                     GLenum target, GLint level);
 
 
 extern struct gl_texture_image *
-_mesa_get_proxy_tex_image(GLcontext *ctx, GLenum target, GLint level);
+_mesa_get_proxy_tex_image(struct gl_context *ctx, GLenum target, GLint level);
 
 
 extern GLint
-_mesa_max_texture_levels(GLcontext *ctx, GLenum target);
+_mesa_max_texture_levels(struct gl_context *ctx, GLenum target);
 
 
 extern GLboolean
-_mesa_test_proxy_teximage(GLcontext *ctx, GLenum target, GLint level,
+_mesa_test_proxy_teximage(struct gl_context *ctx, GLenum target, GLint level,
                          GLint internalFormat, GLenum format, GLenum type,
                          GLint width, GLint height, GLint depth, GLint border);
 
@@ -130,7 +130,7 @@ _mesa_tex_target_to_face(GLenum target);
  * Lock a texture for updating.  See also _mesa_lock_context_textures().
  */
 static INLINE void
-_mesa_lock_texture(GLcontext *ctx, struct gl_texture_object *texObj)
+_mesa_lock_texture(struct gl_context *ctx, struct gl_texture_object *texObj)
 {
    _glthread_LOCK_MUTEX(ctx->Shared->TexMutex);
    ctx->Shared->TextureStateStamp++;
@@ -138,7 +138,7 @@ _mesa_lock_texture(GLcontext *ctx, struct gl_texture_object *texObj)
 }
 
 static INLINE void
-_mesa_unlock_texture(GLcontext *ctx, struct gl_texture_object *texObj)
+_mesa_unlock_texture(struct gl_context *ctx, struct gl_texture_object *texObj)
 {
    _glthread_UNLOCK_MUTEX(ctx->Shared->TexMutex);
 }
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index c96226df597..e08df0f7fed 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -53,7 +53,7 @@
  * Return the gl_texture_object for a given ID.
  */
 struct gl_texture_object *
-_mesa_lookup_texture(GLcontext *ctx, GLuint id)
+_mesa_lookup_texture(struct gl_context *ctx, GLuint id)
 {
    return (struct gl_texture_object *)
       _mesa_HashLookup(ctx->Shared->TexObjects, id);
@@ -77,7 +77,7 @@ _mesa_lookup_texture(GLcontext *ctx, GLuint id)
  * \return pointer to new texture object.
  */
 struct gl_texture_object *
-_mesa_new_texture_object( GLcontext *ctx, GLuint name, GLenum target )
+_mesa_new_texture_object( struct gl_context *ctx, GLuint name, GLenum target )
 {
    struct gl_texture_object *obj;
    (void) ctx;
@@ -149,7 +149,7 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj,
  * target it's getting bound to (GL_TEXTURE_1D/2D/etc).
  */
 static void
-finish_texture_init(GLcontext *ctx, GLenum target,
+finish_texture_init(struct gl_context *ctx, GLenum target,
                     struct gl_texture_object *obj)
 {
    assert(obj->Target == 0);
@@ -181,7 +181,7 @@ finish_texture_init(GLcontext *ctx, GLenum target,
  * \param texObj the texture object to delete.
  */
 void
-_mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *texObj )
+_mesa_delete_texture_object( struct gl_context *ctx, struct gl_texture_object *texObj )
 {
    GLuint i, face;
 
@@ -265,7 +265,7 @@ _mesa_copy_texture_object( struct gl_texture_object *dest,
  * \sa _mesa_clear_texture_image().
  */
 void
-_mesa_clear_texture_object(GLcontext *ctx, struct gl_texture_object *texObj)
+_mesa_clear_texture_object(struct gl_context *ctx, struct gl_texture_object *texObj)
 {
    GLuint i, j;
 
@@ -330,11 +330,8 @@ _mesa_reference_texobj(struct gl_texture_object **ptr,
       GLboolean deleteFlag = GL_FALSE;
       struct gl_texture_object *oldTex = *ptr;
 
-      {
-         GLboolean valid = valid_texture_object(oldTex);
-         ASSERT(valid);
-         (void) valid;
-      }
+      ASSERT(valid_texture_object(oldTex));
+      (void) valid_texture_object; /* silence warning in release builds */
 
       _glthread_LOCK_MUTEX(oldTex->Mutex);
       ASSERT(oldTex->RefCount > 0);
@@ -407,7 +404,7 @@ incomplete(const struct gl_texture_object *t, const char *why)
  * present and has the expected size.
  */
 void
-_mesa_test_texobj_completeness( const GLcontext *ctx,
+_mesa_test_texobj_completeness( const struct gl_context *ctx,
                                 struct gl_texture_object *t )
 {
    const GLint baseLevel = t->BaseLevel;
@@ -699,7 +696,7 @@ _mesa_test_texobj_completeness( const GLcontext *ctx,
  * \param invalidate_state also invalidate context state.
  */
 void
-_mesa_dirty_texobj(GLcontext *ctx, struct gl_texture_object *texObj,
+_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj,
                    GLboolean invalidate_state)
 {
    texObj->_Complete = GL_FALSE;
@@ -715,7 +712,7 @@ _mesa_dirty_texobj(GLcontext *ctx, struct gl_texture_object *texObj,
  * incomplete texture.
  */
 struct gl_texture_object *
-_mesa_get_fallback_texture(GLcontext *ctx)
+_mesa_get_fallback_texture(struct gl_context *ctx)
 {
    if (!ctx->Shared->FallbackTex) {
       /* create fallback texture now */
@@ -833,7 +830,7 @@ _mesa_GenTextures( GLsizei n, GLuint *textures )
  * read framebuffer.  If so, Unbind it.
  */
 static void
-unbind_texobj_from_fbo(GLcontext *ctx, struct gl_texture_object *texObj)
+unbind_texobj_from_fbo(struct gl_context *ctx, struct gl_texture_object *texObj)
 {
    const GLuint n = (ctx->DrawBuffer == ctx->ReadBuffer) ? 1 : 2;
    GLuint i;
@@ -858,7 +855,7 @@ unbind_texobj_from_fbo(GLcontext *ctx, struct gl_texture_object *texObj)
  * unbind it if so (revert to default textures).
  */
 static void
-unbind_texobj_from_texunits(GLcontext *ctx, struct gl_texture_object *texObj)
+unbind_texobj_from_texunits(struct gl_context *ctx, struct gl_texture_object *texObj)
 {
    GLuint u, tex;
 
@@ -1217,7 +1214,7 @@ _mesa_IsTexture( GLuint texture )
  * See also _mesa_lock/unlock_texture() in teximage.h
  */
 void
-_mesa_lock_context_textures( GLcontext *ctx )
+_mesa_lock_context_textures( struct gl_context *ctx )
 {
    _glthread_LOCK_MUTEX(ctx->Shared->TexMutex);
 
@@ -1229,7 +1226,7 @@ _mesa_lock_context_textures( GLcontext *ctx )
 
 
 void
-_mesa_unlock_context_textures( GLcontext *ctx )
+_mesa_unlock_context_textures( struct gl_context *ctx )
 {
    assert(ctx->Shared->TextureStateStamp == ctx->TextureStateTimestamp);
    _glthread_UNLOCK_MUTEX(ctx->Shared->TexMutex);
diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index 9bfebd45c81..821b35caa36 100644
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -41,45 +41,45 @@
 /*@{*/
 
 extern struct gl_texture_object *
-_mesa_lookup_texture(GLcontext *ctx, GLuint id);
+_mesa_lookup_texture(struct gl_context *ctx, GLuint id);
 
 extern struct gl_texture_object *
-_mesa_new_texture_object( GLcontext *ctx, GLuint name, GLenum target );
+_mesa_new_texture_object( struct gl_context *ctx, GLuint name, GLenum target );
 
 extern void
 _mesa_initialize_texture_object( struct gl_texture_object *obj,
                                  GLuint name, GLenum target );
 
 extern void
-_mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *obj );
+_mesa_delete_texture_object( struct gl_context *ctx, struct gl_texture_object *obj );
 
 extern void
 _mesa_copy_texture_object( struct gl_texture_object *dest,
                            const struct gl_texture_object *src );
 
 extern void
-_mesa_clear_texture_object(GLcontext *ctx, struct gl_texture_object *obj);
+_mesa_clear_texture_object(struct gl_context *ctx, struct gl_texture_object *obj);
 
 extern void
 _mesa_reference_texobj(struct gl_texture_object **ptr,
                        struct gl_texture_object *tex);
 
 extern void
-_mesa_test_texobj_completeness( const GLcontext *ctx,
+_mesa_test_texobj_completeness( const struct gl_context *ctx,
                                 struct gl_texture_object *obj );
 
 extern void
-_mesa_dirty_texobj(GLcontext *ctx, struct gl_texture_object *texObj,
+_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj,
                    GLboolean invalidate_state);
 
 extern struct gl_texture_object *
-_mesa_get_fallback_texture(GLcontext *ctx);
+_mesa_get_fallback_texture(struct gl_context *ctx);
 
 extern void
-_mesa_unlock_context_textures( GLcontext *ctx );
+_mesa_unlock_context_textures( struct gl_context *ctx );
 
 extern void
-_mesa_lock_context_textures( GLcontext *ctx );
+_mesa_lock_context_textures( struct gl_context *ctx );
 
 /*@}*/
 
diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c
index 745a0aeec9d..d5c83de97f7 100644
--- a/src/mesa/main/texparam.c
+++ b/src/mesa/main/texparam.c
@@ -47,7 +47,7 @@
  * \return GL_TRUE if legal, GL_FALSE otherwise
  */
 static GLboolean 
-validate_texture_wrap_mode(GLcontext * ctx, GLenum target, GLenum wrap)
+validate_texture_wrap_mode(struct gl_context * ctx, GLenum target, GLenum wrap)
 {
    const struct gl_extensions * const e = & ctx->Extensions;
 
@@ -83,7 +83,7 @@ validate_texture_wrap_mode(GLcontext * ctx, GLenum target, GLenum wrap)
  * Only the glGetTexLevelParameter() functions accept proxy targets.
  */
 static struct gl_texture_object *
-get_texobj(GLcontext *ctx, GLenum target, GLboolean get)
+get_texobj(struct gl_context *ctx, GLenum target, GLboolean get)
 {
    struct gl_texture_unit *texUnit;
 
@@ -178,7 +178,7 @@ set_swizzle_component(GLuint *swizzle, GLuint comp, GLuint swz)
  * per-texture derived state gets recomputed.
  */
 static INLINE void
-flush(GLcontext *ctx, struct gl_texture_object *texObj)
+flush(struct gl_context *ctx, struct gl_texture_object *texObj)
 {
    FLUSH_VERTICES(ctx, _NEW_TEXTURE);
    texObj->_Complete = GL_FALSE;
@@ -190,7 +190,7 @@ flush(GLcontext *ctx, struct gl_texture_object *texObj)
  * \return GL_TRUE if legal AND the value changed, GL_FALSE otherwise
  */
 static GLboolean
-set_tex_parameteri(GLcontext *ctx,
+set_tex_parameteri(struct gl_context *ctx,
                    struct gl_texture_object *texObj,
                    GLenum pname, const GLint *params)
 {
@@ -291,17 +291,10 @@ set_tex_parameteri(GLcontext *ctx,
       return GL_TRUE;
 
    case GL_GENERATE_MIPMAP_SGIS:
-      if (ctx->Extensions.SGIS_generate_mipmap) {
-         if (texObj->GenerateMipmap != params[0]) {
-            flush(ctx, texObj);
-            texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;
-            return GL_TRUE;
-         }
-         return GL_FALSE;
-      }
-      else {
-         _mesa_error(ctx, GL_INVALID_ENUM,
-                     "glTexParameter(pname=GL_GENERATE_MIPMAP_SGIS)");
+      if (texObj->GenerateMipmap != params[0]) {
+	 flush(ctx, texObj);
+	 texObj->GenerateMipmap = params[0] ? GL_TRUE : GL_FALSE;
+	 return GL_TRUE;
       }
       return GL_FALSE;
 
@@ -358,7 +351,8 @@ set_tex_parameteri(GLcontext *ctx,
       if (ctx->Extensions.ARB_depth_texture &&
           (params[0] == GL_LUMINANCE ||
            params[0] == GL_INTENSITY ||
-           params[0] == GL_ALPHA)) {
+           params[0] == GL_ALPHA ||
+	   (ctx->Extensions.ARB_texture_rg && params[0] == GL_RED))) {
          if (texObj->DepthMode != params[0]) {
             flush(ctx, texObj);
             texObj->DepthMode = params[0];
@@ -436,7 +430,7 @@ set_tex_parameteri(GLcontext *ctx,
  * \return GL_TRUE if legal AND the value changed, GL_FALSE otherwise
  */
 static GLboolean
-set_tex_parameterf(GLcontext *ctx,
+set_tex_parameterf(struct gl_context *ctx,
                    struct gl_texture_object *texObj,
                    GLenum pname, const GLfloat *params)
 {
@@ -877,7 +871,17 @@ _mesa_GetTexLevelParameteriv( GLenum target, GLint level,
          *params = img->Border;
          break;
       case GL_TEXTURE_RED_SIZE:
+         if (img->_BaseFormat == GL_RED) {
+            *params = _mesa_get_format_bits(texFormat, pname);
+	    break;
+	 }
+	 /* FALLTHROUGH */
       case GL_TEXTURE_GREEN_SIZE:
+         if (img->_BaseFormat == GL_RG) {
+            *params = _mesa_get_format_bits(texFormat, pname);
+	    break;
+	 }
+	 /* FALLTHROUGH */
       case GL_TEXTURE_BLUE_SIZE:
          if (img->_BaseFormat == GL_RGB || img->_BaseFormat == GL_RGBA)
             *params = _mesa_get_format_bits(texFormat, pname);
@@ -1126,11 +1130,7 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
 	    error = GL_TRUE;
          break;
       case GL_GENERATE_MIPMAP_SGIS:
-         if (ctx->Extensions.SGIS_generate_mipmap) {
-            *params = (GLfloat) obj->GenerateMipmap;
-         }
-	 else 
-	    error = GL_TRUE;
+	 *params = (GLfloat) obj->GenerateMipmap;
          break;
       case GL_TEXTURE_COMPARE_MODE_ARB:
          if (ctx->Extensions.ARB_shadow) {
@@ -1291,12 +1291,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
          }
          break;
       case GL_GENERATE_MIPMAP_SGIS:
-         if (ctx->Extensions.SGIS_generate_mipmap) {
-            *params = (GLint) obj->GenerateMipmap;
-         }
-         else {
-            error = GL_TRUE;
-         }
+	 *params = (GLint) obj->GenerateMipmap;
          break;
       case GL_TEXTURE_COMPARE_MODE_ARB:
          if (ctx->Extensions.ARB_shadow) {
diff --git a/src/mesa/main/texrender.c b/src/mesa/main/texrender.c
index c68105b3951..8961b926487 100644
--- a/src/mesa/main/texrender.c
+++ b/src/mesa/main/texrender.c
@@ -31,7 +31,7 @@ struct texture_renderbuffer
  * Get row of values from the renderbuffer that wraps a texture image.
  */
 static void
-texture_get_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+texture_get_row(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                 GLint x, GLint y, void *values)
 {
    const struct texture_renderbuffer *trb
@@ -100,7 +100,7 @@ texture_get_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-texture_get_values(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+texture_get_values(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                    const GLint x[], const GLint y[], void *values)
 {
    const struct texture_renderbuffer *trb
@@ -167,7 +167,7 @@ texture_get_values(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
  * Put row of values into a renderbuffer that wraps a texture image.
  */
 static void
-texture_put_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+texture_put_row(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                 GLint x, GLint y, const void *values, const GLubyte *mask)
 {
    const struct texture_renderbuffer *trb
@@ -229,7 +229,7 @@ texture_put_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
  * Put row of RGB values into a renderbuffer that wraps a texture image.
  */
 static void
-texture_put_row_rgb(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+texture_put_row_rgb(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                 GLint x, GLint y, const void *values, const GLubyte *mask)
 {
    const struct texture_renderbuffer *trb
@@ -289,7 +289,7 @@ texture_put_row_rgb(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-texture_put_mono_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+texture_put_mono_row(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                      GLint x, GLint y, const void *value, const GLubyte *mask)
 {
    const struct texture_renderbuffer *trb
@@ -348,7 +348,7 @@ texture_put_mono_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-texture_put_values(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
+texture_put_values(struct gl_context *ctx, struct gl_renderbuffer *rb, GLuint count,
                    const GLint x[], const GLint y[], const void *values,
                    const GLubyte *mask)
 {
@@ -407,7 +407,7 @@ texture_put_values(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 
 
 static void
-texture_put_mono_values(GLcontext *ctx, struct gl_renderbuffer *rb,
+texture_put_mono_values(struct gl_context *ctx, struct gl_renderbuffer *rb,
                         GLuint count, const GLint x[], const GLint y[],
                         const void *value, const GLubyte *mask)
 {
@@ -486,7 +486,7 @@ delete_texture_wrapper(struct gl_renderbuffer *rb)
  * This allows rendering into the texture as if it were a renderbuffer.
  */
 static void
-wrap_texture(GLcontext *ctx, struct gl_renderbuffer_attachment *att)
+wrap_texture(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
 {
    struct texture_renderbuffer *trb;
    const GLuint name = 0;
@@ -525,7 +525,7 @@ wrap_texture(GLcontext *ctx, struct gl_renderbuffer_attachment *att)
  * update the internal format info, etc.
  */
 static void
-update_wrapper(GLcontext *ctx, const struct gl_renderbuffer_attachment *att)
+update_wrapper(struct gl_context *ctx, const struct gl_renderbuffer_attachment *att)
 {
    struct texture_renderbuffer *trb
       = (struct texture_renderbuffer *) att->Renderbuffer;
@@ -609,7 +609,7 @@ update_wrapper(GLcontext *ctx, const struct gl_renderbuffer_attachment *att)
  * \sa _mesa_framebuffer_renderbuffer
  */
 void
-_mesa_render_texture(GLcontext *ctx,
+_mesa_render_texture(struct gl_context *ctx,
                      struct gl_framebuffer *fb,
                      struct gl_renderbuffer_attachment *att)
 {
@@ -623,7 +623,7 @@ _mesa_render_texture(GLcontext *ctx,
 
 
 void
-_mesa_finish_render_texture(GLcontext *ctx,
+_mesa_finish_render_texture(struct gl_context *ctx,
                             struct gl_renderbuffer_attachment *att)
 {
    /* do nothing */
diff --git a/src/mesa/main/texrender.h b/src/mesa/main/texrender.h
index 1e87d594a28..5e68fb03b57 100644
--- a/src/mesa/main/texrender.h
+++ b/src/mesa/main/texrender.h
@@ -4,12 +4,12 @@
 #include "mtypes.h"
 
 extern void
-_mesa_render_texture(GLcontext *ctx,
+_mesa_render_texture(struct gl_context *ctx,
                      struct gl_framebuffer *fb,
                      struct gl_renderbuffer_attachment *att);
 
 extern void
-_mesa_finish_render_texture(GLcontext *ctx,
+_mesa_finish_render_texture(struct gl_context *ctx,
                             struct gl_renderbuffer_attachment *att);
 
 
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index dae173d1bde..1b0d760fae5 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -63,7 +63,7 @@ static const struct gl_tex_env_combine_state default_combine_state = {
  * Used by glXCopyContext to copy texture state from one context to another.
  */
 void
-_mesa_copy_texture_state( const GLcontext *src, GLcontext *dst )
+_mesa_copy_texture_state( const struct gl_context *src, struct gl_context *dst )
 {
    GLuint u, tex;
 
@@ -119,7 +119,7 @@ _mesa_copy_texture_state( const GLcontext *src, GLcontext *dst )
  * For debugging
  */
 void
-_mesa_print_texunit_state( GLcontext *ctx, GLuint unit )
+_mesa_print_texunit_state( struct gl_context *ctx, GLuint unit )
 {
    const struct gl_texture_unit *texUnit = ctx->Texture.Unit + unit;
    printf("Texture Unit %d\n", unit);
@@ -179,6 +179,8 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
       break;
 
    case GL_LUMINANCE:
+   case GL_RED:
+   case GL_RG:
    case GL_RGB:
    case GL_YCBCR_MESA:
    case GL_DUDV_ATI:
@@ -219,6 +221,8 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
       case GL_INTENSITY:
 	 state->SourceRGB[0] = GL_PREVIOUS;
 	 break;
+      case GL_RED:
+      case GL_RG:
       case GL_RGB:
       case GL_YCBCR_MESA:
       case GL_DUDV_ATI:
@@ -244,6 +248,8 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
 	 state->OperandA[2] = GL_SRC_ALPHA;
 	 /* FALLTHROUGH */
       case GL_LUMINANCE:
+      case GL_RED:
+      case GL_RG:
       case GL_RGB:
       case GL_LUMINANCE_ALPHA:
       case GL_RGBA:
@@ -357,7 +363,7 @@ _mesa_ClientActiveTextureARB(GLenum texture)
  * \param ctx GL context.
  */
 static void
-update_texture_matrices( GLcontext *ctx )
+update_texture_matrices( struct gl_context *ctx )
 {
    GLuint u;
 
@@ -380,7 +386,7 @@ update_texture_matrices( GLcontext *ctx )
  * Examine texture unit's combine/env state to update derived state.
  */
 static void
-update_tex_combine(GLcontext *ctx, struct gl_texture_unit *texUnit)
+update_tex_combine(struct gl_context *ctx, struct gl_texture_unit *texUnit)
 {
    struct gl_tex_env_combine_state *combine;
 
@@ -483,7 +489,7 @@ update_tex_combine(GLcontext *ctx, struct gl_texture_unit *texUnit)
  * \param ctx GL context.
  */
 static void
-update_texture_state( GLcontext *ctx )
+update_texture_state( struct gl_context *ctx )
 {
    GLuint unit;
    struct gl_fragment_program *fprog = NULL;
@@ -647,7 +653,7 @@ update_texture_state( GLcontext *ctx )
  * Update texture-related derived state.
  */
 void
-_mesa_update_texture( GLcontext *ctx, GLuint new_state )
+_mesa_update_texture( struct gl_context *ctx, GLuint new_state )
 {
    if (new_state & _NEW_TEXTURE_MATRIX)
       update_texture_matrices( ctx );
@@ -672,7 +678,7 @@ _mesa_update_texture( GLcontext *ctx, GLuint new_state )
  * GL_FALSE.
  */
 static GLboolean
-alloc_proxy_textures( GLcontext *ctx )
+alloc_proxy_textures( struct gl_context *ctx )
 {
    static const GLenum targets[] = {
       GL_TEXTURE_1D,
@@ -710,7 +716,7 @@ alloc_proxy_textures( GLcontext *ctx )
  * \param unit texture unit number to be initialized.
  */
 static void
-init_texture_unit( GLcontext *ctx, GLuint unit )
+init_texture_unit( struct gl_context *ctx, GLuint unit )
 {
    struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit];
    GLuint tex;
@@ -758,7 +764,7 @@ init_texture_unit( GLcontext *ctx, GLuint unit )
  * Initialize texture state for the given context.
  */
 GLboolean
-_mesa_init_texture(GLcontext *ctx)
+_mesa_init_texture(struct gl_context *ctx)
 {
    GLuint u;
 
@@ -790,7 +796,7 @@ _mesa_init_texture(GLcontext *ctx)
  * Free dynamically-allocted texture data attached to the given context.
  */
 void
-_mesa_free_texture_data(GLcontext *ctx)
+_mesa_free_texture_data(struct gl_context *ctx)
 {
    GLuint u, tgt;
 
@@ -819,7 +825,7 @@ _mesa_free_texture_data(GLcontext *ctx)
  * shared state.
  */
 void
-_mesa_update_default_objects_texture(GLcontext *ctx)
+_mesa_update_default_objects_texture(struct gl_context *ctx)
 {
    GLuint u, tex;
 
diff --git a/src/mesa/main/texstate.h b/src/mesa/main/texstate.h
index 912cb677985..987123036a6 100644
--- a/src/mesa/main/texstate.h
+++ b/src/mesa/main/texstate.h
@@ -41,7 +41,7 @@
  * This the texture unit set by glActiveTexture(), not glClientActiveTexture().
  */
 static INLINE struct gl_texture_unit *
-_mesa_get_current_tex_unit(GLcontext *ctx)
+_mesa_get_current_tex_unit(struct gl_context *ctx)
 {
    ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->Texture.Unit));
    return &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
@@ -49,10 +49,10 @@ _mesa_get_current_tex_unit(GLcontext *ctx)
 
 
 extern void
-_mesa_copy_texture_state( const GLcontext *src, GLcontext *dst );
+_mesa_copy_texture_state( const struct gl_context *src, struct gl_context *dst );
 
 extern void
-_mesa_print_texunit_state( GLcontext *ctx, GLuint unit );
+_mesa_print_texunit_state( struct gl_context *ctx, GLuint unit );
 
 
 
@@ -76,16 +76,16 @@ _mesa_ClientActiveTextureARB( GLenum target );
 /*@{*/
 
 extern void 
-_mesa_update_texture( GLcontext *ctx, GLuint new_state );
+_mesa_update_texture( struct gl_context *ctx, GLuint new_state );
 
 extern GLboolean
-_mesa_init_texture( GLcontext *ctx );
+_mesa_init_texture( struct gl_context *ctx );
 
 extern void 
-_mesa_free_texture_data( GLcontext *ctx );
+_mesa_free_texture_data( struct gl_context *ctx );
 
 extern void
-_mesa_update_default_objects_texture(GLcontext *ctx);
+_mesa_update_default_objects_texture(struct gl_context *ctx);
 
 /*@}*/
 
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 2989fdb72ed..f5f94bbf1a4 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -45,7 +45,7 @@
  * Texture image processing is actually kind of complicated.  We have to do:
  *    Format/type conversions
  *    pixel unpacking
- *    pixel transfer (scale, bais, lookup, convolution!, etc)
+ *    pixel transfer (scale, bais, lookup, etc)
  *
  * These functions can handle most everything, including processing full
  * images and sub-images.
@@ -55,7 +55,6 @@
 #include "glheader.h"
 #include "bufferobj.h"
 #include "colormac.h"
-#include "convolve.h"
 #include "image.h"
 #include "macros.h"
 #include "mipmap.h"
@@ -100,6 +99,7 @@ can_swizzle(GLenum logicalBaseFormat)
    case GL_BGR:
    case GL_BGRA:
    case GL_ABGR_EXT:
+   case GL_RG:
       return GL_TRUE;
    default:
       return GL_FALSE;
@@ -121,6 +121,7 @@ enum {
    IDX_BGR,
    IDX_BGRA,
    IDX_ABGR,
+   IDX_RG,
    MAX_IDX
 };
 
@@ -172,7 +173,6 @@ static const struct {
       MAP4(0,1,2,3),
    },
 
-
    {
       IDX_RED,
       MAP4(0, ZERO, ZERO, ONE),
@@ -208,6 +208,12 @@ static const struct {
       MAP4(3,2,1,0),
       MAP4(3,2,1,0)
    },
+
+   {
+      IDX_RG,
+      MAP4(0, 1, ZERO, ONE),
+      MAP2(0, 1)
+   },
 };
 
 
@@ -231,6 +237,7 @@ get_map_idx(GLenum value)
    case GL_BGR: return IDX_BGR;
    case GL_BGRA: return IDX_BGRA;
    case GL_ABGR_EXT: return IDX_ABGR;
+   case GL_RG: return IDX_RG;
    default:
       _mesa_problem(NULL, "Unexpected inFormat");
       return 0;
@@ -281,7 +288,7 @@ compute_component_mapping(GLenum inFormat, GLenum outFormat,
  * Apply all needed pixel unpacking and pixel transfer operations.
  * Note that there are both logicalBaseFormat and textureBaseFormat parameters.
  * Suppose the user specifies GL_LUMINANCE as the internal texture format
- * but the graphics hardware doesn't support luminance textures.  So, might
+ * but the graphics hardware doesn't support luminance textures.  So, we might
  * use an RGB hardware format instead.
  * If logicalBaseFormat != textureBaseFormat we have some extra work to do.
  *
@@ -300,7 +307,7 @@ compute_component_mapping(GLenum inFormat, GLenum outFormat,
  * \return resulting image with format = textureBaseFormat and type = GLfloat.
  */
 static GLfloat *
-make_temp_float_image(GLcontext *ctx, GLuint dims,
+make_temp_float_image(struct gl_context *ctx, GLuint dims,
                       GLenum logicalBaseFormat,
                       GLenum textureBaseFormat,
                       GLint srcWidth, GLint srcHeight, GLint srcDepth,
@@ -310,11 +317,18 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
 {
    GLuint transferOps = ctx->_ImageTransferState;
    GLfloat *tempImage;
+   const GLint components = _mesa_components_in_format(logicalBaseFormat);
+   const GLint srcStride =
+      _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);
+   GLfloat *dst;
+   GLint img, row;
 
    ASSERT(dims >= 1 && dims <= 3);
 
    ASSERT(logicalBaseFormat == GL_RGBA ||
           logicalBaseFormat == GL_RGB ||
+          logicalBaseFormat == GL_RG ||
+          logicalBaseFormat == GL_RED ||
           logicalBaseFormat == GL_LUMINANCE_ALPHA ||
           logicalBaseFormat == GL_LUMINANCE ||
           logicalBaseFormat == GL_ALPHA ||
@@ -324,6 +338,8 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
 
    ASSERT(textureBaseFormat == GL_RGBA ||
           textureBaseFormat == GL_RGB ||
+          textureBaseFormat == GL_RG ||
+          textureBaseFormat == GL_RED ||
           textureBaseFormat == GL_LUMINANCE_ALPHA ||
           textureBaseFormat == GL_LUMINANCE ||
           textureBaseFormat == GL_ALPHA ||
@@ -331,126 +347,24 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
           textureBaseFormat == GL_COLOR_INDEX ||
           textureBaseFormat == GL_DEPTH_COMPONENT);
 
-   /* conventional color image */
-
-   if ((dims == 1 && ctx->Pixel.Convolution1DEnabled) ||
-       (dims >= 2 && ctx->Pixel.Convolution2DEnabled) ||
-       (dims >= 2 && ctx->Pixel.Separable2DEnabled)) {
-      /* need image convolution */
-      const GLuint preConvTransferOps
-         = (transferOps & IMAGE_PRE_CONVOLUTION_BITS) | IMAGE_CLAMP_BIT;
-      const GLuint postConvTransferOps
-         = (transferOps & IMAGE_POST_CONVOLUTION_BITS) | IMAGE_CLAMP_BIT;
-      GLint img, row;
-      GLint convWidth = srcWidth, convHeight = srcHeight;
-      GLfloat *convImage;
-
-      /* pre-convolution image buffer (3D) */
-      tempImage = (GLfloat *) malloc(srcWidth * srcHeight * srcDepth
-                                           * 4 * sizeof(GLfloat));
-      if (!tempImage)
-         return NULL;
-
-      /* post-convolution image buffer (2D) */
-      convImage = (GLfloat *) malloc(srcWidth * srcHeight
-                                           * 4 * sizeof(GLfloat));
-      if (!convImage) {
-         free(tempImage);
-         return NULL;
-      }
-
-      /* loop over 3D image slices */
-      for (img = 0; img < srcDepth; img++) {
-         GLfloat *dst = tempImage + img * (srcWidth * srcHeight * 4);
-
-         /* unpack and do transfer ops up to convolution */
-         for (row = 0; row < srcHeight; row++) {
-            const GLvoid *src = _mesa_image_address(dims, srcPacking,
-                                              srcAddr, srcWidth, srcHeight,
-                                              srcFormat, srcType, img, row, 0);
-            _mesa_unpack_color_span_float(ctx, srcWidth, GL_RGBA, dst,
-                                          srcFormat, srcType, src,
-                                          srcPacking,
-                                          preConvTransferOps);
-            dst += srcWidth * 4;
-         }
-
-         /* size after optional convolution */
-         convWidth = srcWidth;
-         convHeight = srcHeight;
-
-#if FEATURE_convolve
-         /* do convolution */
-         {
-            GLfloat *src = tempImage + img * (srcWidth * srcHeight * 4);
-            if (dims == 1) {
-               ASSERT(ctx->Pixel.Convolution1DEnabled);
-               _mesa_convolve_1d_image(ctx, &convWidth, src, convImage);
-            }
-            else {
-               if (ctx->Pixel.Convolution2DEnabled) {
-                  _mesa_convolve_2d_image(ctx, &convWidth, &convHeight,
-                                          src, convImage);
-               }
-               else {
-                  ASSERT(ctx->Pixel.Separable2DEnabled);
-                  _mesa_convolve_sep_image(ctx, &convWidth, &convHeight,
-                                           src, convImage);
-               }
-            }
-         }
-#endif
-         /* do post-convolution transfer and pack into tempImage */
-         {
-            const GLint logComponents
-               = _mesa_components_in_format(logicalBaseFormat);
-            const GLfloat *src = convImage;
-            GLfloat *dst = tempImage + img * (convWidth * convHeight * 4);
-            for (row = 0; row < convHeight; row++) {
-               _mesa_pack_rgba_span_float(ctx, convWidth,
-                                          (GLfloat (*)[4]) src,
-                                          logicalBaseFormat, GL_FLOAT,
-                                          dst, &ctx->DefaultPacking,
-                                          postConvTransferOps);
-               src += convWidth * 4;
-               dst += convWidth * logComponents;
-            }
-         }
-      } /* loop over 3D image slices */
-
-      free(convImage);
-
-      /* might need these below */
-      srcWidth = convWidth;
-      srcHeight = convHeight;
-   }
-   else {
-      /* no convolution */
-      const GLint components = _mesa_components_in_format(logicalBaseFormat);
-      const GLint srcStride =
-         _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);
-      GLfloat *dst;
-      GLint img, row;
-
-      tempImage = (GLfloat *) malloc(srcWidth * srcHeight * srcDepth
-                                           * components * sizeof(GLfloat));
-      if (!tempImage)
-         return NULL;
+   tempImage = (GLfloat *) malloc(srcWidth * srcHeight * srcDepth
+				  * components * sizeof(GLfloat));
+   if (!tempImage)
+      return NULL;
 
-      dst = tempImage;
-      for (img = 0; img < srcDepth; img++) {
-         const GLubyte *src
-            = (const GLubyte *) _mesa_image_address(dims, srcPacking, srcAddr,
-                                                    srcWidth, srcHeight,
-                                                    srcFormat, srcType,
-                                                    img, 0, 0);
-         for (row = 0; row < srcHeight; row++) {
-            _mesa_unpack_color_span_float(ctx, srcWidth, logicalBaseFormat,
-                                          dst, srcFormat, srcType, src,
-                                          srcPacking, transferOps);
-            dst += srcWidth * components;
-            src += srcStride;
-         }
+   dst = tempImage;
+   for (img = 0; img < srcDepth; img++) {
+      const GLubyte *src
+	 = (const GLubyte *) _mesa_image_address(dims, srcPacking, srcAddr,
+						 srcWidth, srcHeight,
+						 srcFormat, srcType,
+						 img, 0, 0);
+      for (row = 0; row < srcHeight; row++) {
+	 _mesa_unpack_color_span_float(ctx, srcWidth, logicalBaseFormat,
+				       dst, srcFormat, srcType, src,
+				       srcPacking, transferOps);
+	 dst += srcWidth * components;
+	 src += srcStride;
       }
    }
 
@@ -507,7 +421,7 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
  * Apply all needed pixel unpacking and pixel transfer operations.
  * Note that there are both logicalBaseFormat and textureBaseFormat parameters.
  * Suppose the user specifies GL_LUMINANCE as the internal texture format
- * but the graphics hardware doesn't support luminance textures.  So, might
+ * but the graphics hardware doesn't support luminance textures.  So, we might
  * use an RGB hardware format instead.
  * If logicalBaseFormat != textureBaseFormat we have some extra work to do.
  *
@@ -526,7 +440,7 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
  * \return resulting image with format = textureBaseFormat and type = GLchan.
  */
 GLchan *
-_mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
+_mesa_make_temp_chan_image(struct gl_context *ctx, GLuint dims,
                            GLenum logicalBaseFormat,
                            GLenum textureBaseFormat,
                            GLint srcWidth, GLint srcHeight, GLint srcDepth,
@@ -536,7 +450,6 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
 {
    GLuint transferOps = ctx->_ImageTransferState;
    const GLint components = _mesa_components_in_format(logicalBaseFormat);
-   GLboolean freeSrcImage = GL_FALSE;
    GLint img, row;
    GLchan *tempImage, *dst;
 
@@ -544,6 +457,8 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
 
    ASSERT(logicalBaseFormat == GL_RGBA ||
           logicalBaseFormat == GL_RGB ||
+          logicalBaseFormat == GL_RG ||
+          logicalBaseFormat == GL_RED ||
           logicalBaseFormat == GL_LUMINANCE_ALPHA ||
           logicalBaseFormat == GL_LUMINANCE ||
           logicalBaseFormat == GL_ALPHA ||
@@ -551,42 +466,17 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
 
    ASSERT(textureBaseFormat == GL_RGBA ||
           textureBaseFormat == GL_RGB ||
+          textureBaseFormat == GL_RG ||
+          textureBaseFormat == GL_RED ||
           textureBaseFormat == GL_LUMINANCE_ALPHA ||
           textureBaseFormat == GL_LUMINANCE ||
           textureBaseFormat == GL_ALPHA ||
           textureBaseFormat == GL_INTENSITY);
 
-#if FEATURE_convolve
-   if ((dims == 1 && ctx->Pixel.Convolution1DEnabled) ||
-       (dims >= 2 && ctx->Pixel.Convolution2DEnabled) ||
-       (dims >= 2 && ctx->Pixel.Separable2DEnabled)) {
-      /* get convolved image */
-      GLfloat *convImage = make_temp_float_image(ctx, dims,
-                                                 logicalBaseFormat,
-                                                 logicalBaseFormat,
-                                                 srcWidth, srcHeight, srcDepth,
-                                                 srcFormat, srcType,
-                                                 srcAddr, srcPacking);
-      if (!convImage)
-         return NULL;
-      /* the convolved image is our new source image */
-      srcAddr = convImage;
-      srcFormat = logicalBaseFormat;
-      srcType = GL_FLOAT;
-      srcPacking = &ctx->DefaultPacking;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-      transferOps = 0;
-      freeSrcImage = GL_TRUE;
-   }
-#endif
-
    /* unpack and transfer the source image */
    tempImage = (GLchan *) malloc(srcWidth * srcHeight * srcDepth
                                        * components * sizeof(GLchan));
    if (!tempImage) {
-      if (freeSrcImage) {
-         free((void *) srcAddr);
-      }
       return NULL;
    }
 
@@ -608,11 +498,6 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
       }
    }
 
-   /* If we made a temporary image for convolution, free it here */
-   if (freeSrcImage) {
-      free((void *) srcAddr);
-   }
-
    if (logicalBaseFormat != textureBaseFormat) {
       /* one more conversion step */
       GLint texComponents = _mesa_components_in_format(textureBaseFormat);
@@ -789,7 +674,10 @@ swizzle_copy(GLubyte *dst, GLuint dstComponents, const GLubyte *src,
 static const GLubyte map_identity[6] = { 0, 1, 2, 3, ZERO, ONE };
 static const GLubyte map_3210[6] = { 3, 2, 1, 0, ZERO, ONE };
 
-/* Deal with the _REV input types:
+
+/**
+ * For 1-byte/pixel formats (or 8_8_8_8 packed formats), return a
+ * mapping array depending on endianness.
  */
 static const GLubyte *
 type_mapping( GLenum srcType )
@@ -807,7 +695,10 @@ type_mapping( GLenum srcType )
    }
 }
 
-/* Mapping required if input type is 
+
+/**
+ * For 1-byte/pixel formats (or 8_8_8_8 packed formats), return a
+ * mapping array depending on pixelstore byte swapping state.
  */
 static const GLubyte *
 byteswap_mapping( GLboolean swapBytes,
@@ -834,7 +725,7 @@ byteswap_mapping( GLboolean swapBytes,
  * Transfer a GLubyte texture image with component swizzling.
  */
 static void
-_mesa_swizzle_ubyte_image(GLcontext *ctx, 
+_mesa_swizzle_ubyte_image(struct gl_context *ctx, 
 			  GLuint dimensions,
 			  GLenum srcFormat,
 			  GLenum srcType,
@@ -921,7 +812,7 @@ _mesa_swizzle_ubyte_image(GLcontext *ctx,
  * 1D, 2D and 3D images supported.
  */
 static void
-memcpy_texture(GLcontext *ctx,
+memcpy_texture(struct gl_context *ctx,
 	       GLuint dimensions,
                gl_format dstFormat,
                GLvoid *dstAddr,
@@ -1238,7 +1129,6 @@ _mesa_texstore_rgb565(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -1365,7 +1255,6 @@ _mesa_texstore_rgba8888(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -1546,7 +1435,6 @@ _mesa_texstore_argb8888(TEXSTORE_PARAMS)
       _mesa_swizzle_ubyte_image(ctx, dims,
 				srcFormat,
 				srcType,
-
 				baseInternalFormat,
 				dstmap, 4,
 				dstAddr, dstXoffset, dstYoffset, dstZoffset,
@@ -1567,7 +1455,6 @@ _mesa_texstore_argb8888(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -1697,7 +1584,6 @@ _mesa_texstore_rgb888(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -1824,7 +1710,6 @@ _mesa_texstore_bgr888(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -1882,7 +1767,6 @@ _mesa_texstore_argb4444(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -1951,7 +1835,6 @@ _mesa_texstore_rgba5551(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -2010,7 +1893,6 @@ _mesa_texstore_argb1555(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -2045,22 +1927,26 @@ _mesa_texstore_argb1555(TEXSTORE_PARAMS)
 }
 
 
+/**
+ * Do texstore for 2-channel, 8-bit/channel, unsigned normalized formats.
+ */
 static GLboolean
-_mesa_texstore_al88(TEXSTORE_PARAMS)
+_mesa_texstore_unorm88(TEXSTORE_PARAMS)
 {
    const GLboolean littleEndian = _mesa_little_endian();
    const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
    const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
 
    ASSERT(dstFormat == MESA_FORMAT_AL88 ||
-          dstFormat == MESA_FORMAT_AL88_REV);
+          dstFormat == MESA_FORMAT_AL88_REV ||
+          dstFormat == MESA_FORMAT_RG88 ||
+          dstFormat == MESA_FORMAT_RG88_REV);
    ASSERT(texelBytes == 2);
 
    if (!ctx->_ImageTransferState &&
        !srcPacking->SwapBytes &&
-       dstFormat == MESA_FORMAT_AL88 &&
-       baseInternalFormat == GL_LUMINANCE_ALPHA &&
-       srcFormat == GL_LUMINANCE_ALPHA &&
+       (dstFormat == MESA_FORMAT_AL88 || dstFormat == MESA_FORMAT_RG88) &&
+       baseInternalFormat == srcFormat &&
        srcType == GL_UNSIGNED_BYTE &&
        littleEndian) {
       /* simple memcpy path */
@@ -2076,19 +1962,31 @@ _mesa_texstore_al88(TEXSTORE_PARAMS)
 	    srcType == GL_UNSIGNED_BYTE &&
 	    can_swizzle(baseInternalFormat) &&
 	    can_swizzle(srcFormat)) {
-
       GLubyte dstmap[4];
 
       /* dstmap - how to swizzle from RGBA to dst format:
        */
-      if ((littleEndian && dstFormat == MESA_FORMAT_AL88) ||
-	  (!littleEndian && dstFormat == MESA_FORMAT_AL88_REV)) {
-	 dstmap[0] = 0;
-	 dstmap[1] = 3;
+      if (dstFormat == MESA_FORMAT_AL88 || dstFormat == MESA_FORMAT_AL88_REV) {
+	 if ((littleEndian && dstFormat == MESA_FORMAT_AL88) ||
+	     (!littleEndian && dstFormat == MESA_FORMAT_AL88_REV)) {
+	    dstmap[0] = 0;
+	    dstmap[1] = 3;
+	 }
+	 else {
+	    dstmap[0] = 3;
+	    dstmap[1] = 0;
+	 }
       }
       else {
-	 dstmap[0] = 3;
-	 dstmap[1] = 0;
+	 if ((littleEndian && dstFormat == MESA_FORMAT_RG88) ||
+	     (!littleEndian && dstFormat == MESA_FORMAT_RG88_REV)) {
+	    dstmap[0] = 0;
+	    dstmap[1] = 1;
+	 }
+	 else {
+	    dstmap[0] = 1;
+	    dstmap[1] = 0;
+	 }
       }
       dstmap[2] = ZERO;		/* ? */
       dstmap[3] = ONE;		/* ? */
@@ -2115,7 +2013,6 @@ _mesa_texstore_al88(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -2123,7 +2020,8 @@ _mesa_texstore_al88(TEXSTORE_PARAMS)
             + dstXoffset * texelBytes;
          for (row = 0; row < srcHeight; row++) {
             GLushort *dstUS = (GLushort *) dstRow;
-            if (dstFormat == MESA_FORMAT_AL88) {
+            if (dstFormat == MESA_FORMAT_AL88 ||
+		dstFormat == MESA_FORMAT_RG88) {
                for (col = 0; col < srcWidth; col++) {
                   /* src[0] is luminance, src[1] is alpha */
                  dstUS[col] = PACK_COLOR_88( CHAN_TO_UBYTE(src[1]),
@@ -2148,22 +2046,26 @@ _mesa_texstore_al88(TEXSTORE_PARAMS)
 }
 
 
+/**
+ * Do texstore for 2-channel, 16-bit/channel, unsigned normalized formats.
+ */
 static GLboolean
-_mesa_texstore_al1616(TEXSTORE_PARAMS)
+_mesa_texstore_unorm1616(TEXSTORE_PARAMS)
 {
    const GLboolean littleEndian = _mesa_little_endian();
    const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
    const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
 
    ASSERT(dstFormat == MESA_FORMAT_AL1616 ||
-          dstFormat == MESA_FORMAT_AL1616_REV);
+          dstFormat == MESA_FORMAT_AL1616_REV ||
+	  dstFormat == MESA_FORMAT_RG1616 ||
+          dstFormat == MESA_FORMAT_RG1616_REV);
    ASSERT(texelBytes == 4);
 
    if (!ctx->_ImageTransferState &&
        !srcPacking->SwapBytes &&
-       dstFormat == MESA_FORMAT_AL1616 &&
-       baseInternalFormat == GL_LUMINANCE_ALPHA &&
-       srcFormat == GL_LUMINANCE_ALPHA &&
+       (dstFormat == MESA_FORMAT_AL1616 || dstFormat == MESA_FORMAT_RG1616) &&
+       baseInternalFormat == srcFormat &&
        srcType == GL_UNSIGNED_SHORT &&
        littleEndian) {
       /* simple memcpy path */
@@ -2186,7 +2088,6 @@ _mesa_texstore_al1616(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -2194,7 +2095,8 @@ _mesa_texstore_al1616(TEXSTORE_PARAMS)
             + dstXoffset * texelBytes;
          for (row = 0; row < srcHeight; row++) {
             GLuint *dstUI = (GLuint *) dstRow;
-            if (dstFormat == MESA_FORMAT_AL1616) {
+            if (dstFormat == MESA_FORMAT_AL1616 ||
+		dstFormat == MESA_FORMAT_RG1616) {
                for (col = 0; col < srcWidth; col++) {
 		  GLushort l, a;
 
@@ -2224,6 +2126,66 @@ _mesa_texstore_al1616(TEXSTORE_PARAMS)
 
 
 static GLboolean
+_mesa_texstore_r16(TEXSTORE_PARAMS)
+{
+   const GLboolean littleEndian = _mesa_little_endian();
+   const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
+   const GLenum baseFormat = _mesa_get_format_base_format(dstFormat);
+
+   ASSERT(dstFormat == MESA_FORMAT_R16);
+   ASSERT(texelBytes == 2);
+
+   if (!ctx->_ImageTransferState &&
+       !srcPacking->SwapBytes &&
+       dstFormat == MESA_FORMAT_R16 &&
+       baseInternalFormat == GL_RED &&
+       srcFormat == GL_RED &&
+       srcType == GL_UNSIGNED_SHORT &&
+       littleEndian) {
+      /* simple memcpy path */
+      memcpy_texture(ctx, dims,
+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
+                     dstRowStride,
+                     dstImageOffsets,
+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
+                     srcAddr, srcPacking);
+   }
+   else {
+      /* general path */
+      const GLfloat *tempImage = make_temp_float_image(ctx, dims,
+                                                 baseInternalFormat,
+                                                 baseFormat,
+                                                 srcWidth, srcHeight, srcDepth,
+                                                 srcFormat, srcType, srcAddr,
+                                                 srcPacking);
+      const GLfloat *src = tempImage;
+      GLint img, row, col;
+      if (!tempImage)
+         return GL_FALSE;
+      for (img = 0; img < srcDepth; img++) {
+         GLubyte *dstRow = (GLubyte *) dstAddr
+            + dstImageOffsets[dstZoffset + img] * texelBytes
+            + dstYoffset * dstRowStride
+            + dstXoffset * texelBytes;
+         for (row = 0; row < srcHeight; row++) {
+            GLushort *dstUS = (GLushort *) dstRow;
+	    for (col = 0; col < srcWidth; col++) {
+	       GLushort r;
+
+	       UNCLAMPED_FLOAT_TO_USHORT(r, src[0]);
+	       dstUS[col] = r;
+	       src += 1;
+	    }
+            dstRow += dstRowStride;
+         }
+      }
+      free((void *) tempImage);
+   }
+   return GL_TRUE;
+}
+
+
+static GLboolean
 _mesa_texstore_rgba_16(TEXSTORE_PARAMS)
 {
    const GLuint texelBytes = _mesa_get_format_bytes(dstFormat);
@@ -2257,7 +2219,6 @@ _mesa_texstore_rgba_16(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -2327,8 +2288,6 @@ _mesa_texstore_signed_rgba_16(TEXSTORE_PARAMS)
       if (!tempImage)
          return GL_FALSE;
 
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
-
       /* Note: tempImage is always float[4] / RGBA.  We convert to 1, 2,
        * 3 or 4 components/pixel here.
        */
@@ -2390,7 +2349,6 @@ _mesa_texstore_rgb332(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -2423,7 +2381,8 @@ _mesa_texstore_a8(TEXSTORE_PARAMS)
 
    ASSERT(dstFormat == MESA_FORMAT_A8 ||
           dstFormat == MESA_FORMAT_L8 ||
-          dstFormat == MESA_FORMAT_I8);
+          dstFormat == MESA_FORMAT_I8 ||
+          dstFormat == MESA_FORMAT_R8);
    ASSERT(texelBytes == 1);
 
    if (!ctx->_ImageTransferState &&
@@ -2442,7 +2401,6 @@ _mesa_texstore_a8(TEXSTORE_PARAMS)
 	    srcType == GL_UNSIGNED_BYTE &&
 	    can_swizzle(baseInternalFormat) &&
 	    can_swizzle(srcFormat)) {
-
       GLubyte dstmap[4];
 
       /* dstmap - how to swizzle from RGBA to dst format:
@@ -2479,7 +2437,6 @@ _mesa_texstore_a8(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -2617,7 +2574,6 @@ _mesa_texstore_dudv8(TEXSTORE_PARAMS)
                      srcAddr, srcPacking);
    }
    else if (srcType == GL_BYTE) {
-
       GLubyte dstmap[4];
 
       /* dstmap - how to swizzle from RGBA to dst format:
@@ -2710,7 +2666,6 @@ _mesa_texstore_signed_r8(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -2755,7 +2710,6 @@ _mesa_texstore_signed_rg88(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -2800,7 +2754,6 @@ _mesa_texstore_signed_rgbx8888(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -2826,7 +2779,8 @@ _mesa_texstore_signed_rgbx8888(TEXSTORE_PARAMS)
 
 
 /**
- * Store a texture in MESA_FORMAT_SIGNED_RGBA8888 or MESA_FORMAT_SIGNED_RGBA8888_REV
+ * Store a texture in MESA_FORMAT_SIGNED_RGBA8888 or
+ * MESA_FORMAT_SIGNED_RGBA8888_REV
  */
 static GLboolean
 _mesa_texstore_signed_rgba8888(TEXSTORE_PARAMS)
@@ -2912,7 +2866,6 @@ _mesa_texstore_signed_rgba8888(TEXSTORE_PARAMS)
       GLint img, row, col;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -2963,36 +2916,7 @@ _mesa_texstore_z24_s8(TEXSTORE_PARAMS)
    ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT || srcFormat == GL_DEPTH_COMPONENT);
    ASSERT(srcFormat != GL_DEPTH_STENCIL_EXT || srcType == GL_UNSIGNED_INT_24_8_EXT);
 
-   /* In case we only upload depth we need to preserve the stencil */
-   if (srcFormat == GL_DEPTH_COMPONENT) {
-      for (img = 0; img < srcDepth; img++) {
-         GLuint *dstRow = (GLuint *) dstAddr
-            + dstImageOffsets[dstZoffset + img]
-            + dstYoffset * dstRowStride / sizeof(GLuint)
-            + dstXoffset;
-         const GLuint *src
-            = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
-                  srcWidth, srcHeight,
-                  srcFormat, srcType,
-                  img, 0, 0);
-         for (row = 0; row < srcHeight; row++) {
-            GLuint depth[MAX_WIDTH];
-            GLint i;
-            _mesa_unpack_depth_span(ctx, srcWidth,
-                                    GL_UNSIGNED_INT, /* dst type */
-                                    depth, /* dst addr */
-                                    depthScale,
-                                    srcType, src, srcPacking);
-
-            for (i = 0; i < srcWidth; i++)
-               dstRow[i] = depth[i] << 8 | (dstRow[i] & 0x000000FF);
-
-            src += srcRowStride;
-            dstRow += dstRowStride / sizeof(GLuint);
-         }
-      }
-   }
-   else if (ctx->Pixel.DepthScale == 1.0f &&
+   if (srcFormat != GL_DEPTH_COMPONENT && ctx->Pixel.DepthScale == 1.0f &&
        ctx->Pixel.DepthBias == 0.0f &&
        !srcPacking->SwapBytes) {
       /* simple path */
@@ -3003,41 +2927,53 @@ _mesa_texstore_z24_s8(TEXSTORE_PARAMS)
                      srcWidth, srcHeight, srcDepth, srcFormat, srcType,
                      srcAddr, srcPacking);
    }
-   else {
-      /* general path */
-      const GLint srcRowStride
-         = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)
-         / sizeof(GLuint);
-      GLint img, row;
-
+   else if (srcFormat == GL_DEPTH_COMPONENT) {
+      /* In case we only upload depth we need to preserve the stencil */
       for (img = 0; img < srcDepth; img++) {
-         GLuint *dstRow = (GLuint *) dstAddr
+	 GLuint *dstRow = (GLuint *) dstAddr
             + dstImageOffsets[dstZoffset + img]
             + dstYoffset * dstRowStride / sizeof(GLuint)
             + dstXoffset;
          const GLuint *src
             = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
-                                                   srcWidth, srcHeight,
-                                                   srcFormat, srcType,
-                                                   img, 0, 0);
+                  srcWidth, srcHeight,
+                  srcFormat, srcType,
+                  img, 0, 0);
          for (row = 0; row < srcHeight; row++) {
-            GLubyte stencil[MAX_WIDTH];
+            GLuint depth[MAX_WIDTH];
+	    GLubyte stencil[MAX_WIDTH];
             GLint i;
-            /* the 24 depth bits will be in the high position: */
-            _mesa_unpack_depth_span(ctx, srcWidth,
-                                    GL_UNSIGNED_INT_24_8_EXT, /* dst type */
-                                    dstRow, /* dst addr */
-                                    depthScale,
-                                    srcType, src, srcPacking);
-            /* get the 8-bit stencil values */
-            _mesa_unpack_stencil_span(ctx, srcWidth,
-                                      GL_UNSIGNED_BYTE, /* dst type */
-                                      stencil, /* dst addr */
-                                      srcType, src, srcPacking,
-                                      ctx->_ImageTransferState);
-            /* merge stencil values into depth values */
-            for (i = 0; i < srcWidth; i++)
-               dstRow[i] |= stencil[i];
+	    GLboolean keepdepth = GL_FALSE, keepstencil = GL_FALSE;
+
+	    if (srcFormat == GL_DEPTH_COMPONENT) { /* preserve stencil */
+	       keepstencil = GL_TRUE;
+	    }
+            else if (srcFormat == GL_STENCIL_INDEX) { /* preserve depth */
+	       keepdepth = GL_TRUE;
+	    }
+
+	    if (keepdepth == GL_FALSE)
+	       /* the 24 depth bits will be in the low position: */
+	       _mesa_unpack_depth_span(ctx, srcWidth,
+				       GL_UNSIGNED_INT, /* dst type */
+				       keepstencil ? depth : dstRow, /* dst addr */
+				       depthScale,
+				       srcType, src, srcPacking);
+
+	    if (keepstencil == GL_FALSE)
+	       /* get the 8-bit stencil values */
+	       _mesa_unpack_stencil_span(ctx, srcWidth,
+					 GL_UNSIGNED_BYTE, /* dst type */
+					 stencil, /* dst addr */
+					 srcType, src, srcPacking,
+					 ctx->_ImageTransferState);
+
+	    for (i = 0; i < srcWidth; i++) {
+	       if (keepstencil)
+		  dstRow[i] = depth[i] << 8 | (dstRow[i] & 0x000000FF);
+	       else
+		  dstRow[i] = (dstRow[i] & 0xFFFFFF00) | (stencil[i] & 0xFF);
+	    }
 
             src += srcRowStride;
             dstRow += dstRowStride / sizeof(GLuint);
@@ -3061,58 +2997,108 @@ _mesa_texstore_s8_z24(TEXSTORE_PARAMS)
    GLint img, row;
 
    ASSERT(dstFormat == MESA_FORMAT_S8_Z24);
-   ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT || srcFormat == GL_DEPTH_COMPONENT);
-   ASSERT(srcFormat != GL_DEPTH_STENCIL_EXT || srcType == GL_UNSIGNED_INT_24_8_EXT);
+   ASSERT(srcFormat == GL_DEPTH_STENCIL_EXT ||
+          srcFormat == GL_DEPTH_COMPONENT ||
+          srcFormat == GL_STENCIL_INDEX);
+   ASSERT(srcFormat != GL_DEPTH_STENCIL_EXT ||
+          srcType == GL_UNSIGNED_INT_24_8_EXT);
 
-   /* In case we only upload depth we need to preserve the stencil */
-   if (srcFormat == GL_DEPTH_COMPONENT) {
-      for (img = 0; img < srcDepth; img++) {
-         GLuint *dstRow = (GLuint *) dstAddr
-            + dstImageOffsets[dstZoffset + img]
-            + dstYoffset * dstRowStride / sizeof(GLuint)
-            + dstXoffset;
-         const GLuint *src
-            = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
-                  srcWidth, srcHeight,
-                  srcFormat, srcType,
-                  img, 0, 0);
-         for (row = 0; row < srcHeight; row++) {
-            GLuint depth[MAX_WIDTH];
-            GLint i;
-            _mesa_unpack_depth_span(ctx, srcWidth,
-                                    GL_UNSIGNED_INT, /* dst type */
-                                    depth, /* dst addr */
-                                    depthScale,
-                                    srcType, src, srcPacking);
+   for (img = 0; img < srcDepth; img++) {
+      GLuint *dstRow = (GLuint *) dstAddr
+	 + dstImageOffsets[dstZoffset + img]
+	 + dstYoffset * dstRowStride / sizeof(GLuint)
+	 + dstXoffset;
+      const GLuint *src
+	 = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
+						srcWidth, srcHeight,
+						srcFormat, srcType,
+						img, 0, 0);
+      for (row = 0; row < srcHeight; row++) {
+	 GLuint depth[MAX_WIDTH];
+	 GLubyte stencil[MAX_WIDTH];
+	 GLint i;
+	 GLboolean keepdepth = GL_FALSE, keepstencil = GL_FALSE;
+	 
+	 if (srcFormat == GL_DEPTH_COMPONENT) { /* preserve stencil */
+	    keepstencil = GL_TRUE;
+	 }
+         else if (srcFormat == GL_STENCIL_INDEX) { /* preserve depth */
+	    keepdepth = GL_TRUE;
+	 }
+
+	 if (keepdepth == GL_FALSE)
+	    /* the 24 depth bits will be in the low position: */
+	    _mesa_unpack_depth_span(ctx, srcWidth,
+				    GL_UNSIGNED_INT, /* dst type */
+				    keepstencil ? depth : dstRow, /* dst addr */
+				    depthScale,
+				    srcType, src, srcPacking);	 
+
+	 if (keepstencil == GL_FALSE)
+	    /* get the 8-bit stencil values */
+	    _mesa_unpack_stencil_span(ctx, srcWidth,
+				      GL_UNSIGNED_BYTE, /* dst type */
+				      stencil, /* dst addr */
+				      srcType, src, srcPacking,
+				      ctx->_ImageTransferState);
+
+	 /* merge stencil values into depth values */
+	 for (i = 0; i < srcWidth; i++) {
+	    if (keepstencil)
+	       dstRow[i] = depth[i] | (dstRow[i] & 0xFF000000);
+	    else
+	       dstRow[i] = (dstRow[i] & 0xFFFFFF) | (stencil[i] << 24);
+
+	 }
+	 src += srcRowStride;
+	 dstRow += dstRowStride / sizeof(GLuint);
+      }
+   }
+   return GL_TRUE;
+}
 
-            for (i = 0; i < srcWidth; i++)
-               dstRow[i] = depth[i] | (dstRow[i] & 0xFF000000);
 
-            src += srcRowStride;
-            dstRow += dstRowStride / sizeof(GLuint);
-         }
-      }
+/**
+ * Store simple 8-bit/value stencil texture data.
+ */
+static GLboolean
+_mesa_texstore_s8(TEXSTORE_PARAMS)
+{
+   ASSERT(dstFormat == MESA_FORMAT_S8);
+   ASSERT(srcFormat == GL_STENCIL_INDEX);
+
+   if (!ctx->_ImageTransferState &&
+       !srcPacking->SwapBytes &&
+       baseInternalFormat == srcFormat &&
+       srcType == GL_UNSIGNED_BYTE) {
+      /* simple memcpy path */
+      memcpy_texture(ctx, dims,
+                     dstFormat, dstAddr, dstXoffset, dstYoffset, dstZoffset,
+                     dstRowStride,
+                     dstImageOffsets,
+                     srcWidth, srcHeight, srcDepth, srcFormat, srcType,
+                     srcAddr, srcPacking);
    }
    else {
+      const GLint srcRowStride
+	 = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)
+	 / sizeof(GLuint);
+      GLint img, row;
+      
       for (img = 0; img < srcDepth; img++) {
-         GLuint *dstRow = (GLuint *) dstAddr
+         GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img]
             + dstYoffset * dstRowStride / sizeof(GLuint)
             + dstXoffset;
          const GLuint *src
             = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
-                  srcWidth, srcHeight,
-                  srcFormat, srcType,
-                  img, 0, 0);
+                                                   srcWidth, srcHeight,
+                                                   srcFormat, srcType,
+                                                   img, 0, 0);
          for (row = 0; row < srcHeight; row++) {
             GLubyte stencil[MAX_WIDTH];
             GLint i;
-            /* the 24 depth bits will be in the low position: */
-            _mesa_unpack_depth_span(ctx, srcWidth,
-                                    GL_UNSIGNED_INT, /* dst type */
-                                    dstRow, /* dst addr */
-                                    depthScale,
-                                    srcType, src, srcPacking);
+
             /* get the 8-bit stencil values */
             _mesa_unpack_stencil_span(ctx, srcWidth,
                                       GL_UNSIGNED_BYTE, /* dst type */
@@ -3121,16 +3107,19 @@ _mesa_texstore_s8_z24(TEXSTORE_PARAMS)
                                       ctx->_ImageTransferState);
             /* merge stencil values into depth values */
             for (i = 0; i < srcWidth; i++)
-               dstRow[i] |= stencil[i] << 24;
+               dstRow[i] = stencil[i];
 
             src += srcRowStride;
-            dstRow += dstRowStride / sizeof(GLuint);
+            dstRow += dstRowStride / sizeof(GLubyte);
          }
       }
+
    }
+
    return GL_TRUE;
 }
 
+
 /**
  * Store an image in any of the formats:
  *   _mesa_texformat_rgba_float32
@@ -3186,7 +3175,6 @@ _mesa_texstore_rgba_float32(TEXSTORE_PARAMS)
       GLint img, row;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       bytesPerRow = srcWidth * components * sizeof(GLfloat);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
@@ -3206,6 +3194,7 @@ _mesa_texstore_rgba_float32(TEXSTORE_PARAMS)
 }
 
 
+
 /**
  * As above, but store 16-bit floats.
  */
@@ -3254,7 +3243,6 @@ _mesa_texstore_rgba_float16(TEXSTORE_PARAMS)
       GLint img, row;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -3318,7 +3306,6 @@ _mesa_texstore_rgba_int8(TEXSTORE_PARAMS)
       GLint img, row;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -3382,7 +3369,6 @@ _mesa_texstore_rgba_int16(TEXSTORE_PARAMS)
       GLint img, row;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -3446,7 +3432,6 @@ _mesa_texstore_rgba_int32(TEXSTORE_PARAMS)
       GLint img, row;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -3510,7 +3495,6 @@ _mesa_texstore_rgba_uint8(TEXSTORE_PARAMS)
       GLint img, row;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -3574,7 +3558,6 @@ _mesa_texstore_rgba_uint16(TEXSTORE_PARAMS)
       GLint img, row;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -3638,7 +3621,6 @@ _mesa_texstore_rgba_uint32(TEXSTORE_PARAMS)
       GLint img, row;
       if (!tempImage)
          return GL_FALSE;
-      _mesa_adjust_image_for_convolution(ctx, dims, &srcWidth, &srcHeight);
       for (img = 0; img < srcDepth; img++) {
          GLubyte *dstRow = (GLubyte *) dstAddr
             + dstImageOffsets[dstZoffset + img] * texelBytes
@@ -3676,12 +3658,12 @@ _mesa_texstore_srgb8(TEXSTORE_PARAMS)
    newDstFormat = MESA_FORMAT_RGB888;
 
    k = _mesa_texstore_rgb888(ctx, dims, baseInternalFormat,
-             newDstFormat, dstAddr,
-             dstXoffset, dstYoffset, dstZoffset,
-             dstRowStride, dstImageOffsets,
-             srcWidth, srcHeight, srcDepth,
-             srcFormat, srcType,
-             srcAddr, srcPacking);
+                             newDstFormat, dstAddr,
+                             dstXoffset, dstYoffset, dstZoffset,
+                             dstRowStride, dstImageOffsets,
+                             srcWidth, srcHeight, srcDepth,
+                             srcFormat, srcType,
+                             srcAddr, srcPacking);
    return k;
 }
 
@@ -3762,13 +3744,13 @@ _mesa_texstore_sla8(TEXSTORE_PARAMS)
    /* reuse normal luminance/alpha texstore code */
    newDstFormat = MESA_FORMAT_AL88;
 
-   k = _mesa_texstore_al88(ctx, dims, baseInternalFormat,
-                           newDstFormat, dstAddr,
-                           dstXoffset, dstYoffset, dstZoffset,
-                           dstRowStride, dstImageOffsets,
-                           srcWidth, srcHeight, srcDepth,
-                           srcFormat, srcType,
-                           srcAddr, srcPacking);
+   k = _mesa_texstore_unorm88(ctx, dims, baseInternalFormat,
+			      newDstFormat, dstAddr,
+			      dstXoffset, dstYoffset, dstZoffset,
+			      dstRowStride, dstImageOffsets,
+			      srcWidth, srcHeight, srcDepth,
+			      srcFormat, srcType,
+			      srcAddr, srcPacking);
    return k;
 }
 
@@ -3787,7 +3769,7 @@ _mesa_texstore_sla8(TEXSTORE_PARAMS)
 
 
 /**
- * Table mapping MESA_FORMAT_8 to _mesa_texstore_*()
+ * Table mapping MESA_FORMAT_* to _mesa_texstore_*()
  * XXX this is somewhat temporary.
  */
 static const struct {
@@ -3812,10 +3794,10 @@ texstore_funcs[MESA_FORMAT_COUNT] =
    { MESA_FORMAT_RGBA5551, _mesa_texstore_rgba5551 },
    { MESA_FORMAT_ARGB1555, _mesa_texstore_argb1555 },
    { MESA_FORMAT_ARGB1555_REV, _mesa_texstore_argb1555 },
-   { MESA_FORMAT_AL88, _mesa_texstore_al88 },
-   { MESA_FORMAT_AL88_REV, _mesa_texstore_al88 },
-   { MESA_FORMAT_AL1616, _mesa_texstore_al1616 },
-   { MESA_FORMAT_AL1616_REV, _mesa_texstore_al1616 },
+   { MESA_FORMAT_AL88, _mesa_texstore_unorm88 },
+   { MESA_FORMAT_AL88_REV, _mesa_texstore_unorm88 },
+   { MESA_FORMAT_AL1616, _mesa_texstore_unorm1616 },
+   { MESA_FORMAT_AL1616_REV, _mesa_texstore_unorm1616 },
    { MESA_FORMAT_RGB332, _mesa_texstore_rgb332 },
    { MESA_FORMAT_A8, _mesa_texstore_a8 },
    { MESA_FORMAT_L8, _mesa_texstore_a8 },
@@ -3823,13 +3805,19 @@ texstore_funcs[MESA_FORMAT_COUNT] =
    { MESA_FORMAT_CI8, _mesa_texstore_ci8 },
    { MESA_FORMAT_YCBCR, _mesa_texstore_ycbcr },
    { MESA_FORMAT_YCBCR_REV, _mesa_texstore_ycbcr },
+   { MESA_FORMAT_R8, _mesa_texstore_a8 },
+   { MESA_FORMAT_RG88, _mesa_texstore_unorm88 },
+   { MESA_FORMAT_RG88_REV, _mesa_texstore_unorm88 },
+   { MESA_FORMAT_R16, _mesa_texstore_r16 },
+   { MESA_FORMAT_RG1616, _mesa_texstore_unorm1616 },
+   { MESA_FORMAT_RG1616_REV, _mesa_texstore_unorm1616 },
    { MESA_FORMAT_Z24_S8, _mesa_texstore_z24_s8 },
    { MESA_FORMAT_S8_Z24, _mesa_texstore_s8_z24 },
    { MESA_FORMAT_Z16, _mesa_texstore_z16 },
    { MESA_FORMAT_X8_Z24, _mesa_texstore_x8_z24 },
    { MESA_FORMAT_Z24_X8, _mesa_texstore_z24_x8 },
    { MESA_FORMAT_Z32, _mesa_texstore_z32 },
-   { MESA_FORMAT_S8, NULL/*_mesa_texstore_s8*/ },
+   { MESA_FORMAT_S8, _mesa_texstore_s8 },
    { MESA_FORMAT_SRGB8, _mesa_texstore_srgb8 },
    { MESA_FORMAT_SRGBA8, _mesa_texstore_srgba8 },
    { MESA_FORMAT_SARGB8, _mesa_texstore_sargb8 },
@@ -3951,7 +3939,7 @@ _mesa_texstore(TEXSTORE_PARAMS)
  * The caller _must_ call _mesa_unmap_teximage_pbo() too!
  */
 const GLvoid *
-_mesa_validate_pbo_teximage(GLcontext *ctx, GLuint dimensions,
+_mesa_validate_pbo_teximage(struct gl_context *ctx, GLuint dimensions,
 			    GLsizei width, GLsizei height, GLsizei depth,
 			    GLenum format, GLenum type, const GLvoid *pixels,
 			    const struct gl_pixelstore_attrib *unpack,
@@ -3988,7 +3976,7 @@ _mesa_validate_pbo_teximage(GLcontext *ctx, GLuint dimensions,
  * The caller _must_ call _mesa_unmap_teximage_pbo() too!
  */
 const GLvoid *
-_mesa_validate_pbo_compressed_teximage(GLcontext *ctx,
+_mesa_validate_pbo_compressed_teximage(struct gl_context *ctx,
                                  GLsizei imageSize, const GLvoid *pixels,
                                  const struct gl_pixelstore_attrib *packing,
                                  const char *funcName)
@@ -4022,7 +4010,7 @@ _mesa_validate_pbo_compressed_teximage(GLcontext *ctx,
  * functions.  It unmaps the PBO buffer if it was mapped earlier.
  */
 void
-_mesa_unmap_teximage_pbo(GLcontext *ctx,
+_mesa_unmap_teximage_pbo(struct gl_context *ctx,
                          const struct gl_pixelstore_attrib *unpack)
 {
    if (_mesa_is_bufferobj(unpack->BufferObj)) {
@@ -4057,12 +4045,9 @@ texture_row_stride(const struct gl_texture_image *texImage)
  * This is the software fallback for Driver.TexImage1D()
  * and Driver.CopyTexImage1D().
  * \sa _mesa_store_teximage2d()
- * Note that the width may not be the actual texture width since it may
- * be changed by convolution w/ GL_REDUCE.  The texImage->Width field will
- * have the actual texture size.
  */
 void
-_mesa_store_teximage1d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_teximage1d(struct gl_context *ctx, GLenum target, GLint level,
                        GLint internalFormat,
                        GLint width, GLint border,
                        GLenum format, GLenum type, const GLvoid *pixels,
@@ -4114,12 +4099,9 @@ _mesa_store_teximage1d(GLcontext *ctx, GLenum target, GLint level,
  *
  * This function is oriented toward storing images in main memory, rather
  * than VRAM.  Device driver's can easily plug in their own replacement.
- *
- * Note: width and height may be pre-convolved dimensions, but
- * texImage->Width and texImage->Height will be post-convolved dimensions.
  */
 void
-_mesa_store_teximage2d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_teximage2d(struct gl_context *ctx, GLenum target, GLint level,
                        GLint internalFormat,
                        GLint width, GLint height, GLint border,
                        GLenum format, GLenum type, const void *pixels,
@@ -4172,7 +4154,7 @@ _mesa_store_teximage2d(GLcontext *ctx, GLenum target, GLint level,
  * \sa _mesa_store_teximage2d()
  */
 void
-_mesa_store_teximage3d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_teximage3d(struct gl_context *ctx, GLenum target, GLint level,
                        GLint internalFormat,
                        GLint width, GLint height, GLint depth, GLint border,
                        GLenum format, GLenum type, const void *pixels,
@@ -4225,7 +4207,7 @@ _mesa_store_teximage3d(GLcontext *ctx, GLenum target, GLint level,
  * and Driver.CopyTexSubImage1D().
  */
 void
-_mesa_store_texsubimage1d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_texsubimage1d(struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint width,
                           GLenum format, GLenum type, const void *pixels,
                           const struct gl_pixelstore_attrib *packing,
@@ -4263,7 +4245,7 @@ _mesa_store_texsubimage1d(GLcontext *ctx, GLenum target, GLint level,
  * and Driver.CopyTexSubImage2D().
  */
 void
-_mesa_store_texsubimage2d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_texsubimage2d(struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint yoffset,
                           GLint width, GLint height,
                           GLenum format, GLenum type, const void *pixels,
@@ -4301,7 +4283,7 @@ _mesa_store_texsubimage2d(GLcontext *ctx, GLenum target, GLint level,
  * and Driver.CopyTexSubImage3D().
  */
 void
-_mesa_store_texsubimage3d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_texsubimage3d(struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint yoffset, GLint zoffset,
                           GLint width, GLint height, GLint depth,
                           GLenum format, GLenum type, const void *pixels,
@@ -4339,7 +4321,7 @@ _mesa_store_texsubimage3d(GLcontext *ctx, GLenum target, GLint level,
  * Fallback for Driver.CompressedTexImage1D()
  */
 void
-_mesa_store_compressed_teximage1d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_compressed_teximage1d(struct gl_context *ctx, GLenum target, GLint level,
                                   GLint internalFormat,
                                   GLint width, GLint border,
                                   GLsizei imageSize, const GLvoid *data,
@@ -4362,7 +4344,7 @@ _mesa_store_compressed_teximage1d(GLcontext *ctx, GLenum target, GLint level,
  * Fallback for Driver.CompressedTexImage2D()
  */
 void
-_mesa_store_compressed_teximage2d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_compressed_teximage2d(struct gl_context *ctx, GLenum target, GLint level,
                                   GLint internalFormat,
                                   GLint width, GLint height, GLint border,
                                   GLsizei imageSize, const GLvoid *data,
@@ -4406,7 +4388,7 @@ _mesa_store_compressed_teximage2d(GLcontext *ctx, GLenum target, GLint level,
  * Fallback for Driver.CompressedTexImage3D()
  */
 void
-_mesa_store_compressed_teximage3d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_compressed_teximage3d(struct gl_context *ctx, GLenum target, GLint level,
                                   GLint internalFormat,
                                   GLint width, GLint height, GLint depth,
                                   GLint border,
@@ -4431,7 +4413,7 @@ _mesa_store_compressed_teximage3d(GLcontext *ctx, GLenum target, GLint level,
  * Fallback for Driver.CompressedTexSubImage1D()
  */
 void
-_mesa_store_compressed_texsubimage1d(GLcontext *ctx, GLenum target,
+_mesa_store_compressed_texsubimage1d(struct gl_context *ctx, GLenum target,
                                      GLint level,
                                      GLint xoffset, GLsizei width,
                                      GLenum format,
@@ -4454,7 +4436,7 @@ _mesa_store_compressed_texsubimage1d(GLcontext *ctx, GLenum target,
  * Fallback for Driver.CompressedTexSubImage2D()
  */
 void
-_mesa_store_compressed_texsubimage2d(GLcontext *ctx, GLenum target,
+_mesa_store_compressed_texsubimage2d(struct gl_context *ctx, GLenum target,
                                      GLint level,
                                      GLint xoffset, GLint yoffset,
                                      GLsizei width, GLsizei height,
@@ -4515,7 +4497,7 @@ _mesa_store_compressed_texsubimage2d(GLcontext *ctx, GLenum target,
  * Fallback for Driver.CompressedTexSubImage3D()
  */
 void
-_mesa_store_compressed_texsubimage3d(GLcontext *ctx, GLenum target,
+_mesa_store_compressed_texsubimage3d(struct gl_context *ctx, GLenum target,
                                 GLint level,
                                 GLint xoffset, GLint yoffset, GLint zoffset,
                                 GLsizei width, GLsizei height, GLsizei depth,
diff --git a/src/mesa/main/texstore.h b/src/mesa/main/texstore.h
index 3211086dd63..177ede423f5 100644
--- a/src/mesa/main/texstore.h
+++ b/src/mesa/main/texstore.h
@@ -56,7 +56,7 @@
  * \param srcPacking  source image packing parameters
  */
 #define TEXSTORE_PARAMS \
-	GLcontext *ctx, GLuint dims, \
+	struct gl_context *ctx, GLuint dims, \
 	GLenum baseInternalFormat, \
 	gl_format dstFormat, \
 	GLvoid *dstAddr, \
@@ -73,7 +73,7 @@ _mesa_texstore(TEXSTORE_PARAMS);
 
 
 extern GLchan *
-_mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
+_mesa_make_temp_chan_image(struct gl_context *ctx, GLuint dims,
                            GLenum logicalBaseFormat,
                            GLenum textureBaseFormat,
                            GLint srcWidth, GLint srcHeight, GLint srcDepth,
@@ -83,7 +83,7 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
 
 
 extern void
-_mesa_store_teximage1d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_teximage1d(struct gl_context *ctx, GLenum target, GLint level,
                        GLint internalFormat,
                        GLint width, GLint border,
                        GLenum format, GLenum type, const GLvoid *pixels,
@@ -93,7 +93,7 @@ _mesa_store_teximage1d(GLcontext *ctx, GLenum target, GLint level,
 
 
 extern void
-_mesa_store_teximage2d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_teximage2d(struct gl_context *ctx, GLenum target, GLint level,
                        GLint internalFormat,
                        GLint width, GLint height, GLint border,
                        GLenum format, GLenum type, const GLvoid *pixels,
@@ -103,7 +103,7 @@ _mesa_store_teximage2d(GLcontext *ctx, GLenum target, GLint level,
 
 
 extern void
-_mesa_store_teximage3d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_teximage3d(struct gl_context *ctx, GLenum target, GLint level,
                        GLint internalFormat,
                        GLint width, GLint height, GLint depth, GLint border,
                        GLenum format, GLenum type, const GLvoid *pixels,
@@ -113,7 +113,7 @@ _mesa_store_teximage3d(GLcontext *ctx, GLenum target, GLint level,
 
 
 extern void
-_mesa_store_texsubimage1d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_texsubimage1d(struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint width,
                           GLenum format, GLenum type, const GLvoid *pixels,
                           const struct gl_pixelstore_attrib *packing,
@@ -122,7 +122,7 @@ _mesa_store_texsubimage1d(GLcontext *ctx, GLenum target, GLint level,
 
 
 extern void
-_mesa_store_texsubimage2d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_texsubimage2d(struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint yoffset,
                           GLint width, GLint height,
                           GLenum format, GLenum type, const GLvoid *pixels,
@@ -132,7 +132,7 @@ _mesa_store_texsubimage2d(GLcontext *ctx, GLenum target, GLint level,
 
 
 extern void
-_mesa_store_texsubimage3d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_texsubimage3d(struct gl_context *ctx, GLenum target, GLint level,
                           GLint xoffset, GLint yoffset, GLint zoffset,
                           GLint width, GLint height, GLint depth,
                           GLenum format, GLenum type, const GLvoid *pixels,
@@ -142,7 +142,7 @@ _mesa_store_texsubimage3d(GLcontext *ctx, GLenum target, GLint level,
 
 
 extern void
-_mesa_store_compressed_teximage1d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_compressed_teximage1d(struct gl_context *ctx, GLenum target, GLint level,
                                   GLint internalFormat,
                                   GLint width, GLint border,
                                   GLsizei imageSize, const GLvoid *data,
@@ -150,7 +150,7 @@ _mesa_store_compressed_teximage1d(GLcontext *ctx, GLenum target, GLint level,
                                   struct gl_texture_image *texImage);
 
 extern void
-_mesa_store_compressed_teximage2d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_compressed_teximage2d(struct gl_context *ctx, GLenum target, GLint level,
                                   GLint internalFormat,
                                   GLint width, GLint height, GLint border,
                                   GLsizei imageSize, const GLvoid *data,
@@ -158,7 +158,7 @@ _mesa_store_compressed_teximage2d(GLcontext *ctx, GLenum target, GLint level,
                                   struct gl_texture_image *texImage);
 
 extern void
-_mesa_store_compressed_teximage3d(GLcontext *ctx, GLenum target, GLint level,
+_mesa_store_compressed_teximage3d(struct gl_context *ctx, GLenum target, GLint level,
                                   GLint internalFormat,
                                   GLint width, GLint height, GLint depth,
                                   GLint border,
@@ -168,7 +168,7 @@ _mesa_store_compressed_teximage3d(GLcontext *ctx, GLenum target, GLint level,
 
 
 extern void
-_mesa_store_compressed_texsubimage1d(GLcontext *ctx, GLenum target,
+_mesa_store_compressed_texsubimage1d(struct gl_context *ctx, GLenum target,
                                      GLint level,
                                      GLint xoffset, GLsizei width,
                                      GLenum format,
@@ -177,7 +177,7 @@ _mesa_store_compressed_texsubimage1d(GLcontext *ctx, GLenum target,
                                      struct gl_texture_image *texImage);
 
 extern void
-_mesa_store_compressed_texsubimage2d(GLcontext *ctx, GLenum target,
+_mesa_store_compressed_texsubimage2d(struct gl_context *ctx, GLenum target,
                                      GLint level,
                                      GLint xoffset, GLint yoffset,
                                      GLsizei width, GLsizei height,
@@ -187,7 +187,7 @@ _mesa_store_compressed_texsubimage2d(GLcontext *ctx, GLenum target,
                                      struct gl_texture_image *texImage);
 
 extern void
-_mesa_store_compressed_texsubimage3d(GLcontext *ctx, GLenum target,
+_mesa_store_compressed_texsubimage3d(struct gl_context *ctx, GLenum target,
                                 GLint level,
                                 GLint xoffset, GLint yoffset, GLint zoffset,
                                 GLsizei width, GLsizei height, GLsizei depth,
@@ -198,20 +198,20 @@ _mesa_store_compressed_texsubimage3d(GLcontext *ctx, GLenum target,
 
 
 extern const GLvoid *
-_mesa_validate_pbo_teximage(GLcontext *ctx, GLuint dimensions,
+_mesa_validate_pbo_teximage(struct gl_context *ctx, GLuint dimensions,
 			    GLsizei width, GLsizei height, GLsizei depth,
 			    GLenum format, GLenum type, const GLvoid *pixels,
 			    const struct gl_pixelstore_attrib *unpack,
 			    const char *funcName);
 
 extern const GLvoid *
-_mesa_validate_pbo_compressed_teximage(GLcontext *ctx,
+_mesa_validate_pbo_compressed_teximage(struct gl_context *ctx,
                                     GLsizei imageSize, const GLvoid *pixels,
                                     const struct gl_pixelstore_attrib *packing,
                                     const char *funcName);
 
 extern void
-_mesa_unmap_teximage_pbo(GLcontext *ctx,
+_mesa_unmap_teximage_pbo(struct gl_context *ctx,
                          const struct gl_pixelstore_attrib *unpack);
 
 
diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index 5c8c1fd225f..d297b5ed712 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -95,7 +95,7 @@ reference_transform_feedback_object(struct gl_transform_feedback_object **ptr,
  * \return GL_TRUE if the mode is OK, GL_FALSE otherwise.
  */
 GLboolean
-_mesa_validate_primitive_mode(GLcontext *ctx, GLenum mode)
+_mesa_validate_primitive_mode(struct gl_context *ctx, GLenum mode)
 {
    if (ctx->TransformFeedback.CurrentObject->Active) {
       switch (mode) {
@@ -120,7 +120,7 @@ _mesa_validate_primitive_mode(GLcontext *ctx, GLenum mode)
  * \return GL_TRUE for success, GL_FALSE if error
  */
 GLboolean
-_mesa_validate_transform_feedback_buffers(GLcontext *ctx)
+_mesa_validate_transform_feedback_buffers(struct gl_context *ctx)
 {
    /* XXX to do */
    return GL_TRUE;
@@ -132,7 +132,7 @@ _mesa_validate_transform_feedback_buffers(GLcontext *ctx)
  * Per-context init for transform feedback.
  */
 void
-_mesa_init_transform_feedback(GLcontext *ctx)
+_mesa_init_transform_feedback(struct gl_context *ctx)
 {
    /* core mesa expects this, even a dummy one, to be available */
    ASSERT(ctx->Driver.NewTransformFeedback);
@@ -162,7 +162,7 @@ _mesa_init_transform_feedback(GLcontext *ctx)
 static void
 delete_cb(GLuint key, void *data, void *userData)
 {
-   GLcontext *ctx = (GLcontext *) userData;
+   struct gl_context *ctx = (struct gl_context *) userData;
    struct gl_transform_feedback_object *obj =
       (struct gl_transform_feedback_object *) data;
 
@@ -174,7 +174,7 @@ delete_cb(GLuint key, void *data, void *userData)
  * Per-context free/clean-up for transform feedback.
  */
 void
-_mesa_free_transform_feedback(GLcontext *ctx)
+_mesa_free_transform_feedback(struct gl_context *ctx)
 {
    /* core mesa expects this, even a dummy one, to be available */
    ASSERT(ctx->Driver.NewTransformFeedback);
@@ -200,15 +200,15 @@ _mesa_free_transform_feedback(GLcontext *ctx)
 
 /* forward declarations */
 static struct gl_transform_feedback_object *
-new_transform_feedback(GLcontext *ctx, GLuint name);
+new_transform_feedback(struct gl_context *ctx, GLuint name);
 
 static void
-delete_transform_feedback(GLcontext *ctx,
+delete_transform_feedback(struct gl_context *ctx,
                           struct gl_transform_feedback_object *obj);
 
 /* dummy per-context init/clean-up for transform feedback */
 void
-_mesa_init_transform_feedback(GLcontext *ctx)
+_mesa_init_transform_feedback(struct gl_context *ctx)
 {
    ctx->TransformFeedback.DefaultObject = new_transform_feedback(ctx, 0);
    ctx->TransformFeedback.CurrentObject = ctx->TransformFeedback.DefaultObject;
@@ -218,7 +218,7 @@ _mesa_init_transform_feedback(GLcontext *ctx)
 }
 
 void
-_mesa_free_transform_feedback(GLcontext *ctx)
+_mesa_free_transform_feedback(struct gl_context *ctx)
 {
    _mesa_reference_buffer_object(ctx,
                                  &ctx->TransformFeedback.CurrentBuffer,
@@ -232,7 +232,7 @@ _mesa_free_transform_feedback(GLcontext *ctx)
 
 /** Default fallback for ctx->Driver.NewTransformFeedback() */
 static struct gl_transform_feedback_object *
-new_transform_feedback(GLcontext *ctx, GLuint name)
+new_transform_feedback(struct gl_context *ctx, GLuint name)
 {
    struct gl_transform_feedback_object *obj;
    obj = CALLOC_STRUCT(gl_transform_feedback_object);
@@ -245,7 +245,7 @@ new_transform_feedback(GLcontext *ctx, GLuint name)
 
 /** Default fallback for ctx->Driver.DeleteTransformFeedback() */
 static void
-delete_transform_feedback(GLcontext *ctx,
+delete_transform_feedback(struct gl_context *ctx,
                           struct gl_transform_feedback_object *obj)
 {
    GLuint i;
@@ -263,7 +263,7 @@ delete_transform_feedback(GLcontext *ctx,
 
 /** Default fallback for ctx->Driver.BeginTransformFeedback() */
 static void
-begin_transform_feedback(GLcontext *ctx, GLenum mode,
+begin_transform_feedback(struct gl_context *ctx, GLenum mode,
                          struct gl_transform_feedback_object *obj)
 {
    /* nop */
@@ -271,7 +271,7 @@ begin_transform_feedback(GLcontext *ctx, GLenum mode,
 
 /** Default fallback for ctx->Driver.EndTransformFeedback() */
 static void
-end_transform_feedback(GLcontext *ctx,
+end_transform_feedback(struct gl_context *ctx,
                        struct gl_transform_feedback_object *obj)
 {
    /* nop */
@@ -279,7 +279,7 @@ end_transform_feedback(GLcontext *ctx,
 
 /** Default fallback for ctx->Driver.PauseTransformFeedback() */
 static void
-pause_transform_feedback(GLcontext *ctx,
+pause_transform_feedback(struct gl_context *ctx,
                          struct gl_transform_feedback_object *obj)
 {
    /* nop */
@@ -287,7 +287,7 @@ pause_transform_feedback(GLcontext *ctx,
 
 /** Default fallback for ctx->Driver.ResumeTransformFeedback() */
 static void
-resume_transform_feedback(GLcontext *ctx,
+resume_transform_feedback(struct gl_context *ctx,
                           struct gl_transform_feedback_object *obj)
 {
    /* nop */
@@ -295,7 +295,7 @@ resume_transform_feedback(GLcontext *ctx,
 
 /** Default fallback for ctx->Driver.DrawTransformFeedback() */
 static void
-draw_transform_feedback(GLcontext *ctx, GLenum mode,
+draw_transform_feedback(struct gl_context *ctx, GLenum mode,
                         struct gl_transform_feedback_object *obj)
 {
    /* XXX to do */
@@ -399,7 +399,7 @@ _mesa_EndTransformFeedback(void)
  * Helper used by BindBufferRange() and BindBufferBase().
  */
 static void
-bind_buffer_range(GLcontext *ctx, GLuint index,
+bind_buffer_range(struct gl_context *ctx, GLuint index,
                   struct gl_buffer_object *bufObj,
                   GLintptr offset, GLsizeiptr size)
 {
@@ -698,7 +698,7 @@ _mesa_GetTransformFeedbackVarying(GLuint program, GLuint index,
 
 
 static struct gl_transform_feedback_object *
-lookup_transform_feedback_object(GLcontext *ctx, GLuint name)
+lookup_transform_feedback_object(struct gl_context *ctx, GLuint name)
 {
    if (name == 0) {
       return ctx->TransformFeedback.DefaultObject;
diff --git a/src/mesa/main/transformfeedback.h b/src/mesa/main/transformfeedback.h
index 4d38522d6d9..752cd4e201f 100644
--- a/src/mesa/main/transformfeedback.h
+++ b/src/mesa/main/transformfeedback.h
@@ -29,18 +29,18 @@
 
 
 extern void
-_mesa_init_transform_feedback(GLcontext *ctx);
+_mesa_init_transform_feedback(struct gl_context *ctx);
 
 extern void
-_mesa_free_transform_feedback(GLcontext *ctx);
+_mesa_free_transform_feedback(struct gl_context *ctx);
 
 #if FEATURE_EXT_transform_feedback
 
 extern GLboolean
-_mesa_validate_primitive_mode(GLcontext *ctx, GLenum mode);
+_mesa_validate_primitive_mode(struct gl_context *ctx, GLenum mode);
 
 extern GLboolean
-_mesa_validate_transform_feedback_buffers(GLcontext *ctx);
+_mesa_validate_transform_feedback_buffers(struct gl_context *ctx);
 
 
 extern void
@@ -106,13 +106,13 @@ _mesa_DrawTransformFeedback(GLenum mode, GLuint name);
 #else /* FEATURE_EXT_transform_feedback */
 
 static INLINE GLboolean
-_mesa_validate_primitive_mode(GLcontext *ctx, GLenum mode)
+_mesa_validate_primitive_mode(struct gl_context *ctx, GLenum mode)
 {
    return GL_TRUE;
 }
 
 static INLINE GLboolean
-_mesa_validate_transform_feedback_buffers(GLcontext *ctx)
+_mesa_validate_transform_feedback_buffers(struct gl_context *ctx)
 {
    return GL_TRUE;
 }
diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index a5d7da51f07..9359db18929 100644
--- a/src/mesa/main/uniforms.c
+++ b/src/mesa/main/uniforms.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2004-2008  Brian Paul   All Rights Reserved.
  * Copyright (C) 2009-2010  VMware, Inc.  All Rights Reserved.
+ * Copyright © 2010 Intel Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -44,7 +45,7 @@
 #include "program/prog_parameter.h"
 #include "program/prog_statevars.h"
 #include "program/prog_uniform.h"
-
+#include "program/prog_instruction.h"
 
 
 static GLenum
@@ -79,6 +80,238 @@ base_uniform_type(GLenum type)
    }
 }
 
+static struct gl_builtin_uniform_element gl_DepthRange_elements[] = {
+   {"near", {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_XXXX},
+   {"far", {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_YYYY},
+   {"diff", {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_ZZZZ},
+};
+
+static struct gl_builtin_uniform_element gl_ClipPlane_elements[] = {
+   {NULL, {STATE_CLIPPLANE, 0, 0}, SWIZZLE_XYZW}
+};
+
+static struct gl_builtin_uniform_element gl_Point_elements[] = {
+   {"size", {STATE_POINT_SIZE}, SWIZZLE_XXXX},
+   {"sizeMin", {STATE_POINT_SIZE}, SWIZZLE_YYYY},
+   {"sizeMax", {STATE_POINT_SIZE}, SWIZZLE_ZZZZ},
+   {"fadeThresholdSize", {STATE_POINT_SIZE}, SWIZZLE_WWWW},
+   {"distanceConstantAttenuation", {STATE_POINT_ATTENUATION}, SWIZZLE_XXXX},
+   {"distanceLinearAttenuation", {STATE_POINT_ATTENUATION}, SWIZZLE_YYYY},
+   {"distanceQuadraticAttenuation", {STATE_POINT_ATTENUATION}, SWIZZLE_ZZZZ},
+};
+
+static struct gl_builtin_uniform_element gl_FrontMaterial_elements[] = {
+   {"emission", {STATE_MATERIAL, 0, STATE_EMISSION}, SWIZZLE_XYZW},
+   {"ambient", {STATE_MATERIAL, 0, STATE_AMBIENT}, SWIZZLE_XYZW},
+   {"diffuse", {STATE_MATERIAL, 0, STATE_DIFFUSE}, SWIZZLE_XYZW},
+   {"specular", {STATE_MATERIAL, 0, STATE_SPECULAR}, SWIZZLE_XYZW},
+   {"shininess", {STATE_MATERIAL, 0, STATE_SHININESS}, SWIZZLE_XXXX},
+};
+
+static struct gl_builtin_uniform_element gl_BackMaterial_elements[] = {
+   {"emission", {STATE_MATERIAL, 1, STATE_EMISSION}, SWIZZLE_XYZW},
+   {"ambient", {STATE_MATERIAL, 1, STATE_AMBIENT}, SWIZZLE_XYZW},
+   {"diffuse", {STATE_MATERIAL, 1, STATE_DIFFUSE}, SWIZZLE_XYZW},
+   {"specular", {STATE_MATERIAL, 1, STATE_SPECULAR}, SWIZZLE_XYZW},
+   {"shininess", {STATE_MATERIAL, 1, STATE_SHININESS}, SWIZZLE_XXXX},
+};
+
+static struct gl_builtin_uniform_element gl_LightSource_elements[] = {
+   {"ambient", {STATE_LIGHT, 0, STATE_AMBIENT}, SWIZZLE_XYZW},
+   {"diffuse", {STATE_LIGHT, 0, STATE_DIFFUSE}, SWIZZLE_XYZW},
+   {"specular", {STATE_LIGHT, 0, STATE_SPECULAR}, SWIZZLE_XYZW},
+   {"position", {STATE_LIGHT, 0, STATE_POSITION}, SWIZZLE_XYZW},
+   {"halfVector", {STATE_LIGHT, 0, STATE_HALF_VECTOR}, SWIZZLE_XYZW},
+   {"spotDirection", {STATE_LIGHT, 0, STATE_SPOT_DIRECTION},
+    MAKE_SWIZZLE4(SWIZZLE_X,
+		  SWIZZLE_Y,
+		  SWIZZLE_Z,
+		  SWIZZLE_Z)},
+   {"spotCosCutoff", {STATE_LIGHT, 0, STATE_SPOT_DIRECTION}, SWIZZLE_WWWW},
+   {"spotCutoff", {STATE_LIGHT, 0, STATE_SPOT_CUTOFF}, SWIZZLE_XXXX},
+   {"spotExponent", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_WWWW},
+   {"constantAttenuation", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_XXXX},
+   {"linearAttenuation", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_YYYY},
+   {"quadraticAttenuation", {STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_ZZZZ},
+};
+
+static struct gl_builtin_uniform_element gl_LightModel_elements[] = {
+   {"ambient", {STATE_LIGHTMODEL_AMBIENT, 0}, SWIZZLE_XYZW},
+};
+
+static struct gl_builtin_uniform_element gl_FrontLightModelProduct_elements[] = {
+   {"sceneColor", {STATE_LIGHTMODEL_SCENECOLOR, 0}, SWIZZLE_XYZW},
+};
+
+static struct gl_builtin_uniform_element gl_BackLightModelProduct_elements[] = {
+   {"sceneColor", {STATE_LIGHTMODEL_SCENECOLOR, 1}, SWIZZLE_XYZW},
+};
+
+static struct gl_builtin_uniform_element gl_FrontLightProduct_elements[] = {
+   {"ambient", {STATE_LIGHTPROD, 0, 0, STATE_AMBIENT}, SWIZZLE_XYZW},
+   {"diffuse", {STATE_LIGHTPROD, 0, 0, STATE_DIFFUSE}, SWIZZLE_XYZW},
+   {"specular", {STATE_LIGHTPROD, 0, 0, STATE_SPECULAR}, SWIZZLE_XYZW},
+};
+
+static struct gl_builtin_uniform_element gl_BackLightProduct_elements[] = {
+   {"ambient", {STATE_LIGHTPROD, 0, 1, STATE_AMBIENT}, SWIZZLE_XYZW},
+   {"diffuse", {STATE_LIGHTPROD, 0, 1, STATE_DIFFUSE}, SWIZZLE_XYZW},
+   {"specular", {STATE_LIGHTPROD, 0, 1, STATE_SPECULAR}, SWIZZLE_XYZW},
+};
+
+static struct gl_builtin_uniform_element gl_TextureEnvColor_elements[] = {
+   {NULL, {STATE_TEXENV_COLOR, 0}, SWIZZLE_XYZW},
+};
+
+static struct gl_builtin_uniform_element gl_EyePlaneS_elements[] = {
+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_S}, SWIZZLE_XYZW},
+};
+
+static struct gl_builtin_uniform_element gl_EyePlaneT_elements[] = {
+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_T}, SWIZZLE_XYZW},
+};
+
+static struct gl_builtin_uniform_element gl_EyePlaneR_elements[] = {
+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_R}, SWIZZLE_XYZW},
+};
+
+static struct gl_builtin_uniform_element gl_EyePlaneQ_elements[] = {
+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_EYE_Q}, SWIZZLE_XYZW},
+};
+
+static struct gl_builtin_uniform_element gl_ObjectPlaneS_elements[] = {
+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_S}, SWIZZLE_XYZW},
+};
+
+static struct gl_builtin_uniform_element gl_ObjectPlaneT_elements[] = {
+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_T}, SWIZZLE_XYZW},
+};
+
+static struct gl_builtin_uniform_element gl_ObjectPlaneR_elements[] = {
+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_R}, SWIZZLE_XYZW},
+};
+
+static struct gl_builtin_uniform_element gl_ObjectPlaneQ_elements[] = {
+   {NULL, {STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_Q}, SWIZZLE_XYZW},
+};
+
+static struct gl_builtin_uniform_element gl_Fog_elements[] = {
+   {"color", {STATE_FOG_COLOR}, SWIZZLE_XYZW},
+   {"density", {STATE_FOG_PARAMS}, SWIZZLE_XXXX},
+   {"start", {STATE_FOG_PARAMS}, SWIZZLE_YYYY},
+   {"end", {STATE_FOG_PARAMS}, SWIZZLE_ZZZZ},
+   {"scale", {STATE_FOG_PARAMS}, SWIZZLE_WWWW},
+};
+
+static struct gl_builtin_uniform_element gl_NormalScale_elements[] = {
+   {NULL, {STATE_NORMAL_SCALE}, SWIZZLE_XXXX},
+};
+
+#define MATRIX(name, statevar, modifier)				\
+   static struct gl_builtin_uniform_element name ## _elements[] = {	\
+      { NULL, { statevar, 0, 0, 0, modifier}, SWIZZLE_XYZW },		\
+      { NULL, { statevar, 0, 1, 1, modifier}, SWIZZLE_XYZW },		\
+      { NULL, { statevar, 0, 2, 2, modifier}, SWIZZLE_XYZW },		\
+      { NULL, { statevar, 0, 3, 3, modifier}, SWIZZLE_XYZW },		\
+   }
+
+MATRIX(gl_ModelViewMatrix,
+       STATE_MODELVIEW_MATRIX, STATE_MATRIX_TRANSPOSE);
+MATRIX(gl_ModelViewMatrixInverse,
+       STATE_MODELVIEW_MATRIX, STATE_MATRIX_INVTRANS);
+MATRIX(gl_ModelViewMatrixTranspose,
+       STATE_MODELVIEW_MATRIX, 0);
+MATRIX(gl_ModelViewMatrixInverseTranspose,
+       STATE_MODELVIEW_MATRIX, STATE_MATRIX_INVERSE);
+
+MATRIX(gl_ProjectionMatrix,
+       STATE_PROJECTION_MATRIX, STATE_MATRIX_TRANSPOSE);
+MATRIX(gl_ProjectionMatrixInverse,
+       STATE_PROJECTION_MATRIX, STATE_MATRIX_INVTRANS);
+MATRIX(gl_ProjectionMatrixTranspose,
+       STATE_PROJECTION_MATRIX, 0);
+MATRIX(gl_ProjectionMatrixInverseTranspose,
+       STATE_PROJECTION_MATRIX, STATE_MATRIX_INVERSE);
+
+MATRIX(gl_ModelViewProjectionMatrix,
+       STATE_MVP_MATRIX, STATE_MATRIX_TRANSPOSE);
+MATRIX(gl_ModelViewProjectionMatrixInverse,
+       STATE_MVP_MATRIX, STATE_MATRIX_INVTRANS);
+MATRIX(gl_ModelViewProjectionMatrixTranspose,
+       STATE_MVP_MATRIX, 0);
+MATRIX(gl_ModelViewProjectionMatrixInverseTranspose,
+       STATE_MVP_MATRIX, STATE_MATRIX_INVERSE);
+
+MATRIX(gl_TextureMatrix,
+       STATE_TEXTURE_MATRIX, STATE_MATRIX_TRANSPOSE);
+MATRIX(gl_TextureMatrixInverse,
+       STATE_TEXTURE_MATRIX, STATE_MATRIX_INVTRANS);
+MATRIX(gl_TextureMatrixTranspose,
+       STATE_TEXTURE_MATRIX, 0);
+MATRIX(gl_TextureMatrixInverseTranspose,
+       STATE_TEXTURE_MATRIX, STATE_MATRIX_INVERSE);
+
+static struct gl_builtin_uniform_element gl_NormalMatrix_elements[] = {
+   { NULL, { STATE_MODELVIEW_MATRIX, 0, 0, 0, STATE_MATRIX_INVERSE},
+     SWIZZLE_XYZW },
+   { NULL, { STATE_MODELVIEW_MATRIX, 0, 1, 1, STATE_MATRIX_INVERSE},
+     SWIZZLE_XYZW },
+   { NULL, { STATE_MODELVIEW_MATRIX, 0, 2, 2, STATE_MATRIX_INVERSE},
+     SWIZZLE_XYZW },
+};
+
+#undef MATRIX
+
+#define STATEVAR(name) {#name, name ## _elements, Elements(name ## _elements)}
+
+const struct gl_builtin_uniform_desc _mesa_builtin_uniform_desc[] = {
+   STATEVAR(gl_DepthRange),
+   STATEVAR(gl_ClipPlane),
+   STATEVAR(gl_Point),
+   STATEVAR(gl_FrontMaterial),
+   STATEVAR(gl_BackMaterial),
+   STATEVAR(gl_LightSource),
+   STATEVAR(gl_LightModel),
+   STATEVAR(gl_FrontLightModelProduct),
+   STATEVAR(gl_BackLightModelProduct),
+   STATEVAR(gl_FrontLightProduct),
+   STATEVAR(gl_BackLightProduct),
+   STATEVAR(gl_TextureEnvColor),
+   STATEVAR(gl_EyePlaneS),
+   STATEVAR(gl_EyePlaneT),
+   STATEVAR(gl_EyePlaneR),
+   STATEVAR(gl_EyePlaneQ),
+   STATEVAR(gl_ObjectPlaneS),
+   STATEVAR(gl_ObjectPlaneT),
+   STATEVAR(gl_ObjectPlaneR),
+   STATEVAR(gl_ObjectPlaneQ),
+   STATEVAR(gl_Fog),
+
+   STATEVAR(gl_ModelViewMatrix),
+   STATEVAR(gl_ModelViewMatrixInverse),
+   STATEVAR(gl_ModelViewMatrixTranspose),
+   STATEVAR(gl_ModelViewMatrixInverseTranspose),
+
+   STATEVAR(gl_ProjectionMatrix),
+   STATEVAR(gl_ProjectionMatrixInverse),
+   STATEVAR(gl_ProjectionMatrixTranspose),
+   STATEVAR(gl_ProjectionMatrixInverseTranspose),
+
+   STATEVAR(gl_ModelViewProjectionMatrix),
+   STATEVAR(gl_ModelViewProjectionMatrixInverse),
+   STATEVAR(gl_ModelViewProjectionMatrixTranspose),
+   STATEVAR(gl_ModelViewProjectionMatrixInverseTranspose),
+
+   STATEVAR(gl_TextureMatrix),
+   STATEVAR(gl_TextureMatrixInverse),
+   STATEVAR(gl_TextureMatrixTranspose),
+   STATEVAR(gl_TextureMatrixInverseTranspose),
+
+   STATEVAR(gl_NormalMatrix),
+   STATEVAR(gl_NormalScale),
+
+   {NULL, NULL, 0}
+};
 
 static GLboolean
 is_boolean_type(GLenum type)
@@ -151,7 +384,7 @@ get_uniform_parameter(const struct gl_shader_program *shProg, GLuint index)
  * Called by glGetActiveUniform().
  */
 static void
-_mesa_get_active_uniform(GLcontext *ctx, GLuint program, GLuint index,
+_mesa_get_active_uniform(struct gl_context *ctx, GLuint program, GLuint index,
                          GLsizei maxLength, GLsizei *length, GLint *size,
                          GLenum *type, GLchar *nameOut)
 {
@@ -294,7 +527,7 @@ get_uniform_rows_cols(const struct gl_program_parameter *p,
  * to the shader program and return the program parameter position.
  */
 static void
-lookup_uniform_parameter(GLcontext *ctx, GLuint program, GLint location,
+lookup_uniform_parameter(struct gl_context *ctx, GLuint program, GLint location,
                          struct gl_program **progOut, GLint *paramPosOut)
 {
    struct gl_shader_program *shProg
@@ -387,7 +620,7 @@ split_location_offset(GLint *location, GLint *offset)
  * Called via glGetUniformfv().
  */
 static void
-_mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
+_mesa_get_uniformfv(struct gl_context *ctx, GLuint program, GLint location,
                     GLfloat *params)
 {
    struct gl_program *prog;
@@ -420,7 +653,7 @@ _mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
  * \sa _mesa_get_uniformfv, only difference is a cast.
  */
 static void
-_mesa_get_uniformiv(GLcontext *ctx, GLuint program, GLint location,
+_mesa_get_uniformiv(struct gl_context *ctx, GLuint program, GLint location,
                     GLint *params)
 {
    struct gl_program *prog;
@@ -455,7 +688,7 @@ _mesa_get_uniformiv(GLcontext *ctx, GLuint program, GLint location,
  * offset (used for arrays, structs).
  */
 GLint
-_mesa_get_uniform_location(GLcontext *ctx, struct gl_shader_program *shProg,
+_mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg,
 			   const GLchar *name)
 {
    GLint offset = 0, location = -1;
@@ -604,7 +837,7 @@ compatible_types(GLenum userType, GLenum targetType)
  * \param values  the new values, of datatype 'type'
  */
 static void
-set_program_uniform(GLcontext *ctx, struct gl_program *program,
+set_program_uniform(struct gl_context *ctx, struct gl_program *program,
                     GLint index, GLint offset,
                     GLenum type, GLsizei count, GLint elems,
                     const void *values)
@@ -747,7 +980,7 @@ set_program_uniform(GLcontext *ctx, struct gl_program *program,
  * Called via glUniform*() functions.
  */
 void
-_mesa_uniform(GLcontext *ctx, struct gl_shader_program *shProg,
+_mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg,
 	      GLint location, GLsizei count,
               const GLvoid *values, GLenum type)
 {
@@ -851,7 +1084,7 @@ _mesa_uniform(GLcontext *ctx, struct gl_shader_program *shProg,
  * Set a matrix-valued program parameter.
  */
 static void
-set_program_uniform_matrix(GLcontext *ctx, struct gl_program *program,
+set_program_uniform_matrix(struct gl_context *ctx, struct gl_program *program,
                            GLuint index, GLuint offset,
                            GLuint count, GLuint rows, GLuint cols,
                            GLboolean transpose, const GLfloat *values)
@@ -919,7 +1152,7 @@ set_program_uniform_matrix(GLcontext *ctx, struct gl_program *program,
  * Note: cols=2, rows=4  ==>  array[2] of vec4
  */
 void
-_mesa_uniform_matrix(GLcontext *ctx, struct gl_shader_program *shProg,
+_mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg,
 		     GLint cols, GLint rows,
                      GLint location, GLsizei count,
                      GLboolean transpose, const GLfloat *values)
diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h
index f823c614447..64474363051 100644
--- a/src/mesa/main/uniforms.h
+++ b/src/mesa/main/uniforms.h
@@ -26,6 +26,7 @@
 #define UNIFORMS_H
 
 #include "glheader.h"
+#include "program/prog_parameter.h"
 
 struct gl_program;
 struct _glapi_table;
@@ -151,16 +152,16 @@ extern GLint GLAPIENTRY
 _mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *);
 
 GLint
-_mesa_get_uniform_location(GLcontext *ctx, struct gl_shader_program *shProg,
+_mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg,
 			   const GLchar *name);
 
 void
-_mesa_uniform(GLcontext *ctx, struct gl_shader_program *shader_program,
+_mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shader_program,
 	      GLint location, GLsizei count,
               const GLvoid *values, GLenum type);
 
 void
-_mesa_uniform_matrix(GLcontext *ctx, struct gl_shader_program *shProg,
+_mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg,
 		     GLint cols, GLint rows,
                      GLint location, GLsizei count,
                      GLboolean transpose, const GLfloat *values);
@@ -172,4 +173,18 @@ _mesa_update_shader_textures_used(struct gl_program *prog);
 extern void
 _mesa_init_shader_uniform_dispatch(struct _glapi_table *exec);
 
+struct gl_builtin_uniform_element {
+   const char *field;
+   int tokens[STATE_LENGTH];
+   int swizzle;
+};
+
+struct gl_builtin_uniform_desc {
+   const char *name;
+   struct gl_builtin_uniform_element *elements;
+   unsigned int num_elements;
+};
+
+extern const struct gl_builtin_uniform_desc _mesa_builtin_uniform_desc[];
+
 #endif /* UNIFORMS_H */
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index d19de7ff62a..acab9e0e924 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -54,7 +54,7 @@
  * \param ptr  the address (or offset inside VBO) of the array data
  */
 static void
-update_array(GLcontext *ctx, struct gl_client_array *array,
+update_array(struct gl_context *ctx, struct gl_client_array *array,
              GLbitfield dirtyBit, GLsizei elementSize,
              GLint size, GLenum type, GLenum format,
              GLsizei stride, GLboolean normalized, const GLvoid *ptr)
@@ -778,7 +778,7 @@ _mesa_DisableVertexAttribArrayARB(GLuint index)
  * not handle the 4-element GL_CURRENT_VERTEX_ATTRIB_ARB query.
  */
 static GLuint
-get_vertex_array_attrib(GLcontext *ctx, GLuint index, GLenum pname,
+get_vertex_array_attrib(struct gl_context *ctx, GLuint index, GLenum pname,
                   const char *caller)
 {
    const struct gl_client_array *array;
@@ -1339,7 +1339,7 @@ _mesa_PrimitiveRestartIndex(GLuint index)
  * Copy one client vertex array to another.
  */
 void
-_mesa_copy_client_array(GLcontext *ctx,
+_mesa_copy_client_array(struct gl_context *ctx,
                         struct gl_client_array *dst,
                         struct gl_client_array *src)
 {
@@ -1380,7 +1380,7 @@ print_array(const char *name, GLint index, const struct gl_client_array *array)
  * Print current vertex object/array info.  For debug.
  */
 void
-_mesa_print_arrays(GLcontext *ctx)
+_mesa_print_arrays(struct gl_context *ctx)
 {
    struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
    GLuint i;
@@ -1408,7 +1408,7 @@ _mesa_print_arrays(GLcontext *ctx)
  * Initialize vertex array state for given context.
  */
 void 
-_mesa_init_varray(GLcontext *ctx)
+_mesa_init_varray(struct gl_context *ctx)
 {
    ctx->Array.DefaultArrayObj = _mesa_new_array_object(ctx, 0);
    _mesa_reference_array_object(ctx, &ctx->Array.ArrayObj,
@@ -1426,7 +1426,7 @@ static void
 delete_arrayobj_cb(GLuint id, void *data, void *userData)
 {
    struct gl_array_object *arrayObj = (struct gl_array_object *) data;
-   GLcontext *ctx = (GLcontext *) userData;
+   struct gl_context *ctx = (struct gl_context *) userData;
    _mesa_delete_array_object(ctx, arrayObj);
 }
 
@@ -1435,7 +1435,7 @@ delete_arrayobj_cb(GLuint id, void *data, void *userData)
  * Free vertex array state for given context.
  */
 void 
-_mesa_free_varray_data(GLcontext *ctx)
+_mesa_free_varray_data(struct gl_context *ctx)
 {
    _mesa_HashDeleteAll(ctx->Array.Objects, delete_arrayobj_cb, ctx);
    _mesa_DeleteHashTable(ctx->Array.Objects);
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index c7c3e3ec70c..a5fa33fa00e 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -216,19 +216,19 @@ _mesa_PrimitiveRestartIndex(GLuint index);
 
 
 extern void
-_mesa_copy_client_array(GLcontext *ctx,
+_mesa_copy_client_array(struct gl_context *ctx,
                         struct gl_client_array *dst,
                         struct gl_client_array *src);
 
 
 extern void
-_mesa_print_arrays(GLcontext *ctx);
+_mesa_print_arrays(struct gl_context *ctx);
 
 extern void
-_mesa_init_varray( GLcontext * ctx );
+_mesa_init_varray( struct gl_context * ctx );
 
 extern void 
-_mesa_free_varray_data(GLcontext *ctx);
+_mesa_free_varray_data(struct gl_context *ctx);
 
 #else
 
diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 9e1f5f2a4fe..69a28da84c6 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -32,7 +32,7 @@
  * Return major and minor version numbers.
  */
 static void
-compute_version(GLcontext *ctx)
+compute_version(struct gl_context *ctx)
 {
    GLuint major, minor;
    static const int max = 100;
@@ -84,7 +84,7 @@ compute_version(GLcontext *ctx)
 			      (ctx->Extensions.EXT_stencil_two_side
 			       || ctx->Extensions.ATI_separate_stencil));
    const GLboolean ver_2_1 = (ver_2_0 &&
-                              ctx->Extensions.ARB_shading_language_120 &&
+                              ctx->Const.GLSLVersion >= 120 &&
                               ctx->Extensions.EXT_pixel_buffer_object &&
                               ctx->Extensions.EXT_texture_sRGB);
    const GLboolean ver_3_0 = (ver_2_1 &&
@@ -92,6 +92,7 @@ compute_version(GLcontext *ctx)
                               ctx->Extensions.ARB_map_buffer_range &&
                               ctx->Extensions.ARB_texture_float &&
                               ctx->Extensions.ARB_texture_rg &&
+                              ctx->Extensions.ARB_texture_compression_rgtc &&
                               ctx->Extensions.APPLE_vertex_array_object &&
                               ctx->Extensions.EXT_draw_buffers2 &&
                               ctx->Extensions.EXT_framebuffer_blit &&
@@ -101,7 +102,6 @@ compute_version(GLcontext *ctx)
                               ctx->Extensions.EXT_packed_depth_stencil &&
                               ctx->Extensions.EXT_packed_float &&
                               ctx->Extensions.EXT_texture_array &&
-                              ctx->Extensions.EXT_texture_compression_rgtc &&
                               ctx->Extensions.EXT_texture_integer &&
                               ctx->Extensions.EXT_texture_shared_exponent &&
                               ctx->Extensions.EXT_transform_feedback &&
@@ -187,7 +187,7 @@ compute_version(GLcontext *ctx)
 }
 
 static void
-compute_version_es1(GLcontext *ctx)
+compute_version_es1(struct gl_context *ctx)
 {
    static const int max = 100;
 
@@ -223,7 +223,7 @@ compute_version_es1(GLcontext *ctx)
 }
 
 static void
-compute_version_es2(GLcontext *ctx)
+compute_version_es2(struct gl_context *ctx)
 {
    static const int max = 100;
 
@@ -264,7 +264,7 @@ compute_version_es2(GLcontext *ctx)
  * or to perform version check for GLX_ARB_create_context_profile.
  */
 void
-_mesa_compute_version(GLcontext *ctx)
+_mesa_compute_version(struct gl_context *ctx)
 {
    if (ctx->VersionMajor)
       return;
diff --git a/src/mesa/main/version.h b/src/mesa/main/version.h
index 004036de98d..6552a3a7843 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -54,7 +54,7 @@
 
 
 extern void
-_mesa_compute_version(GLcontext *ctx);
+_mesa_compute_version(struct gl_context *ctx);
 
 
 #endif /* VERSION_H */
diff --git a/src/mesa/main/viewport.c b/src/mesa/main/viewport.c
index 309308c983b..4747022d0b4 100644
--- a/src/mesa/main/viewport.c
+++ b/src/mesa/main/viewport.c
@@ -60,7 +60,7 @@ _mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height)
  * \param height height of the viewport rectangle.
  */
 void
-_mesa_set_viewport(GLcontext *ctx, GLint x, GLint y,
+_mesa_set_viewport(struct gl_context *ctx, GLint x, GLint y,
                     GLsizei width, GLsizei height)
 {
    if (MESA_VERBOSE & VERBOSE_API)
@@ -151,7 +151,7 @@ _mesa_DepthRange(GLclampd nearval, GLclampd farval)
  * Initialize the context viewport attribute group.
  * \param ctx  the GL context.
  */
-void _mesa_init_viewport(GLcontext *ctx)
+void _mesa_init_viewport(struct gl_context *ctx)
 {
    GLfloat depthMax = 65535.0F; /* sorf of arbitrary */
 
@@ -173,7 +173,7 @@ void _mesa_init_viewport(GLcontext *ctx)
  * Free the context viewport attribute group data.
  * \param ctx  the GL context.
  */
-void _mesa_free_viewport_data(GLcontext *ctx)
+void _mesa_free_viewport_data(struct gl_context *ctx)
 {
    _math_matrix_dtr(&ctx->Viewport._WindowMap);
 }
diff --git a/src/mesa/main/viewport.h b/src/mesa/main/viewport.h
index ec054a7c597..ccfa37588b8 100644
--- a/src/mesa/main/viewport.h
+++ b/src/mesa/main/viewport.h
@@ -35,7 +35,7 @@ _mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height);
 
 
 extern void 
-_mesa_set_viewport(GLcontext *ctx, GLint x, GLint y,
+_mesa_set_viewport(struct gl_context *ctx, GLint x, GLint y,
                    GLsizei width, GLsizei height);
 
 
@@ -44,11 +44,11 @@ _mesa_DepthRange(GLclampd nearval, GLclampd farval);
 
 
 extern void 
-_mesa_init_viewport(GLcontext *ctx);
+_mesa_init_viewport(struct gl_context *ctx);
 
 
 extern void 
-_mesa_free_viewport_data(GLcontext *ctx);
+_mesa_free_viewport_data(struct gl_context *ctx);
 
 
 #endif
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index ca352e88e6b..13b1aa9e50b 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -34,51 +34,11 @@
 #include "vtxfmt.h"
 #include "eval.h"
 #include "dlist.h"
+#include "main/dispatch.h"
 
 
 #if FEATURE_beginend
 
-
-/* The neutral vertex format.  This wraps all tnl module functions,
- * verifying that the currently-installed module is valid and then
- * installing the function pointers in a lazy fashion.  It records the
- * function pointers that have been swapped out, which allows a fast
- * restoration of the neutral module in almost all cases -- a typical
- * app might only require 4-6 functions to be modified from the neutral
- * baseline, and only restoring these is certainly preferable to doing
- * the entire module's 60 or so function pointers.
- */
-
-#define PRE_LOOPBACK( FUNC )						\
-{									\
-   GET_CURRENT_CONTEXT(ctx);						\
-   struct gl_tnl_module * const tnl = &(ctx->TnlModule);		\
-   const int tmp_offset = _gloffset_ ## FUNC ;				\
-									\
-   ASSERT( tnl->Current );						\
-   ASSERT( tnl->SwapCount < NUM_VERTEX_FORMAT_ENTRIES );		\
-   ASSERT( tmp_offset >= 0 );						\
-                                                                        \
-   if (tnl->SwapCount == 0)                                             \
-      ctx->Driver.BeginVertices( ctx );                                 \
-                                                                        \
-   /* Save the swapped function's dispatch entry so it can be */        \
-   /* restored later. */                                                \
-   tnl->Swapped[tnl->SwapCount].location = & (((_glapi_proc *)ctx->Exec)[tmp_offset]); \
-   tnl->Swapped[tnl->SwapCount].function = (_glapi_proc)TAG(FUNC);	\
-   tnl->SwapCount++;							\
-									\
-   if ( 0 )								\
-      _mesa_debug(ctx, "   swapping gl" #FUNC"...\n" );			\
-									\
-   /* Install the tnl function pointer.	*/				\
-   SET_ ## FUNC(ctx->Exec, tnl->Current->FUNC);				\
-}
-
-#define TAG(x) neutral_##x
-#include "vtxfmt_tmp.h"
-
-
 /**
  * Use the per-vertex functions found in <vfmt> to initialze the given
  * API dispatch table.
@@ -165,38 +125,17 @@ install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt )
 }
 
 
-void _mesa_init_exec_vtxfmt( GLcontext *ctx )
+void _mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
 {
-   install_vtxfmt( ctx->Exec, &neutral_vtxfmt );
-   ctx->TnlModule.SwapCount = 0;
+   if (ctx->API == API_OPENGL)
+      install_vtxfmt( ctx->Exec, vfmt );
 }
 
 
-void _mesa_install_exec_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
+void _mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
 {
-   ctx->TnlModule.Current = vfmt;
-   _mesa_restore_exec_vtxfmt( ctx );
-}
-
-
-void _mesa_install_save_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
-{
-   install_vtxfmt( ctx->Save, vfmt );
-}
-
-
-void _mesa_restore_exec_vtxfmt( GLcontext *ctx )
-{
-   struct gl_tnl_module *tnl = &(ctx->TnlModule);
-   GLuint i;
-
-   /* Restore the neutral tnl module wrapper.
-    */
-   for ( i = 0 ; i < tnl->SwapCount ; i++ ) {
-      *(tnl->Swapped[i].location) = tnl->Swapped[i].function;
-   }
-
-   tnl->SwapCount = 0;
+   if (ctx->API == API_OPENGL)
+      install_vtxfmt( ctx->Save, vfmt );
 }
 
 
diff --git a/src/mesa/main/vtxfmt.h b/src/mesa/main/vtxfmt.h
index aad38b87c35..147385cee96 100644
--- a/src/mesa/main/vtxfmt.h
+++ b/src/mesa/main/vtxfmt.h
@@ -38,32 +38,18 @@
 
 #if FEATURE_beginend
 
-extern void _mesa_init_exec_vtxfmt( GLcontext *ctx );
-
-extern void _mesa_install_exec_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt );
-extern void _mesa_install_save_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt );
-
-extern void _mesa_restore_exec_vtxfmt( GLcontext *ctx );
+extern void _mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt );
+extern void _mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt );
 
 #else /* FEATURE_beginend */
 
 static INLINE void
-_mesa_init_exec_vtxfmt( GLcontext *ctx )
-{
-}
-
-static INLINE void
-_mesa_install_exec_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
-{
-}
-
-static INLINE void
-_mesa_install_save_vtxfmt( GLcontext *ctx, const GLvertexformat *vfmt )
+_mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
 {
 }
 
 static INLINE void
-_mesa_restore_exec_vtxfmt( GLcontext *ctx )
+_mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
 {
 }
author	Keith Whitwell <[email protected]>	2010-10-17 19:03:42 -0700
committer	Keith Whitwell <[email protected]>	2010-10-17 19:09:42 -0700
commit	0072acd447dc6be652e63752e50215c3105322c8 (patch)
tree	847d1763b54772d336a04e606f8248291c3092b7 /src/mesa/main
parent	543fb77ddece7e1806e8eaa0d65bb2a945ef9a75 (diff)
parent	ca2b2ac131933b4171b519813df1aaa3a81621cd (diff)