Remove GL_EXT_cull_vertex

This is only used in the i915 driver where it provides little benefit
for very few applications that use it with fixed function TNL.

7 files changed, 1719 insertions, 1782 deletions

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index c3c710f5ef..b87aa47d88 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -224,8 +224,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/clip.c b/src/mesa/main/clip.c
index 96c80e6ef8..be8ce4278c 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 ac472d66e0..11431dcfce 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/enable.c b/src/mesa/main/enable.c
index 15ce2d1225..b2be44830a 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -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;
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 966c687b9c..9b723ef74b 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -114,7 +114,6 @@ 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) },
    { ON,  "GL_EXT_copy_texture",               F(EXT_copy_texture) },
    { OFF, "GL_EXT_depth_bounds_test",          F(EXT_depth_bounds_test) },
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 4cd968e40f..0a69bcc4e3 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1405,7 +1405,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];
 };
@@ -2624,7 +2623,6 @@ struct gl_extensions
    GLboolean EXT_blend_minmax;
    GLboolean EXT_blend_subtract;
    GLboolean EXT_clip_volume_hint;
-   GLboolean EXT_cull_vertex;
    GLboolean EXT_compiled_vertex_array;
    GLboolean EXT_copy_texture;
    GLboolean EXT_depth_bounds_test;
diff --git a/src/mesa/main/remap_helper.h b/src/mesa/main/remap_helper.h
index 631cc90158..fe3e0fd912 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 }
 };