1 files changed, 2058 insertions, 2053 deletions
diff --git a/mesalib/src/mesa/main/remap_helper.h b/mesalib/src/mesa/main/remap_helper.h
index a6f2e726a..88f872f5c 100644
--- a/mesalib/src/mesa/main/remap_helper.h
+++ b/mesalib/src/mesa/main/remap_helper.h
@@ -70,4858 +70,4862 @@ static const char _mesa_function_pool[] =
    "\0"
    "glLoadIdentity\0"
    "\0"
-   /* _mesa_function_pool[216]: GetCombinerOutputParameterfvNV (will be remapped) */
-   "iiip\0"
-   "glGetCombinerOutputParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[255]: SampleCoverageARB (will be remapped) */
+   /* _mesa_function_pool[216]: SampleCoverageARB (will be remapped) */
    "fi\0"
    "glSampleCoverage\0"
    "glSampleCoverageARB\0"
    "\0"
-   /* _mesa_function_pool[296]: ConvolutionFilter1D (offset 348) */
+   /* _mesa_function_pool[257]: ConvolutionFilter1D (offset 348) */
    "iiiiip\0"
    "glConvolutionFilter1D\0"
    "glConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[351]: BeginQueryARB (will be remapped) */
+   /* _mesa_function_pool[312]: BeginQueryARB (will be remapped) */
    "ii\0"
    "glBeginQuery\0"
    "glBeginQueryARB\0"
    "\0"
-   /* _mesa_function_pool[384]: RasterPos3dv (offset 71) */
+   /* _mesa_function_pool[345]: RasterPos3dv (offset 71) */
    "p\0"
    "glRasterPos3dv\0"
    "\0"
-   /* _mesa_function_pool[402]: PointParameteriNV (will be remapped) */
+   /* _mesa_function_pool[363]: PointParameteriNV (will be remapped) */
    "ii\0"
    "glPointParameteri\0"
    "glPointParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[444]: GetProgramiv (will be remapped) */
+   /* _mesa_function_pool[405]: GetProgramiv (will be remapped) */
    "iip\0"
    "glGetProgramiv\0"
    "\0"
-   /* _mesa_function_pool[464]: MultiTexCoord3sARB (offset 398) */
+   /* _mesa_function_pool[425]: MultiTexCoord3sARB (offset 398) */
    "iiii\0"
    "glMultiTexCoord3s\0"
    "glMultiTexCoord3sARB\0"
    "\0"
-   /* _mesa_function_pool[509]: SecondaryColor3iEXT (will be remapped) */
+   /* _mesa_function_pool[470]: SecondaryColor3iEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3i\0"
    "glSecondaryColor3iEXT\0"
    "\0"
-   /* _mesa_function_pool[555]: WindowPos3fMESA (will be remapped) */
+   /* _mesa_function_pool[516]: WindowPos3fMESA (will be remapped) */
    "fff\0"
    "glWindowPos3f\0"
    "glWindowPos3fARB\0"
    "glWindowPos3fMESA\0"
    "\0"
-   /* _mesa_function_pool[609]: TexCoord1iv (offset 99) */
+   /* _mesa_function_pool[570]: TexCoord1iv (offset 99) */
    "p\0"
    "glTexCoord1iv\0"
    "\0"
-   /* _mesa_function_pool[626]: TexCoord4sv (offset 125) */
+   /* _mesa_function_pool[587]: TexCoord4sv (offset 125) */
    "p\0"
    "glTexCoord4sv\0"
    "\0"
-   /* _mesa_function_pool[643]: RasterPos4s (offset 84) */
+   /* _mesa_function_pool[604]: RasterPos4s (offset 84) */
    "iiii\0"
    "glRasterPos4s\0"
    "\0"
-   /* _mesa_function_pool[663]: PixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[624]: PixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[696]: ActiveTextureARB (offset 374) */
+   /* _mesa_function_pool[657]: ActiveTextureARB (offset 374) */
    "i\0"
    "glActiveTexture\0"
    "glActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[734]: BlitFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[695]: BlitFramebufferEXT (will be remapped) */
    "iiiiiiiiii\0"
    "glBlitFramebuffer\0"
    "glBlitFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[785]: TexCoord1f (offset 96) */
+   /* _mesa_function_pool[746]: TexCoord1f (offset 96) */
    "f\0"
    "glTexCoord1f\0"
    "\0"
-   /* _mesa_function_pool[801]: TexCoord1d (offset 94) */
+   /* _mesa_function_pool[762]: TexCoord1d (offset 94) */
    "d\0"
    "glTexCoord1d\0"
    "\0"
-   /* _mesa_function_pool[817]: VertexAttrib4ubvNV (will be remapped) */
+   /* _mesa_function_pool[778]: VertexAttrib4ubvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[842]: TexCoord1i (offset 98) */
+   /* _mesa_function_pool[803]: TexCoord1i (offset 98) */
    "i\0"
    "glTexCoord1i\0"
    "\0"
-   /* _mesa_function_pool[858]: GetProgramNamedParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[819]: GetProgramNamedParameterdvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[895]: Histogram (offset 367) */
+   /* _mesa_function_pool[856]: Histogram (offset 367) */
    "iiii\0"
    "glHistogram\0"
    "glHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[928]: TexCoord1s (offset 100) */
+   /* _mesa_function_pool[889]: TexCoord1s (offset 100) */
    "i\0"
    "glTexCoord1s\0"
    "\0"
-   /* _mesa_function_pool[944]: GetMapfv (offset 267) */
+   /* _mesa_function_pool[905]: GetMapfv (offset 267) */
    "iip\0"
    "glGetMapfv\0"
    "\0"
-   /* _mesa_function_pool[960]: EvalCoord1f (offset 230) */
+   /* _mesa_function_pool[921]: EvalCoord1f (offset 230) */
    "f\0"
    "glEvalCoord1f\0"
    "\0"
-   /* _mesa_function_pool[977]: FramebufferTexture (will be remapped) */
+   /* _mesa_function_pool[938]: FramebufferTexture (will be remapped) */
    "iiii\0"
    "glFramebufferTexture\0"
    "\0"
-   /* _mesa_function_pool[1004]: GetGraphicsResetStatusARB (will be remapped) */
+   /* _mesa_function_pool[965]: GetGraphicsResetStatusARB (will be remapped) */
    "\0"
    "glGetGraphicsResetStatusARB\0"
    "\0"
-   /* _mesa_function_pool[1034]: TexImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[995]: TexImage4DSGIS (dynamic) */
    "iiiiiiiiiip\0"
    "glTexImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[1064]: PolygonStipple (offset 175) */
+   /* _mesa_function_pool[1025]: PolygonStipple (offset 175) */
    "p\0"
    "glPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[1084]: WindowPos2dvMESA (will be remapped) */
+   /* _mesa_function_pool[1045]: WindowPos2dvMESA (will be remapped) */
    "p\0"
    "glWindowPos2dv\0"
    "glWindowPos2dvARB\0"
    "glWindowPos2dvMESA\0"
    "\0"
-   /* _mesa_function_pool[1139]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1100]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1183]: BlendEquationSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[1144]: BlendEquationSeparateEXT (will be remapped) */
    "ii\0"
    "glBlendEquationSeparate\0"
    "glBlendEquationSeparateEXT\0"
    "glBlendEquationSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[1265]: ListParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[1226]: ListParameterfSGIX (dynamic) */
    "iif\0"
    "glListParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[1291]: SecondaryColor3bEXT (will be remapped) */
+   /* _mesa_function_pool[1252]: SecondaryColor3bEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3b\0"
    "glSecondaryColor3bEXT\0"
    "\0"
-   /* _mesa_function_pool[1337]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[1298]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1383]: GetnPolygonStippleARB (will be remapped) */
+   /* _mesa_function_pool[1344]: GetnPolygonStippleARB (will be remapped) */
    "ip\0"
    "glGetnPolygonStippleARB\0"
    "\0"
-   /* _mesa_function_pool[1411]: GetPixelMapfv (offset 271) */
+   /* _mesa_function_pool[1372]: GetPixelMapfv (offset 271) */
    "ip\0"
    "glGetPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[1431]: Color3uiv (offset 22) */
+   /* _mesa_function_pool[1392]: Color3uiv (offset 22) */
    "p\0"
    "glColor3uiv\0"
    "\0"
-   /* _mesa_function_pool[1446]: IsEnabled (offset 286) */
+   /* _mesa_function_pool[1407]: IsEnabled (offset 286) */
    "i\0"
    "glIsEnabled\0"
    "\0"
-   /* _mesa_function_pool[1461]: VertexAttrib4svNV (will be remapped) */
+   /* _mesa_function_pool[1422]: VertexAttrib4svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4svNV\0"
    "\0"
-   /* _mesa_function_pool[1485]: EvalCoord2fv (offset 235) */
+   /* _mesa_function_pool[1446]: EvalCoord2fv (offset 235) */
    "p\0"
    "glEvalCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[1503]: GetBufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1464]: GetBufferSubDataARB (will be remapped) */
    "iiip\0"
    "glGetBufferSubData\0"
    "glGetBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1550]: BufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1511]: BufferSubDataARB (will be remapped) */
    "iiip\0"
    "glBufferSubData\0"
    "glBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1591]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1552]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1629]: AttachShader (will be remapped) */
+   /* _mesa_function_pool[1590]: AttachShader (will be remapped) */
    "ii\0"
    "glAttachShader\0"
    "\0"
-   /* _mesa_function_pool[1648]: GetCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[1609]: GetCombinerInputParameterfvNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[1687]: VertexAttrib2fARB (will be remapped) */
+   /* _mesa_function_pool[1648]: VertexAttrib2fARB (will be remapped) */
    "iff\0"
    "glVertexAttrib2f\0"
    "glVertexAttrib2fARB\0"
    "\0"
-   /* _mesa_function_pool[1729]: GetDebugLogLengthMESA (dynamic) */
+   /* _mesa_function_pool[1690]: GetDebugLogLengthMESA (dynamic) */
    "iii\0"
    "glGetDebugLogLengthMESA\0"
    "\0"
-   /* _mesa_function_pool[1758]: GetMapiv (offset 268) */
+   /* _mesa_function_pool[1719]: GetMapiv (offset 268) */
    "iip\0"
    "glGetMapiv\0"
    "\0"
-   /* _mesa_function_pool[1774]: VertexAttrib3fARB (will be remapped) */
+   /* _mesa_function_pool[1735]: VertexAttrib3fARB (will be remapped) */
    "ifff\0"
    "glVertexAttrib3f\0"
    "glVertexAttrib3fARB\0"
    "\0"
-   /* _mesa_function_pool[1817]: Indexubv (offset 316) */
+   /* _mesa_function_pool[1778]: Indexubv (offset 316) */
    "p\0"
    "glIndexubv\0"
    "\0"
-   /* _mesa_function_pool[1831]: GetQueryivARB (will be remapped) */
+   /* _mesa_function_pool[1792]: GetQueryivARB (will be remapped) */
    "iip\0"
    "glGetQueryiv\0"
    "glGetQueryivARB\0"
    "\0"
-   /* _mesa_function_pool[1865]: TexImage3D (offset 371) */
+   /* _mesa_function_pool[1826]: TexImage3D (offset 371) */
    "iiiiiiiiip\0"
    "glTexImage3D\0"
    "glTexImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[1906]: BindFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[1867]: BindFragDataLocationEXT (will be remapped) */
    "iip\0"
    "glBindFragDataLocationEXT\0"
    "glBindFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[1960]: ReplacementCodeuiVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1921]: ReplacementCodeuiVertex3fvSUN (dynamic) */
    "pp\0"
    "glReplacementCodeuiVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1996]: EdgeFlagPointer (offset 312) */
+   /* _mesa_function_pool[1957]: EdgeFlagPointer (offset 312) */
    "ip\0"
    "glEdgeFlagPointer\0"
    "\0"
-   /* _mesa_function_pool[2018]: Color3ubv (offset 20) */
+   /* _mesa_function_pool[1979]: Color3ubv (offset 20) */
    "p\0"
    "glColor3ubv\0"
    "\0"
-   /* _mesa_function_pool[2033]: GetQueryObjectivARB (will be remapped) */
+   /* _mesa_function_pool[1994]: GetQueryObjectivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectiv\0"
    "glGetQueryObjectivARB\0"
    "\0"
-   /* _mesa_function_pool[2079]: Vertex3dv (offset 135) */
+   /* _mesa_function_pool[2040]: Vertex3dv (offset 135) */
    "p\0"
    "glVertex3dv\0"
    "\0"
-   /* _mesa_function_pool[2094]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2055]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2141]: CompressedTexSubImage2DARB (will be remapped) */
+   /* _mesa_function_pool[2102]: CompressedTexSubImage2DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexSubImage2D\0"
    "glCompressedTexSubImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[2207]: CombinerOutputNV (will be remapped) */
+   /* _mesa_function_pool[2168]: CombinerOutputNV (will be remapped) */
    "iiiiiiiiii\0"
    "glCombinerOutputNV\0"
    "\0"
-   /* _mesa_function_pool[2238]: VertexAttribs3fvNV (will be remapped) */
+   /* _mesa_function_pool[2199]: VertexAttribs3fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3fvNV\0"
    "\0"
-   /* _mesa_function_pool[2264]: GetnMapivARB (will be remapped) */
+   /* _mesa_function_pool[2225]: GetnMapivARB (will be remapped) */
    "iiip\0"
    "glGetnMapivARB\0"
    "\0"
-   /* _mesa_function_pool[2285]: Uniform2fARB (will be remapped) */
+   /* _mesa_function_pool[2246]: Uniform2fARB (will be remapped) */
    "iff\0"
    "glUniform2f\0"
    "glUniform2fARB\0"
    "\0"
-   /* _mesa_function_pool[2317]: LightModeliv (offset 166) */
+   /* _mesa_function_pool[2278]: LightModeliv (offset 166) */
    "ip\0"
    "glLightModeliv\0"
    "\0"
-   /* _mesa_function_pool[2336]: VertexAttrib1svARB (will be remapped) */
+   /* _mesa_function_pool[2297]: VertexAttrib1svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1sv\0"
    "glVertexAttrib1svARB\0"
    "\0"
-   /* _mesa_function_pool[2379]: VertexAttribs1dvNV (will be remapped) */
+   /* _mesa_function_pool[2340]: VertexAttribs1dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1dvNV\0"
    "\0"
-   /* _mesa_function_pool[2405]: Uniform2ivARB (will be remapped) */
+   /* _mesa_function_pool[2366]: Uniform2ivARB (will be remapped) */
    "iip\0"
    "glUniform2iv\0"
    "glUniform2ivARB\0"
    "\0"
-   /* _mesa_function_pool[2439]: GetImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[2400]: GetImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[2477]: Normal3bv (offset 53) */
+   /* _mesa_function_pool[2438]: Normal3bv (offset 53) */
    "p\0"
    "glNormal3bv\0"
    "\0"
-   /* _mesa_function_pool[2492]: TexGeniv (offset 193) */
+   /* _mesa_function_pool[2453]: TexGeniv (offset 193) */
    "iip\0"
    "glTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[2508]: WeightubvARB (dynamic) */
+   /* _mesa_function_pool[2469]: WeightubvARB (dynamic) */
    "ip\0"
    "glWeightubvARB\0"
    "\0"
-   /* _mesa_function_pool[2527]: VertexAttrib1fvNV (will be remapped) */
+   /* _mesa_function_pool[2488]: VertexAttrib1fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1fvNV\0"
    "\0"
-   /* _mesa_function_pool[2551]: Vertex3iv (offset 139) */
+   /* _mesa_function_pool[2512]: Vertex3iv (offset 139) */
    "p\0"
    "glVertex3iv\0"
    "\0"
-   /* _mesa_function_pool[2566]: CopyConvolutionFilter1D (offset 354) */
+   /* _mesa_function_pool[2527]: CopyConvolutionFilter1D (offset 354) */
    "iiiii\0"
    "glCopyConvolutionFilter1D\0"
    "glCopyConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[2628]: VertexAttribI1uiEXT (will be remapped) */
+   /* _mesa_function_pool[2589]: VertexAttribI1uiEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1uiEXT\0"
    "glVertexAttribI1ui\0"
    "\0"
-   /* _mesa_function_pool[2673]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[2634]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[2721]: DeleteSync (will be remapped) */
+   /* _mesa_function_pool[2682]: DeleteSync (will be remapped) */
    "i\0"
    "glDeleteSync\0"
    "\0"
-   /* _mesa_function_pool[2737]: FragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[2698]: FragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[2767]: BlendColor (offset 336) */
+   /* _mesa_function_pool[2728]: BlendColor (offset 336) */
    "ffff\0"
    "glBlendColor\0"
    "glBlendColorEXT\0"
    "\0"
-   /* _mesa_function_pool[2802]: UniformMatrix4fvARB (will be remapped) */
+   /* _mesa_function_pool[2763]: UniformMatrix4fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix4fv\0"
    "glUniformMatrix4fvARB\0"
    "\0"
-   /* _mesa_function_pool[2849]: DeleteVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[2810]: DeleteVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glDeleteVertexArrays\0"
    "glDeleteVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[2900]: TexBuffer (will be remapped) */
+   /* _mesa_function_pool[2861]: TexBuffer (will be remapped) */
    "iii\0"
    "glTexBuffer\0"
    "\0"
-   /* _mesa_function_pool[2917]: ReadInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[2878]: ReadInstrumentsSGIX (dynamic) */
    "i\0"
    "glReadInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[2942]: CallLists (offset 3) */
+   /* _mesa_function_pool[2903]: CallLists (offset 3) */
    "iip\0"
    "glCallLists\0"
    "\0"
-   /* _mesa_function_pool[2959]: DeformationMap3dSGIX (dynamic) */
-   "iddiiddiiddiip\0"
-   "glDeformationMap3dSGIX\0"
-   "\0"
-   /* _mesa_function_pool[2998]: UniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[2920]: UniformMatrix2x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x4fv\0"
    "\0"
-   /* _mesa_function_pool[3025]: ReadnPixelsARB (will be remapped) */
+   /* _mesa_function_pool[2947]: ReadnPixelsARB (will be remapped) */
    "iiiiiiip\0"
    "glReadnPixelsARB\0"
    "\0"
-   /* _mesa_function_pool[3052]: Color4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2974]: Color4ubVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[3079]: Normal3iv (offset 59) */
+   /* _mesa_function_pool[3001]: Normal3iv (offset 59) */
    "p\0"
    "glNormal3iv\0"
    "\0"
-   /* _mesa_function_pool[3094]: PassThrough (offset 199) */
+   /* _mesa_function_pool[3016]: PassThrough (offset 199) */
    "f\0"
    "glPassThrough\0"
    "\0"
-   /* _mesa_function_pool[3111]: GetnPixelMapusvARB (will be remapped) */
+   /* _mesa_function_pool[3033]: GetnPixelMapusvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapusvARB\0"
    "\0"
-   /* _mesa_function_pool[3137]: TexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[3059]: TexParameterIivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIivEXT\0"
    "glTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[3181]: FramebufferTextureLayerEXT (will be remapped) */
+   /* _mesa_function_pool[3103]: FramebufferTextureLayerEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[3243]: GetListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[3165]: GetListParameterfvSGIX (dynamic) */
    "iip\0"
    "glGetListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[3273]: Viewport (offset 305) */
+   /* _mesa_function_pool[3195]: Viewport (offset 305) */
    "iiii\0"
    "glViewport\0"
    "\0"
-   /* _mesa_function_pool[3290]: VertexAttrib4NusvARB (will be remapped) */
+   /* _mesa_function_pool[3212]: VertexAttrib4NusvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nusv\0"
    "glVertexAttrib4NusvARB\0"
    "\0"
-   /* _mesa_function_pool[3337]: WindowPos4svMESA (will be remapped) */
+   /* _mesa_function_pool[3259]: WindowPos4svMESA (will be remapped) */
    "p\0"
    "glWindowPos4svMESA\0"
    "\0"
-   /* _mesa_function_pool[3359]: CreateProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[3281]: CreateProgramObjectARB (will be remapped) */
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[3386]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[3308]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
    "glDeleteTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[3417]: UniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[3339]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[3444]: PrioritizeTextures (offset 331) */
+   /* _mesa_function_pool[3366]: PrioritizeTextures (offset 331) */
    "ipp\0"
    "glPrioritizeTextures\0"
    "glPrioritizeTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[3494]: VertexAttribI3uiEXT (will be remapped) */
+   /* _mesa_function_pool[3416]: VertexAttribI3uiEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3uiEXT\0"
    "glVertexAttribI3ui\0"
    "\0"
-   /* _mesa_function_pool[3541]: AsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[3463]: AsyncMarkerSGIX (dynamic) */
    "i\0"
    "glAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[3562]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[3484]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[3590]: ClearColorIuiEXT (will be remapped) */
+   /* _mesa_function_pool[3512]: ClearColorIuiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIuiEXT\0"
    "\0"
-   /* _mesa_function_pool[3615]: ClearDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[3537]: ClearDebugLogMESA (dynamic) */
    "iii\0"
    "glClearDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[3640]: Uniform4uiEXT (will be remapped) */
+   /* _mesa_function_pool[3562]: Uniform4uiEXT (will be remapped) */
    "iiiii\0"
    "glUniform4uiEXT\0"
    "glUniform4ui\0"
    "\0"
-   /* _mesa_function_pool[3676]: ResetHistogram (offset 369) */
+   /* _mesa_function_pool[3598]: ResetHistogram (offset 369) */
    "i\0"
    "glResetHistogram\0"
    "glResetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[3716]: GetProgramNamedParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[3638]: GetProgramNamedParameterfvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[3753]: PointParameterfEXT (will be remapped) */
+   /* _mesa_function_pool[3675]: PointParameterfEXT (will be remapped) */
    "if\0"
    "glPointParameterf\0"
    "glPointParameterfARB\0"
    "glPointParameterfEXT\0"
    "glPointParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[3839]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[3761]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[3875]: GenFencesNV (will be remapped) */
+   /* _mesa_function_pool[3797]: GenFencesNV (will be remapped) */
    "ip\0"
    "glGenFencesNV\0"
    "\0"
-   /* _mesa_function_pool[3893]: ImageTransformParameterfHP (dynamic) */
+   /* _mesa_function_pool[3815]: ImageTransformParameterfHP (dynamic) */
    "iif\0"
    "glImageTransformParameterfHP\0"
    "\0"
-   /* _mesa_function_pool[3927]: MatrixIndexusvARB (dynamic) */
+   /* _mesa_function_pool[3849]: MatrixIndexusvARB (dynamic) */
    "ip\0"
    "glMatrixIndexusvARB\0"
    "\0"
-   /* _mesa_function_pool[3951]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[3873]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[3983]: DisableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[3905]: DisableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[4043]: VertexAttribI4ubvEXT (will be remapped) */
-   "ip\0"
-   "glVertexAttribI4ubvEXT\0"
-   "glVertexAttribI4ubv\0"
-   "\0"
-   /* _mesa_function_pool[4090]: GetnConvolutionFilterARB (will be remapped) */
+   /* _mesa_function_pool[3965]: GetnConvolutionFilterARB (will be remapped) */
    "iiiip\0"
    "glGetnConvolutionFilterARB\0"
    "\0"
-   /* _mesa_function_pool[4124]: TexCoord2sv (offset 109) */
+   /* _mesa_function_pool[3999]: TexCoord2sv (offset 109) */
    "p\0"
    "glTexCoord2sv\0"
    "\0"
-   /* _mesa_function_pool[4141]: Vertex4dv (offset 143) */
+   /* _mesa_function_pool[4016]: Vertex4dv (offset 143) */
    "p\0"
    "glVertex4dv\0"
    "\0"
-   /* _mesa_function_pool[4156]: StencilMaskSeparate (will be remapped) */
+   /* _mesa_function_pool[4031]: StencilMaskSeparate (will be remapped) */
    "ii\0"
    "glStencilMaskSeparate\0"
    "\0"
-   /* _mesa_function_pool[4182]: ProgramLocalParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[4057]: ProgramLocalParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramLocalParameter4dARB\0"
    "\0"
-   /* _mesa_function_pool[4219]: CompressedTexImage3DARB (will be remapped) */
+   /* _mesa_function_pool[4094]: CompressedTexImage3DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexImage3D\0"
    "glCompressedTexImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[4279]: Color3sv (offset 18) */
+   /* _mesa_function_pool[4154]: Color3sv (offset 18) */
    "p\0"
    "glColor3sv\0"
    "\0"
-   /* _mesa_function_pool[4293]: GetConvolutionParameteriv (offset 358) */
+   /* _mesa_function_pool[4168]: GetConvolutionParameteriv (offset 358) */
    "iip\0"
    "glGetConvolutionParameteriv\0"
    "glGetConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[4357]: DeleteSamplers (will be remapped) */
+   /* _mesa_function_pool[4232]: DeleteSamplers (will be remapped) */
    "ip\0"
    "glDeleteSamplers\0"
    "\0"
-   /* _mesa_function_pool[4378]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[4253]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[4419]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[4294]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[4434]: TestFenceNV (will be remapped) */
+   /* _mesa_function_pool[4309]: TestFenceNV (will be remapped) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[4451]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[4326]: GetVertexAttribIuivEXT (will be remapped) */
+   "iip\0"
+   "glGetVertexAttribIuivEXT\0"
+   "glGetVertexAttribIuiv\0"
+   "\0"
+   /* _mesa_function_pool[4378]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[4496]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[4423]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[4513]: Uniform2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4440]: Uniform2uivEXT (will be remapped) */
    "iip\0"
    "glUniform2uivEXT\0"
    "glUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[4549]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[4476]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[4583]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[4510]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4621]: GetPixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[4548]: GetPixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[4657]: Color3fv (offset 14) */
+   /* _mesa_function_pool[4584]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[4671]: GetnPixelMapfvARB (will be remapped) */
+   /* _mesa_function_pool[4598]: GetnPixelMapfvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[4696]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[4623]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[4722]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[4649]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[4743]: GetnUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[4670]: GetnUniformfvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[4768]: GetDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[4695]: GetDebugLogMESA (dynamic) */
    "iiiipp\0"
    "glGetDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[4794]: FogCoorddEXT (will be remapped) */
+   /* _mesa_function_pool[4721]: FogCoorddEXT (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[4824]: BeginConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[4751]: BeginConditionalRenderNV (will be remapped) */
    "ii\0"
    "glBeginConditionalRenderNV\0"
    "glBeginConditionalRender\0"
    "\0"
-   /* _mesa_function_pool[4880]: Color4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4807]: Color4ubVertex3fSUN (dynamic) */
    "iiiifff\0"
    "glColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4911]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[4838]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[4941]: PointSize (offset 173) */
+   /* _mesa_function_pool[4868]: PointSize (offset 173) */
    "f\0"
    "glPointSize\0"
    "\0"
-   /* _mesa_function_pool[4956]: VertexAttribI2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4883]: VertexAttribI2uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2uivEXT\0"
    "glVertexAttribI2uiv\0"
    "\0"
-   /* _mesa_function_pool[5003]: TexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4930]: TexCoord2fVertex3fSUN (dynamic) */
    "fffff\0"
    "glTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5034]: PopName (offset 200) */
+   /* _mesa_function_pool[4961]: PopName (offset 200) */
    "\0"
    "glPopName\0"
    "\0"
-   /* _mesa_function_pool[5046]: GetSamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[4973]: GetSamplerParameterfv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[5075]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[5002]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[5102]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[5029]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[5126]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[5053]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[5152]: VertexAttrib4NbvARB (will be remapped) */
+   /* _mesa_function_pool[5079]: VertexAttrib4NbvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[5197]: GetActiveAttribARB (will be remapped) */
+   /* _mesa_function_pool[5124]: GetActiveAttribARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[5245]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[5172]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[5260]: VertexAttrib4ubNV (will be remapped) */
+   /* _mesa_function_pool[5187]: VertexAttrib4ubNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4ubNV\0"
    "\0"
-   /* _mesa_function_pool[5287]: VertexAttribI1ivEXT (will be remapped) */
+   /* _mesa_function_pool[5214]: VertexAttribI1ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1ivEXT\0"
    "glVertexAttribI1iv\0"
    "\0"
-   /* _mesa_function_pool[5332]: ClampColor (will be remapped) */
+   /* _mesa_function_pool[5259]: ClampColor (will be remapped) */
    "ii\0"
    "glClampColor\0"
    "\0"
-   /* _mesa_function_pool[5349]: TextureRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[5276]: TextureRangeAPPLE (will be remapped) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[5374]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[5301]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[5393]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5320]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5421]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5348]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5474]: Indexub (offset 315) */
+   /* _mesa_function_pool[5401]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[5487]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[5414]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[5513]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[5440]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[5528]: GetClipPlane (offset 259) */
+   /* _mesa_function_pool[5455]: GetClipPlane (offset 259) */
    "ip\0"
    "glGetClipPlane\0"
    "\0"
-   /* _mesa_function_pool[5547]: CombinerParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[5474]: CombinerParameterfvNV (will be remapped) */
    "ip\0"
    "glCombinerParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[5575]: VertexAttribs3dvNV (will be remapped) */
+   /* _mesa_function_pool[5502]: VertexAttribs3dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3dvNV\0"
    "\0"
-   /* _mesa_function_pool[5601]: VertexAttribI2uiEXT (will be remapped) */
+   /* _mesa_function_pool[5528]: VertexAttribI2uiEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2uiEXT\0"
    "glVertexAttribI2ui\0"
    "\0"
-   /* _mesa_function_pool[5647]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[5574]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[5673]: VertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[5600]: VertexArrayRangeNV (will be remapped) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[5698]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[5625]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[5724]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[5651]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[5747]: VertexAttribI4uivEXT (will be remapped) */
+   /* _mesa_function_pool[5674]: VertexAttribI4uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4uivEXT\0"
    "glVertexAttribI4uiv\0"
    "\0"
-   /* _mesa_function_pool[5794]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[5721]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[5813]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[5740]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[5842]: Scaled (offset 301) */
+   /* _mesa_function_pool[5769]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[5856]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5783]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5884]: Scalef (offset 302) */
+   /* _mesa_function_pool[5811]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[5898]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[5825]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[5936]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[5863]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[5971]: MultTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[5898]: MultTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[6023]: ObjectUnpurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[5950]: ColorMaskIndexedEXT (will be remapped) */
+   "iiiii\0"
+   "glColorMaskIndexedEXT\0"
+   "glColorMaski\0"
+   "\0"
+   /* _mesa_function_pool[5992]: ObjectUnpurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectUnpurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[6053]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[6022]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[6069]: WindowPos2svMESA (will be remapped) */
+   /* _mesa_function_pool[6038]: WindowPos2svMESA (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[6124]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[6093]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[6138]: TexCoord2iv (offset 107) */
+   /* _mesa_function_pool[6107]: TexCoord2iv (offset 107) */
    "p\0"
    "glTexCoord2iv\0"
    "\0"
-   /* _mesa_function_pool[6155]: CompressedTexImage1DARB (will be remapped) */
+   /* _mesa_function_pool[6124]: CompressedTexImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[6213]: Rotated (offset 299) */
+   /* _mesa_function_pool[6182]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[6229]: GetTexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[6198]: GetTexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIuivEXT\0"
    "glGetTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[6281]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[6250]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[6305]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[6274]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[6327]: VertexAttribDivisorARB (will be remapped) */
+   /* _mesa_function_pool[6296]: VertexAttribDivisorARB (will be remapped) */
    "ii\0"
    "glVertexAttribDivisorARB\0"
    "\0"
-   /* _mesa_function_pool[6356]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[6325]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[6371]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[6340]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[6400]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6369]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6424]: Color4iv (offset 32) */
+   /* _mesa_function_pool[6393]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[6438]: TexParameterf (offset 178) */
+   /* _mesa_function_pool[6407]: TexParameterf (offset 178) */
    "iif\0"
    "glTexParameterf\0"
    "\0"
-   /* _mesa_function_pool[6459]: TexParameteri (offset 180) */
+   /* _mesa_function_pool[6428]: TexParameteri (offset 180) */
    "iii\0"
    "glTexParameteri\0"
    "\0"
-   /* _mesa_function_pool[6480]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6449]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6505]: MultiTexCoord3dARB (offset 392) */
+   /* _mesa_function_pool[6474]: MultiTexCoord3dARB (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[6550]: MultiTexCoord2iARB (offset 388) */
+   /* _mesa_function_pool[6519]: MultiTexCoord2iARB (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[6594]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[6563]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[6614]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[6583]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[6674]: MultiTexCoord2svARB (offset 391) */
+   /* _mesa_function_pool[6643]: MultiTexCoord2svARB (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[6719]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[6688]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[6746]: Uniform3iARB (will be remapped) */
+   /* _mesa_function_pool[6715]: Uniform3iARB (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[6779]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[6748]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[6807]: DrawElementsInstancedARB (will be remapped) */
+   /* _mesa_function_pool[6776]: DrawElementsInstancedARB (will be remapped) */
    "iiipi\0"
    "glDrawElementsInstancedARB\0"
    "glDrawElementsInstancedEXT\0"
    "glDrawElementsInstanced\0"
    "\0"
-   /* _mesa_function_pool[6892]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[6861]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[6917]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[6886]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[6935]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[6904]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[6960]: GlobalAlphaFactordSUN (dynamic) */
+   /* _mesa_function_pool[6929]: GlobalAlphaFactordSUN (dynamic) */
    "d\0"
    "glGlobalAlphaFactordSUN\0"
    "\0"
-   /* _mesa_function_pool[6987]: GetFinalCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[6956]: GetFinalCombinerInputParameterfvNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[7029]: GenerateMipmapEXT (will be remapped) */
+   /* _mesa_function_pool[6998]: GenerateMipmapEXT (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "\0"
-   /* _mesa_function_pool[7069]: GenLists (offset 5) */
+   /* _mesa_function_pool[7038]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[7083]: DepthRangef (will be remapped) */
+   /* _mesa_function_pool[7052]: DepthRangef (will be remapped) */
    "ff\0"
    "glDepthRangef\0"
    "\0"
-   /* _mesa_function_pool[7101]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[7070]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[7135]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[7104]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[7162]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[7131]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[7190]: BufferDataARB (will be remapped) */
+   /* _mesa_function_pool[7159]: BufferDataARB (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[7225]: FlushVertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[7194]: FlushVertexArrayRangeNV (will be remapped) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[7253]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[7222]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[7273]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[7242]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[7293]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[7262]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[7313]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[7282]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[7339]: GetTexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[7308]: GetTexFilterFuncSGIS (dynamic) */
    "iip\0"
    "glGetTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[7367]: Scissor (offset 176) */
+   /* _mesa_function_pool[7336]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[7383]: Fogf (offset 153) */
+   /* _mesa_function_pool[7352]: Fogf (offset 153) */
    "if\0"
    "glFogf\0"
    "\0"
-   /* _mesa_function_pool[7394]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[7363]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[7439]: TexSubImage1D (offset 332) */
+   /* _mesa_function_pool[7408]: TexSubImage1D (offset 332) */
    "iiiiiip\0"
    "glTexSubImage1D\0"
    "glTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[7483]: VertexAttrib1sARB (will be remapped) */
+   /* _mesa_function_pool[7452]: VertexAttrib1sARB (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[7524]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[7493]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[7540]: Color4usv (offset 40) */
+   /* _mesa_function_pool[7509]: Color4usv (offset 40) */
    "p\0"
    "glColor4usv\0"
    "\0"
-   /* _mesa_function_pool[7555]: Fogi (offset 155) */
+   /* _mesa_function_pool[7524]: Fogi (offset 155) */
    "ii\0"
    "glFogi\0"
    "\0"
-   /* _mesa_function_pool[7566]: DepthRange (offset 288) */
+   /* _mesa_function_pool[7535]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[7583]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[7552]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[7601]: FinalCombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[7570]: FinalCombinerInputNV (will be remapped) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[7630]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[7599]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[7647]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[7616]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[7665]: Color4ui (offset 37) */
+   /* _mesa_function_pool[7634]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[7682]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[7651]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[7701]: Color3usv (offset 24) */
+   /* _mesa_function_pool[7670]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[7716]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[7685]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[7736]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[7705]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[7753]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[7722]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7802]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[7771]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[7819]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[7788]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[7838]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[7807]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[7857]: Uniform1fARB (will be remapped) */
+   /* _mesa_function_pool[7826]: Uniform1fARB (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[7888]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[7857]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[7940]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[7909]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[7957]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[7926]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[8006]: ColorTableParameteriv (offset 341) */
+   /* _mesa_function_pool[7975]: ColorTableParameteriv (offset 341) */
    "iip\0"
    "glColorTableParameteriv\0"
    "glColorTableParameterivSGI\0"
    "\0"
-   /* _mesa_function_pool[8062]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[8031]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[8093]: WindowPos3dMESA (will be remapped) */
+   /* _mesa_function_pool[8062]: WindowPos3dMESA (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[8147]: Color4us (offset 39) */
+   /* _mesa_function_pool[8116]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[8164]: PointParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[8133]: PointParameterfvEXT (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[8254]: Color3bv (offset 10) */
+   /* _mesa_function_pool[8223]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[8268]: GetnCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[8237]: GetnCompressedTexImageARB (will be remapped) */
    "iiip\0"
    "glGetnCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[8302]: WindowPos2fvMESA (will be remapped) */
+   /* _mesa_function_pool[8271]: WindowPos2fvMESA (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[8357]: SecondaryColor3bvEXT (will be remapped) */
+   /* _mesa_function_pool[8326]: SecondaryColor3bvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[8403]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[8372]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[8433]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[8402]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[8470]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[8439]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[8499]: BindSampler (will be remapped) */
+   /* _mesa_function_pool[8468]: BindSampler (will be remapped) */
    "ii\0"
    "glBindSampler\0"
    "\0"
-   /* _mesa_function_pool[8517]: RenderbufferStorageEXT (will be remapped) */
+   /* _mesa_function_pool[8486]: RenderbufferStorageEXT (will be remapped) */
    "iiii\0"
    "glRenderbufferStorage\0"
    "glRenderbufferStorageEXT\0"
    "\0"
-   /* _mesa_function_pool[8570]: IsFenceNV (will be remapped) */
+   /* _mesa_function_pool[8539]: IsFenceNV (will be remapped) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[8585]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[8554]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[8607]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[8576]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[8637]: UniformMatrix2fvARB (will be remapped) */
+   /* _mesa_function_pool[8606]: UniformMatrix2fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[8684]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[8653]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[8728]: ColorTable (offset 339) */
+   /* _mesa_function_pool[8697]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[8781]: IndexPointer (offset 314) */
+   /* _mesa_function_pool[8750]: IndexPointer (offset 314) */
    "iip\0"
    "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[8801]: Accum (offset 213) */
+   /* _mesa_function_pool[8770]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[8813]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[8782]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[8834]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[8803]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[8866]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[8835]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[8922]: Finish (offset 216) */
+   /* _mesa_function_pool[8891]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[8933]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[8902]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[8957]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[8926]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[8975]: VertexAttrib3dvARB (will be remapped) */
+   /* _mesa_function_pool[8944]: VertexAttrib3dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[9018]: Uniform4uivEXT (will be remapped) */
+   /* _mesa_function_pool[8987]: Uniform4uivEXT (will be remapped) */
    "iip\0"
    "glUniform4uivEXT\0"
    "glUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[9054]: HintPGI (dynamic) */
+   /* _mesa_function_pool[9023]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[9068]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[9037]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[9126]: Color4s (offset 33) */
+   /* _mesa_function_pool[9095]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[9142]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[9111]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[9167]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[9136]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[9185]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[9154]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[9202]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[9171]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[9217]: CullParameterdvEXT (dynamic) */
+   /* _mesa_function_pool[9186]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[9242]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[9211]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[9279]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[9248]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[9308]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[9277]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[9365]: Color4i (offset 31) */
+   /* _mesa_function_pool[9334]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[9381]: Color4f (offset 29) */
+   /* _mesa_function_pool[9350]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[9397]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[9366]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[9415]: Color4d (offset 27) */
+   /* _mesa_function_pool[9384]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[9431]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[9400]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[9447]: Color4b (offset 25) */
+   /* _mesa_function_pool[9416]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[9463]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[9432]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[9480]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[9449]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[9510]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[9479]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[9528]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[9497]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[9586]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[9555]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[9607]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[9576]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[9626]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[9595]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[9653]: BeginTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[9622]: BeginTransformFeedbackEXT (will be remapped) */
    "i\0"
    "glBeginTransformFeedbackEXT\0"
    "glBeginTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[9709]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[9678]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[9731]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[9700]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[9747]: EndList (offset 1) */
+   /* _mesa_function_pool[9716]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[9759]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[9728]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[9783]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[9752]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[9813]: Uniform3fvARB (will be remapped) */
+   /* _mesa_function_pool[9782]: Uniform3fvARB (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[9847]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[9816]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[9865]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[9834]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[9916]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[9885]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[9935]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[9904]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[9950]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[9919]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[9978]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[9947]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[10006]: CheckFramebufferStatusEXT (will be remapped) */
+   /* _mesa_function_pool[9975]: CheckFramebufferStatusEXT (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "\0"
-   /* _mesa_function_pool[10062]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[10031]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[10090]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[10059]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[10108]: GetVertexAttribivARB (will be remapped) */
+   /* _mesa_function_pool[10077]: GetVertexAttribivARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[10156]: BlendFunciARB (will be remapped) */
+   /* _mesa_function_pool[10125]: BlendFunciARB (will be remapped) */
    "iii\0"
    "glBlendFunciARB\0"
    "glBlendFuncIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[10199]: GetnUniformivARB (will be remapped) */
+   /* _mesa_function_pool[10168]: GetnUniformivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[10224]: GetTexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[10193]: GetTexParameterIivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIivEXT\0"
    "glGetTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[10274]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[10243]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[10292]: LoadTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[10261]: LoadTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[10344]: ReleaseShaderCompiler (will be remapped) */
+   /* _mesa_function_pool[10313]: ReleaseShaderCompiler (will be remapped) */
    "\0"
    "glReleaseShaderCompiler\0"
    "\0"
-   /* _mesa_function_pool[10370]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[10339]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[10404]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[10373]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[10432]: SecondaryColor3sEXT (will be remapped) */
+   /* _mesa_function_pool[10401]: SecondaryColor3sEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[10478]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10447]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10504]: GetInteger64i_v (will be remapped) */
+   /* _mesa_function_pool[10473]: GetInteger64i_v (will be remapped) */
    "iip\0"
    "glGetInteger64i_v\0"
    "\0"
-   /* _mesa_function_pool[10527]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[10496]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[10554]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[10523]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[10569]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[10538]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[10596]: Color3us (offset 23) */
+   /* _mesa_function_pool[10565]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[10612]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[10581]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[10647]: VertexAttrib4ivARB (will be remapped) */
+   /* _mesa_function_pool[10616]: VertexAttrib4ivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[10690]: End (offset 43) */
+   /* _mesa_function_pool[10659]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[10698]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[10667]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[10723]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[10692]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[10749]: GetQueryObjectui64vEXT (will be remapped) */
+   /* _mesa_function_pool[10718]: GetQueryObjectui64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[10779]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[10748]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[10824]: SecondaryColor3dEXT (will be remapped) */
+   /* _mesa_function_pool[10793]: SecondaryColor3dEXT (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[10870]: Color3ub (offset 19) */
+   /* _mesa_function_pool[10839]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[10886]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[10855]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[10918]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[10887]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[10943]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10912]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10978]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[10947]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[11001]: GetUniformuivEXT (will be remapped) */
+   /* _mesa_function_pool[10970]: GetUniformuivEXT (will be remapped) */
    "iip\0"
    "glGetUniformuivEXT\0"
    "glGetUniformuiv\0"
    "\0"
-   /* _mesa_function_pool[11041]: Color3ui (offset 21) */
+   /* _mesa_function_pool[11010]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[11057]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[11026]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[11074]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[11043]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[11120]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[11089]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11147]: GetTexParameterPointervAPPLE (will be remapped) */
+   /* _mesa_function_pool[11116]: GetTexParameterPointervAPPLE (will be remapped) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[11183]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[11152]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[11199]: GetTransformFeedbackVaryingEXT (will be remapped) */
+   /* _mesa_function_pool[11168]: GetTransformFeedbackVaryingEXT (will be remapped) */
    "iiipppp\0"
    "glGetTransformFeedbackVaryingEXT\0"
    "glGetTransformFeedbackVarying\0"
    "\0"
-   /* _mesa_function_pool[11271]: VertexAttrib4bvARB (will be remapped) */
+   /* _mesa_function_pool[11240]: VertexAttrib4bvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[11314]: ShaderBinary (will be remapped) */
+   /* _mesa_function_pool[11283]: ShaderBinary (will be remapped) */
    "ipipi\0"
    "glShaderBinary\0"
    "\0"
-   /* _mesa_function_pool[11336]: GetIntegerIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[11305]: GetIntegerIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "glGetIntegeri_v\0"
    "\0"
-   /* _mesa_function_pool[11381]: MultiTexCoord4sARB (offset 406) */
+   /* _mesa_function_pool[11350]: MultiTexCoord4sARB (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[11427]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[11396]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11460]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[11429]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[11484]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[11453]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "\0"
-   /* _mesa_function_pool[11509]: WindowPos2dMESA (will be remapped) */
+   /* _mesa_function_pool[11478]: WindowPos2dMESA (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[11562]: FramebufferTexture3DEXT (will be remapped) */
+   /* _mesa_function_pool[11531]: FramebufferTexture3DEXT (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "\0"
-   /* _mesa_function_pool[11619]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[11588]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "\0"
-   /* _mesa_function_pool[11657]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[11626]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[11682]: VertexAttrib3dARB (will be remapped) */
+   /* _mesa_function_pool[11651]: VertexAttrib3dARB (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[11725]: VertexAttribI4usvEXT (will be remapped) */
+   /* _mesa_function_pool[11694]: VertexAttribI4usvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4usvEXT\0"
    "glVertexAttribI4usv\0"
    "\0"
-   /* _mesa_function_pool[11772]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11741]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11836]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[11805]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[11880]: GetError (offset 261) */
+   /* _mesa_function_pool[11849]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[11893]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[11862]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[11912]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[11881]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[11929]: Indexdv (offset 45) */
+   /* _mesa_function_pool[11898]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[11942]: FramebufferTexture2DEXT (will be remapped) */
+   /* _mesa_function_pool[11911]: FramebufferTexture2DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "\0"
-   /* _mesa_function_pool[11998]: Normal3s (offset 60) */
+   /* _mesa_function_pool[11967]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[12014]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[11983]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[12048]: PushName (offset 201) */
+   /* _mesa_function_pool[12017]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[12062]: MultiTexCoord2dvARB (offset 385) */
+   /* _mesa_function_pool[12031]: MultiTexCoord2dvARB (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[12107]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[12076]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[12132]: Normal3i (offset 58) */
+   /* _mesa_function_pool[12101]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[12148]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[12117]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[12183]: SecondaryColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[12152]: SecondaryColorPointerEXT (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[12240]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[12209]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[12283]: PixelTexGenSGIX (will be remapped) */
+   /* _mesa_function_pool[12252]: PixelTexGenSGIX (will be remapped) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[12304]: GetActiveUniformARB (will be remapped) */
+   /* _mesa_function_pool[12273]: GetActiveUniformARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[12354]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[12323]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[12388]: Normal3b (offset 52) */
+   /* _mesa_function_pool[12357]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[12404]: Normal3d (offset 54) */
+   /* _mesa_function_pool[12373]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[12420]: Uniform1uiEXT (will be remapped) */
+   /* _mesa_function_pool[12389]: Uniform1uiEXT (will be remapped) */
    "ii\0"
    "glUniform1uiEXT\0"
    "glUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[12453]: Normal3f (offset 56) */
+   /* _mesa_function_pool[12422]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[12469]: MultiTexCoord1svARB (offset 383) */
+   /* _mesa_function_pool[12438]: MultiTexCoord1svARB (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[12514]: Indexi (offset 48) */
+   /* _mesa_function_pool[12483]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[12526]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[12495]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[12559]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[12528]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[12587]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[12556]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[12608]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12577]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12637]: BindBufferRangeEXT (will be remapped) */
+   /* _mesa_function_pool[12606]: BindBufferRangeEXT (will be remapped) */
    "iiiii\0"
    "glBindBufferRangeEXT\0"
    "glBindBufferRange\0"
    "\0"
-   /* _mesa_function_pool[12683]: DepthMask (offset 211) */
+   /* _mesa_function_pool[12652]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[12698]: IsShader (will be remapped) */
+   /* _mesa_function_pool[12667]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[12712]: Indexf (offset 46) */
+   /* _mesa_function_pool[12681]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[12724]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[12693]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[12762]: Indexd (offset 44) */
+   /* _mesa_function_pool[12731]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[12774]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[12743]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[12795]: StencilOp (offset 244) */
+   /* _mesa_function_pool[12764]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[12812]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[12781]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[12834]: FramebufferTextureLayer (dynamic) */
+   /* _mesa_function_pool[12803]: FramebufferTextureLayer (dynamic) */
    "iiiii\0"
    "glFramebufferTextureLayerARB\0"
    "\0"
-   /* _mesa_function_pool[12870]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[12839]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[12915]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[12884]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[12931]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[12900]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[12977]: Indexs (offset 50) */
+   /* _mesa_function_pool[12946]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[12989]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[12958]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[13009]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[12978]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[13031]: BlendFuncSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[13000]: BlendFuncSeparateiARB (will be remapped) */
    "iiiii\0"
    "glBlendFuncSeparateiARB\0"
    "glBlendFuncSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[13092]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[13061]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[13130]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[13099]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[13162]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[13131]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[13189]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[13158]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[13204]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[13173]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[13221]: VertexAttribI1uivEXT (will be remapped) */
+   /* _mesa_function_pool[13190]: VertexAttribI1uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1uivEXT\0"
    "glVertexAttribI1uiv\0"
    "\0"
-   /* _mesa_function_pool[13268]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[13237]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[13283]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[13252]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[13336]: Color4bv (offset 26) */
+   /* _mesa_function_pool[13305]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[13350]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[13319]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[13372]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[13341]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[13420]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[13389]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[13445]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[13414]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[13493]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[13462]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[13517]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[13486]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[13552]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[13521]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[13570]: LogicOp (offset 242) */
+   /* _mesa_function_pool[13539]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[13583]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[13552]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[13607]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[13576]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[13622]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[13591]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[13698]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[13667]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[13715]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[13684]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[13735]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[13704]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[13762]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[13731]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[13807]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[13776]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[13822]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13791]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13854]: VertexAttribI4svEXT (will be remapped) */
+   /* _mesa_function_pool[13823]: VertexAttribI4svEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4svEXT\0"
    "glVertexAttribI4sv\0"
    "\0"
-   /* _mesa_function_pool[13899]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[13868]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[13927]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[13896]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[13951]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[13920]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[14012]: ClearBufferuiv (will be remapped) */
+   /* _mesa_function_pool[13981]: ClearBufferuiv (will be remapped) */
    "iip\0"
    "glClearBufferuiv\0"
    "\0"
-   /* _mesa_function_pool[14034]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[14003]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[14058]: GenTextures (offset 328) */
+   /* _mesa_function_pool[14027]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[14093]: FramebufferTextureARB (will be remapped) */
+   /* _mesa_function_pool[14062]: FramebufferTextureARB (will be remapped) */
    "iiii\0"
    "glFramebufferTextureARB\0"
    "\0"
-   /* _mesa_function_pool[14123]: SetFenceNV (will be remapped) */
+   /* _mesa_function_pool[14092]: SetFenceNV (will be remapped) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[14140]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[14109]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[14196]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[14165]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[14235]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[14204]: MultiModeDrawArraysIBM (will be remapped) */
+   "pppii\0"
+   "glMultiModeDrawArraysIBM\0"
+   "\0"
+   /* _mesa_function_pool[14236]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[14268]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[14269]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[14290]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[14291]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[14318]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[14319]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[14336]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[14337]: GetCombinerOutputParameterfvNV (will be remapped) */
+   "iiip\0"
+   "glGetCombinerOutputParameterfvNV\0"
+   "\0"
+   /* _mesa_function_pool[14376]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[14354]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[14394]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[14369]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[14409]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[14385]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[14425]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[14402]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[14442]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[14426]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[14466]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[14443]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[14483]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[14498]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[14538]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[14513]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[14553]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[14532]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[14572]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[14561]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[14601]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[14604]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[14644]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[14648]: IsSampler (will be remapped) */
+   /* _mesa_function_pool[14688]: IsSampler (will be remapped) */
    "i\0"
    "glIsSampler\0"
    "\0"
-   /* _mesa_function_pool[14663]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[14703]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[14679]: EndTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[14719]: EndTransformFeedbackEXT (will be remapped) */
    "\0"
    "glEndTransformFeedbackEXT\0"
    "glEndTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[14730]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[14770]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[14764]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[14804]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[14793]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[14833]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[14838]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[14878]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[14894]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[14934]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[14915]: GetShaderPrecisionFormat (will be remapped) */
+   /* _mesa_function_pool[14955]: GetShaderPrecisionFormat (will be remapped) */
    "iipp\0"
    "glGetShaderPrecisionFormat\0"
    "\0"
-   /* _mesa_function_pool[14948]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[14988]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[14978]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[15018]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[15013]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[15053]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[15032]: Flush (offset 217) */
+   /* _mesa_function_pool[15072]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[15042]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[15082]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[15057]: VertexAttribI4iEXT (will be remapped) */
+   /* _mesa_function_pool[15097]: VertexAttribI4iEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4iEXT\0"
    "glVertexAttribI4i\0"
    "\0"
-   /* _mesa_function_pool[15103]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[15143]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[15125]: Uniform3uivEXT (will be remapped) */
+   /* _mesa_function_pool[15165]: Uniform3uivEXT (will be remapped) */
    "iip\0"
    "glUniform3uivEXT\0"
    "glUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[15161]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[15201]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[15179]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[15219]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[15222]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[15262]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[15246]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[15286]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[15262]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[15302]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[15280]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[15320]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[15322]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[15362]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[15344]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[15384]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[15364]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[15404]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[15405]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[15445]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[15460]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[15500]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[15478]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[15518]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[15502]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[15542]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[15520]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[15560]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[15538]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[15578]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[15592]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[15632]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[15634]: Color4ub (offset 35) */
+   /* _mesa_function_pool[15674]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[15651]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[15691]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[15671]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[15711]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[15700]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[15740]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[15718]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[15758]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[15778]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[15818]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[15797]: Indexiv (offset 49) */
+   /* _mesa_function_pool[15837]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[15810]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[15850]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[15828]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[15868]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[15872]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[15912]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[15932]: Frustum (offset 289) */
+   /* _mesa_function_pool[15972]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[15950]: GetString (offset 275) */
+   /* _mesa_function_pool[15990]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[15965]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[16005]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[15991]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[16031]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[16006]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[16046]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[16024]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[16064]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[16054]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[16094]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[16072]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[16112]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[16117]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[16157]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[16161]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[16201]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[16204]: GetnHistogramARB (will be remapped) */
+   /* _mesa_function_pool[16244]: GetnHistogramARB (will be remapped) */
    "iiiiip\0"
    "glGetnHistogramARB\0"
    "\0"
-   /* _mesa_function_pool[16231]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[16271]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[16272]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[16312]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[16300]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[16340]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[16335]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[16375]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[16353]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[16393]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[16384]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[16424]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[16418]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[16458]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[16443]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[16483]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[16499]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[16539]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[16518]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[16558]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[16534]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[16574]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[16582]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[16622]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[16628]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[16668]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[16645]: VertexAttribI4uiEXT (will be remapped) */
+   /* _mesa_function_pool[16685]: VertexAttribI4uiEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4uiEXT\0"
    "glVertexAttribI4ui\0"
    "\0"
-   /* _mesa_function_pool[16693]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[16733]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[16726]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[16766]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[16753]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16793]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[16780]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[16820]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[16817]: SamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[16857]: SamplerParameterIiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[16844]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[16884]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[16864]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[16904]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[16885]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[16925]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[16912]: Rectd (offset 86) */
+   /* _mesa_function_pool[16952]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[16926]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16966]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[16952]: TextureBarrierNV (will be remapped) */
+   /* _mesa_function_pool[16992]: TextureBarrierNV (will be remapped) */
    "\0"
    "glTextureBarrierNV\0"
    "\0"
-   /* _mesa_function_pool[16973]: SamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[17013]: SamplerParameterfv (will be remapped) */
    "iip\0"
    "glSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[16999]: ColorMaskIndexedEXT (will be remapped) */
-   "iiiii\0"
-   "glColorMaskIndexedEXT\0"
-   "glColorMaski\0"
+   /* _mesa_function_pool[17039]: VertexAttribI4ubvEXT (will be remapped) */
+   "ip\0"
+   "glVertexAttribI4ubvEXT\0"
+   "glVertexAttribI4ubv\0"
    "\0"
-   /* _mesa_function_pool[17041]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[17086]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[17088]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[17133]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[17107]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[17152]: BlendEquationSeparateiARB (will be remapped) */
+   "iii\0"
+   "glBlendEquationSeparateiARB\0"
+   "glBlendEquationSeparateIndexedAMD\0"
+   "\0"
+   /* _mesa_function_pool[17219]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[17152]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[17264]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[17177]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[17289]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[17207]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[17319]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[17254]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[17366]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[17302]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[17414]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[17360]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[17472]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[17394]: Lightfv (offset 160) */
+   /* _mesa_function_pool[17506]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[17409]: PrimitiveRestartIndexNV (will be remapped) */
+   /* _mesa_function_pool[17521]: PrimitiveRestartIndexNV (will be remapped) */
    "i\0"
    "glPrimitiveRestartIndexNV\0"
    "glPrimitiveRestartIndex\0"
    "\0"
-   /* _mesa_function_pool[17462]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[17574]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[17478]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[17590]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[17498]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[17610]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[17520]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[17632]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[17563]: Color4fv (offset 30) */
+   /* _mesa_function_pool[17675]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[17577]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[17689]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[17622]: GetnMinmaxARB (will be remapped) */
+   /* _mesa_function_pool[17734]: GetnMinmaxARB (will be remapped) */
    "iiiiip\0"
    "glGetnMinmaxARB\0"
    "\0"
-   /* _mesa_function_pool[17646]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[17758]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[17683]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[17795]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[17704]: Rects (offset 92) */
+   /* _mesa_function_pool[17816]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[17718]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17830]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17752]: CreateShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[17864]: CreateShaderProgramEXT (will be remapped) */
    "ip\0"
    "glCreateShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[17781]: ActiveProgramEXT (will be remapped) */
+   /* _mesa_function_pool[17893]: ActiveProgramEXT (will be remapped) */
    "i\0"
    "glActiveProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[17803]: Lightiv (offset 162) */
+   /* _mesa_function_pool[17915]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[17818]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[17930]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[17862]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[17974]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[17910]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[18022]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[17935]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[18047]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[17959]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[18071]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[18004]: ClearBufferfv (will be remapped) */
+   /* _mesa_function_pool[18116]: ClearBufferfv (will be remapped) */
    "iip\0"
    "glClearBufferfv\0"
    "\0"
-   /* _mesa_function_pool[18025]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[18137]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[18068]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[18180]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[18094]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[18206]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[18120]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[18232]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[18138]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[18250]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[18181]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[18293]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[18235]: Rectdv (offset 87) */
+   /* _mesa_function_pool[18347]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[18248]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[18360]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[18274]: BlendEquationiARB (will be remapped) */
+   /* _mesa_function_pool[18386]: BlendEquationiARB (will be remapped) */
    "ii\0"
    "glBlendEquationiARB\0"
    "glBlendEquationIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[18324]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[18436]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[18383]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[18495]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[18411]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[18523]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[18456]: DrawArraysInstancedARB (will be remapped) */
+   /* _mesa_function_pool[18568]: DrawArraysInstancedARB (will be remapped) */
    "iiii\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "glDrawArraysInstanced\0"
    "\0"
-   /* _mesa_function_pool[18534]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[18646]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[18561]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[18673]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[18588]: ClearBufferfi (will be remapped) */
+   /* _mesa_function_pool[18700]: ClearBufferfi (will be remapped) */
    "iifi\0"
    "glClearBufferfi\0"
    "\0"
-   /* _mesa_function_pool[18610]: Materialiv (offset 172) */
+   /* _mesa_function_pool[18722]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[18628]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[18740]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[18650]: SamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[18762]: SamplerParameteriv (will be remapped) */
    "iip\0"
    "glSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[18676]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[18788]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[18722]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[18834]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[18775]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[18887]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[18812]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[18924]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[18858]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[18970]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[18876]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[18988]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[18940]: VertexAttribI1iEXT (will be remapped) */
+   /* _mesa_function_pool[19052]: VertexAttribI1iEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1iEXT\0"
    "glVertexAttribI1i\0"
    "\0"
-   /* _mesa_function_pool[18983]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19095]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19025]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[19137]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[19052]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[19164]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[19079]: GetnUniformdvARB (will be remapped) */
+   /* _mesa_function_pool[19191]: GetnUniformdvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformdvARB\0"
    "\0"
-   /* _mesa_function_pool[19104]: VertexAttribIPointerEXT (will be remapped) */
+   /* _mesa_function_pool[19216]: DrawElementsInstancedBaseVertex (will be remapped) */
+   "iiipii\0"
+   "glDrawElementsInstancedBaseVertex\0"
+   "\0"
+   /* _mesa_function_pool[19258]: VertexAttribIPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexAttribIPointerEXT\0"
    "glVertexAttribIPointer\0"
    "\0"
-   /* _mesa_function_pool[19160]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[19314]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[19188]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[19342]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[19207]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[19361]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[19245]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[19399]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[19263]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[19417]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[19287]: TexGeni (offset 192) */
+   /* _mesa_function_pool[19441]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[19302]: TexGenf (offset 190) */
+   /* _mesa_function_pool[19456]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[19317]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[19471]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[19350]: TexGend (offset 188) */
+   /* _mesa_function_pool[19504]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[19365]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[19519]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[19392]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[19546]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[19415]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[19569]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[19434]: BindBufferOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[19588]: BindBufferOffsetEXT (will be remapped) */
    "iiii\0"
    "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[19462]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[19616]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[19516]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[19670]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[19540]: DisableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[19694]: DisableIndexedEXT (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "glDisablei\0"
    "\0"
-   /* _mesa_function_pool[19575]: BindBufferBaseEXT (will be remapped) */
+   /* _mesa_function_pool[19729]: BindBufferBaseEXT (will be remapped) */
    "iii\0"
    "glBindBufferBaseEXT\0"
    "glBindBufferBase\0"
    "\0"
-   /* _mesa_function_pool[19617]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[19771]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[19646]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[19800]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[19670]: GetnPixelMapuivARB (will be remapped) */
+   /* _mesa_function_pool[19824]: GetnPixelMapuivARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapuivARB\0"
    "\0"
-   /* _mesa_function_pool[19696]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[19850]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[19743]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[19897]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[19793]: GetSamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[19947]: GetSamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[19824]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[19978]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[19851]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[20005]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[19885]: Color4sv (offset 34) */
+   /* _mesa_function_pool[20039]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[19899]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[20053]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[19929]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[20083]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[19961]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[20115]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[19996]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[20150]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[20012]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[20166]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[20045]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[20199]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[20103]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[20257]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[20159]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[20313]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[20189]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[20343]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[20209]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[20363]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[20228]: Color3dv (offset 12) */
+   /* _mesa_function_pool[20382]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[20242]: IsTexture (offset 330) */
+   /* _mesa_function_pool[20396]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[20272]: GenSamplers (will be remapped) */
+   /* _mesa_function_pool[20426]: GenSamplers (will be remapped) */
    "ip\0"
    "glGenSamplers\0"
    "\0"
-   /* _mesa_function_pool[20290]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[20444]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[20313]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[20467]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[20354]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[20508]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[20389]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[20543]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[20408]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[20562]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[20447]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[20601]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[20477]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[20631]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[20509]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[20663]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[20538]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[20692]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[20554]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[20708]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[20582]: GetStringi (will be remapped) */
+   /* _mesa_function_pool[20736]: GetStringi (will be remapped) */
    "ii\0"
    "glGetStringi\0"
    "\0"
-   /* _mesa_function_pool[20599]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[20753]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[20641]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[20795]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[20659]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[20813]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[20685]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[20839]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[20734]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[20888]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[20752]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[20906]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[20797]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[20951]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[20831]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[20985]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[20855]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[21009]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[20894]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[21048]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[20923]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[21077]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[20941]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[21095]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[20984]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[21138]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[21004]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[21158]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[21072]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[21226]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[21127]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[21281]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[21165]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[21319]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[21199]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[21353]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[21247]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[21401]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[21275]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[21429]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[21328]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[21482]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[21349]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[21503]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[21376]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[21530]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[21408]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[21562]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[21432]: TransformFeedbackVaryingsEXT (will be remapped) */
+   /* _mesa_function_pool[21586]: TransformFeedbackVaryingsEXT (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryingsEXT\0"
    "glTransformFeedbackVaryings\0"
    "\0"
-   /* _mesa_function_pool[21497]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[21651]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[21519]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[21673]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[21537]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[21691]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[21560]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[21714]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[21587]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[21741]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[21637]: Color3s (offset 17) */
+   /* _mesa_function_pool[21791]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[21652]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[21806]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[21686]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[21840]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[21739]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[21893]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[21758]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[21912]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[21782]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[21936]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[21826]: GetnSeparableFilterARB (will be remapped) */
+   /* _mesa_function_pool[21980]: GetnSeparableFilterARB (will be remapped) */
    "iiiipipp\0"
    "glGetnSeparableFilterARB\0"
    "\0"
-   /* _mesa_function_pool[21861]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[22015]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[21884]: Color3i (offset 15) */
+   /* _mesa_function_pool[22038]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[21899]: FrontFace (offset 157) */
+   /* _mesa_function_pool[22053]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[21914]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[22068]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[21932]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[22086]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[21980]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[22134]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[21998]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[22152]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[22041]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[22195]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[22091]: Color3b (offset 9) */
+   /* _mesa_function_pool[22245]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[22106]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[22260]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[22150]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[22304]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[22174]: Color3f (offset 13) */
+   /* _mesa_function_pool[22328]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[22189]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[22343]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[22209]: Color3d (offset 11) */
+   /* _mesa_function_pool[22363]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[22224]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[22378]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[22239]: Lightf (offset 159) */
+   /* _mesa_function_pool[22393]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[22253]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[22407]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[22279]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[22433]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[22295]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[22449]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[22316]: Lighti (offset 161) */
+   /* _mesa_function_pool[22470]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[22330]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[22484]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[22361]: ClearDepthf (will be remapped) */
+   /* _mesa_function_pool[22515]: ClearDepthf (will be remapped) */
    "f\0"
    "glClearDepthf\0"
    "\0"
-   /* _mesa_function_pool[22378]: GetBooleanIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[22532]: GetBooleanIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "glGetBooleani_v\0"
    "\0"
-   /* _mesa_function_pool[22423]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[22577]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[22508]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[22662]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[22543]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[22697]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[22588]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[22742]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[22623]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[22777]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[22640]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[22794]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[22657]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[22811]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[22674]: VertexAttribI4bvEXT (will be remapped) */
+   /* _mesa_function_pool[22828]: VertexAttribI4bvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4bvEXT\0"
    "glVertexAttribI4bv\0"
    "\0"
-   /* _mesa_function_pool[22719]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[22873]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[22762]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[22916]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[22793]: GetnMapfvARB (will be remapped) */
+   /* _mesa_function_pool[22947]: GetnMapfvARB (will be remapped) */
    "iiip\0"
    "glGetnMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[22814]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[22968]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[22869]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[23023]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[22894]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[23048]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[22920]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[23074]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[22965]: Uniform2uiEXT (will be remapped) */
+   /* _mesa_function_pool[23119]: Uniform2uiEXT (will be remapped) */
    "iii\0"
    "glUniform2uiEXT\0"
    "glUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[22999]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[23153]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[23026]: SamplerParameteri (will be remapped) */
+   /* _mesa_function_pool[23180]: SamplerParameteri (will be remapped) */
    "iii\0"
    "glSamplerParameteri\0"
    "\0"
-   /* _mesa_function_pool[23051]: SamplerParameterf (will be remapped) */
+   /* _mesa_function_pool[23205]: SamplerParameterf (will be remapped) */
    "iif\0"
    "glSamplerParameterf\0"
    "\0"
-   /* _mesa_function_pool[23076]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[23230]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[23103]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[23257]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[23132]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[23286]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[23158]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[23312]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[23181]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[23335]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[23200]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[23354]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[23227]: GetnUniformuivARB (will be remapped) */
+   /* _mesa_function_pool[23381]: GetnUniformuivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformuivARB\0"
    "\0"
-   /* _mesa_function_pool[23253]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[23407]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[23271]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[23425]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[23316]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[23470]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[23359]: ClearColor (offset 206) */
+   /* _mesa_function_pool[23513]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[23378]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[23532]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[23397]: ClearColorIiEXT (will be remapped) */
+   /* _mesa_function_pool[23551]: ClearColorIiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIiEXT\0"
    "\0"
-   /* _mesa_function_pool[23421]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[23575]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[23470]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[23624]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[23497]: IsEnabledIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[23651]: IsEnabledIndexedEXT (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "glIsEnabledi\0"
    "\0"
-   /* _mesa_function_pool[23536]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[23690]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[23552]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[23706]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[23600]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[23754]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[23620]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[23774]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[23668]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[23822]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[23692]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[23846]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[23733]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[23887]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[23765]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[23919]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[23783]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[23937]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[23875]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[24029]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[23906]: Bitmap (offset 8) */
+   /* _mesa_function_pool[24060]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[23924]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[24078]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[23969]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[24123]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[24000]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[24154]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[24036]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[24190]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[24079]: VertexAttribDivisor (will be remapped) */
+   /* _mesa_function_pool[24233]: VertexAttribDivisor (will be remapped) */
    "ii\0"
    "glVertexAttribDivisor\0"
    "\0"
-   /* _mesa_function_pool[24105]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[24259]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[24137]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[24291]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[24152]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[24306]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[24170]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[24324]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[24210]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[24364]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[24237]: GetnMapdvARB (will be remapped) */
+   /* _mesa_function_pool[24391]: GetnMapdvARB (will be remapped) */
    "iiip\0"
    "glGetnMapdvARB\0"
    "\0"
-   /* _mesa_function_pool[24258]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[24412]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[24277]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[24431]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[24325]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[24479]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[24360]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[24514]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[24387]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[24541]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[24411]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[24565]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[24445]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[24599]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[24497]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[24651]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[24516]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[24670]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[24547]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[24701]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[24585]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[24739]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[24628]: VertexAttribI2ivEXT (will be remapped) */
+   /* _mesa_function_pool[24782]: VertexAttribI2ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2ivEXT\0"
    "glVertexAttribI2iv\0"
    "\0"
-   /* _mesa_function_pool[24673]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[24827]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[24693]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[24847]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[24764]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[24918]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[24786]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[24940]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[24806]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[24960]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[24860]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[25014]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[24913]: ProgramParameteriARB (will be remapped) */
+   /* _mesa_function_pool[25067]: ProgramParameteriARB (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "\0"
-   /* _mesa_function_pool[24941]: Map1d (offset 220) */
+   /* _mesa_function_pool[25095]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[24957]: Map1f (offset 221) */
+   /* _mesa_function_pool[25111]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[24973]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[25127]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[25032]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[25186]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[25068]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[25222]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[25092]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[25246]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[25113]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[25267]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[25144]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[25298]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[25183]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[25337]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[25205]: GetFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[25359]: GetFragDataLocationEXT (will be remapped) */
    "ip\0"
    "glGetFragDataLocationEXT\0"
    "glGetFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[25256]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[25410]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[25310]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[25464]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[25331]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[25485]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[25377]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[25531]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[25392]: Fogiv (offset 156) */
+   /* _mesa_function_pool[25546]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[25404]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[25558]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[25421]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[25575]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[25457]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[25611]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[25478]: GetnColorTableARB (will be remapped) */
+   /* _mesa_function_pool[25632]: GetnColorTableARB (will be remapped) */
    "iiiip\0"
    "glGetnColorTableARB\0"
    "\0"
-   /* _mesa_function_pool[25505]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[25659]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[25529]: Rotatef (offset 300) */
+   /* _mesa_function_pool[25683]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[25545]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[25699]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[25587]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[25741]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[25603]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[25757]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[25619]: Clear (offset 203) */
+   /* _mesa_function_pool[25773]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[25630]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[25784]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[25646]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[25800]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[25673]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[25827]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[25707]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[25861]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[25723]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[25877]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[25779]: Ortho (offset 296) */
+   /* _mesa_function_pool[25933]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[25795]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[25949]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[25816]: ListBase (offset 6) */
+   /* _mesa_function_pool[25970]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[25830]: VertexAttribI3ivEXT (will be remapped) */
+   /* _mesa_function_pool[25984]: VertexAttribI3ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3ivEXT\0"
    "glVertexAttribI3iv\0"
    "\0"
-   /* _mesa_function_pool[25875]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[26029]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[25891]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[26045]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[25947]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[26101]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[26039]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[26193]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[26096]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[26250]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[26112]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[26266]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[26138]: Rectiv (offset 91) */
+   /* _mesa_function_pool[26292]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[26151]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[26305]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[26189]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[26343]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[26216]: EndConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[26370]: EndConditionalRenderNV (will be remapped) */
    "\0"
    "glEndConditionalRenderNV\0"
    "glEndConditionalRender\0"
    "\0"
-   /* _mesa_function_pool[26266]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[26420]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[26289]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[26443]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[26308]: GetSamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[26462]: GetSamplerParameteriv (will be remapped) */
    "iip\0"
    "glGetSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[26337]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[26491]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[26357]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[26511]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[26403]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[26557]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[26436]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[26590]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[26451]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[26605]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[26496]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[26650]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[26541]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[26695]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[26587]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[26741]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[26622]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[26776]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[26637]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[26791]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[26685]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[26839]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[26720]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[26874]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[26763]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[26917]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[26780]: PauseTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[26934]: PauseTransformFeedback (will be remapped) */
    "\0"
    "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[26807]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[26961]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[26850]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[27004]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[26897]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[27051]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[26985]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[27139]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[27011]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[27165]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[27056]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[27210]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[27088]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[27242]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[27103]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[27257]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[27129]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[27283]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[27154]: LineWidth (offset 168) */
+   /* _mesa_function_pool[27308]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[27169]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[27323]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[27200]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[27354]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[27238]: TexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[27392]: TexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIuivEXT\0"
    "glTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[27284]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[27438]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[27304]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[27458]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[27325]: GetBufferParameteri64v (will be remapped) */
+   /* _mesa_function_pool[27479]: GetBufferParameteri64v (will be remapped) */
    "iip\0"
    "glGetBufferParameteri64v\0"
    "\0"
-   /* _mesa_function_pool[27355]: TexGendv (offset 189) */
+   /* _mesa_function_pool[27509]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[27371]: VertexAttribI3iEXT (will be remapped) */
+   /* _mesa_function_pool[27525]: VertexAttribI3iEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3iEXT\0"
    "glVertexAttribI3i\0"
    "\0"
-   /* _mesa_function_pool[27416]: EnableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[27570]: EnableIndexedEXT (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "glEnablei\0"
    "\0"
-   /* _mesa_function_pool[27449]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[27603]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[27474]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[27628]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[27495]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[27649]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[27529]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[27683]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[27556]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[27710]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[27579]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[27733]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[27605]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[27759]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[27669]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[27823]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[27695]: MultiModeDrawArraysIBM (will be remapped) */
-   "pppii\0"
-   "glMultiModeDrawArraysIBM\0"
-   "\0"
-   /* _mesa_function_pool[27727]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[27849]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[27771]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[27893]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[27802]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[27924]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[27839]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[27961]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[27860]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[27982]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[27882]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[28004]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[27917]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[28039]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[27938]: CallList (offset 2) */
+   /* _mesa_function_pool[28060]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[27952]: Materialfv (offset 170) */
+   /* _mesa_function_pool[28074]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[27970]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[28092]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[27987]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[28109]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[28019]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[28141]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[28064]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[28186]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[28112]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[28234]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[28157]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[28279]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[28175]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[28297]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[28228]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[28350]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[28259]: Color3iv (offset 16) */
+   /* _mesa_function_pool[28381]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[28273]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[28395]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[28307]: DrawElements (offset 311) */
+   /* _mesa_function_pool[28429]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[28328]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[28450]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[28354]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[28476]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[28391]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[28513]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[28451]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[28573]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[28494]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[28616]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[28549]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[28671]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[28572]: TexBufferARB (will be remapped) */
+   /* _mesa_function_pool[28694]: TexBufferARB (will be remapped) */
    "iii\0"
    "glTexBufferARB\0"
    "\0"
-   /* _mesa_function_pool[28592]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[28714]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[28665]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[28787]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[28688]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[28810]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[28719]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[28841]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[28756]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[28878]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[28773]: Uniform1uivEXT (will be remapped) */
+   /* _mesa_function_pool[28895]: Uniform1uivEXT (will be remapped) */
    "iip\0"
    "glUniform1uivEXT\0"
    "glUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[28809]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[28931]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[28825]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[28947]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[28845]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[28967]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[28859]: GetVertexAttribIuivEXT (will be remapped) */
-   "iip\0"
-   "glGetVertexAttribIuivEXT\0"
-   "glGetVertexAttribIuiv\0"
-   "\0"
-   /* _mesa_function_pool[28911]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[28981]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[28930]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[29000]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[28950]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[29020]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[28999]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[29069]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[29045]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[29115]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[29064]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[29134]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[29090]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[29160]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[29133]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[29203]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[29158]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[29228]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[29203]: Map2d (offset 222) */
+   /* _mesa_function_pool[29273]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[29223]: Map2f (offset 223) */
+   /* _mesa_function_pool[29293]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[29243]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[29313]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[29268]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[29338]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[29285]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[29355]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[29314]: FragmentLightModelivSGIX (dynamic) */
+   /* _mesa_function_pool[29384]: FragmentLightModelivSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelivSGIX\0"
    "\0"
-   /* _mesa_function_pool[29345]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[29415]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[29368]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[29438]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[29385]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[29455]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[29402]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[29472]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[29419]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[29489]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[29437]: UseShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[29507]: UseShaderProgramEXT (will be remapped) */
    "ii\0"
    "glUseShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[29463]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[29533]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[29489]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[29559]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[29545]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[29615]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[29564]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[29634]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[29581]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[29651]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[29612]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[29682]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[29652]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[29722]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[29678]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[29748]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[29709]: Materialf (offset 169) */
+   /* _mesa_function_pool[29779]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[29726]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[29796]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[29771]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[29841]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[29796]: Materiali (offset 171) */
+   /* _mesa_function_pool[29866]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[29813]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[29883]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[29839]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[29909]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[29874]: Indexsv (offset 51) */
+   /* _mesa_function_pool[29944]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[29887]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[29957]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[29932]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[30002]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[29951]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[30021]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[29968]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[30038]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[30001]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[30071]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[30019]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[30089]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[30056]: Translated (offset 303) */
+   /* _mesa_function_pool[30126]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[30074]: Translatef (offset 304) */
+   /* _mesa_function_pool[30144]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[30092]: Uniform3uiEXT (will be remapped) */
+   /* _mesa_function_pool[30162]: Uniform3uiEXT (will be remapped) */
    "iiii\0"
    "glUniform3uiEXT\0"
    "glUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[30127]: StencilMask (offset 209) */
+   /* _mesa_function_pool[30197]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[30144]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[30214]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[30164]: ClampColorARB (will be remapped) */
+   /* _mesa_function_pool[30234]: ClampColorARB (will be remapped) */
    "ii\0"
    "glClampColorARB\0"
    "\0"
-   /* _mesa_function_pool[30184]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[30254]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[30202]: GetSamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[30272]: GetSamplerParameterIiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[30232]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[30302]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[30258]: IsList (offset 287) */
+   /* _mesa_function_pool[30328]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[30270]: IsSync (will be remapped) */
+   /* _mesa_function_pool[30340]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[30282]: RenderMode (offset 196) */
+   /* _mesa_function_pool[30352]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[30298]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[30368]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[30331]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[30401]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "\0"
-   /* _mesa_function_pool[30383]: ClearBufferiv (will be remapped) */
+   /* _mesa_function_pool[30453]: ClearBufferiv (will be remapped) */
    "iip\0"
    "glClearBufferiv\0"
    "\0"
-   /* _mesa_function_pool[30404]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[30474]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[30441]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[30511]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[30469]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[30539]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[30511]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[30581]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[30554]: LoadName (offset 198) */
+   /* _mesa_function_pool[30624]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[30568]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[30638]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[30595]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[30665]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[30613]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[30683]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[30647]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[30717]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[30698]: CullFace (offset 152) */
+   /* _mesa_function_pool[30768]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[30712]: BindTexture (offset 307) */
+   /* _mesa_function_pool[30782]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[30747]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[30817]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[30774]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[30844]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[30820]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[30890]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[30846]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[30916]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[30865]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[30935]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[30885]: Rectsv (offset 93) */
+   /* _mesa_function_pool[30955]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[30898]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[30968]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[30925]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[30995]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[30983]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[31053]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[31009]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[31079]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[31072]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[31142]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[31127]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[31197]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[31154]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[31224]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[31175]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[31245]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[31197]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[31267]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[31225]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[31295]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[31249]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[31319]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[31294]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[31364]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[31313]: VertexAttribI3uivEXT (will be remapped) */
+   /* _mesa_function_pool[31383]: VertexAttribI3uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3uivEXT\0"
    "glVertexAttribI3uiv\0"
    "\0"
-   /* _mesa_function_pool[31360]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[31430]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[31387]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[31457]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[31403]: Recti (offset 90) */
+   /* _mesa_function_pool[31473]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[31417]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[31487]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[31439]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[31509]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[31478]: SamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[31548]: SamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[31506]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[31576]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[31535]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[31605]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[31574]: PixelTransformParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[31644]: PixelTransformParameterfvEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[31610]: PrimitiveRestartNV (will be remapped) */
+   /* _mesa_function_pool[31680]: PrimitiveRestartNV (will be remapped) */
    "\0"
    "glPrimitiveRestartNV\0"
    "\0"
-   /* _mesa_function_pool[31633]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[31703]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[31655]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[31725]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[31676]: Rectf (offset 88) */
+   /* _mesa_function_pool[31746]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[31690]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[31760]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[31713]: Indexfv (offset 47) */
+   /* _mesa_function_pool[31783]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[31726]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[31796]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[31772]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[31842]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[31824]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[31894]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[31859]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[31929]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[31879]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[31949]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[31906]: IndexMask (offset 212) */
+   /* _mesa_function_pool[31976]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[31921]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[31991]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[31958]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[32028]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[32001]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[32071]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[32017]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[32087]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[32043]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[32113]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[32062]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[32132]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[32084]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[32154]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[32103]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[32173]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[32120]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[32190]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[32147]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[32217]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[32161]: Fogfv (offset 154) */
+   /* _mesa_function_pool[32231]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[32173]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[32243]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[32207]: InitNames (offset 197) */
+   /* _mesa_function_pool[32277]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[32221]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[32291]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[32236]: Minmax (offset 368) */
+   /* _mesa_function_pool[32306]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[32262]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[32332]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[32281]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[32351]: DeformationMap3dSGIX (dynamic) */
+   "iddiiddiiddiip\0"
+   "glDeformationMap3dSGIX\0"
+   "\0"
+   /* _mesa_function_pool[32390]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[32300]: FogCoorddvEXT (will be remapped) */
+   /* _mesa_function_pool[32409]: FogCoorddvEXT (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[32332]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[32441]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[32354]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[32463]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[32384]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[32493]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[32404]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[32513]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[32422]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[32531]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[32459]: Hint (offset 158) */
+   /* _mesa_function_pool[32568]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[32470]: Color4dv (offset 28) */
+   /* _mesa_function_pool[32579]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[32484]: VertexAttrib2svARB (will be remapped) */
+   /* _mesa_function_pool[32593]: VertexAttrib2svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[32527]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[32636]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[32556]: WindowPos3svMESA (will be remapped) */
+   /* _mesa_function_pool[32665]: WindowPos3svMESA (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[32611]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[32720]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[32661]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[32770]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[32679]: DeleteRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[32788]: DeleteRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[32730]: VertexAttrib4NubvARB (will be remapped) */
+   /* _mesa_function_pool[32839]: VertexAttrib4NubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[32777]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[32886]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[32801]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[32910]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[32832]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[32941]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[32847]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[32956]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[32882]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[32991]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[32899]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[33008]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[32919]: Begin (offset 7) */
+   /* _mesa_function_pool[33028]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[32930]: LightModeli (offset 165) */
+   /* _mesa_function_pool[33039]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[32948]: VertexAttribI4ivEXT (will be remapped) */
+   /* _mesa_function_pool[33057]: VertexAttribI4ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ivEXT\0"
    "glVertexAttribI4iv\0"
    "\0"
-   /* _mesa_function_pool[32993]: Rectfv (offset 89) */
+   /* _mesa_function_pool[33102]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[33006]: BlendEquationSeparateiARB (will be remapped) */
-   "iii\0"
-   "glBlendEquationSeparateiARB\0"
-   "glBlendEquationSeparateIndexedAMD\0"
-   "\0"
-   /* _mesa_function_pool[33073]: LightModelf (offset 163) */
+   /* _mesa_function_pool[33115]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[33091]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[33133]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[33116]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[33158]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[33134]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[33176]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[33170]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[33212]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[33196]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[33238]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[33219]: GetCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[33261]: GetCombinerInputParameterivNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[33258]: Disable (offset 214) */
+   /* _mesa_function_pool[33300]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[33271]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[33313]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[33316]: GetRenderbufferParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[33358]: GetRenderbufferParameterivEXT (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[33382]: CombinerParameterivNV (will be remapped) */
+   /* _mesa_function_pool[33424]: CombinerParameterivNV (will be remapped) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[33410]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[33452]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[33437]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[33479]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[33471]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[33513]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[33490]: GetVertexAttribIivEXT (will be remapped) */
+   /* _mesa_function_pool[33532]: GetVertexAttribIivEXT (will be remapped) */
    "iip\0"
    "glGetVertexAttribIivEXT\0"
    "glGetVertexAttribIiv\0"
    "\0"
-   /* _mesa_function_pool[33540]: VertexAttrib2sARB (will be remapped) */
+   /* _mesa_function_pool[33582]: VertexAttrib2sARB (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[33582]: GetnTexImageARB (will be remapped) */
+   /* _mesa_function_pool[33624]: GetnTexImageARB (will be remapped) */
    "iiiiip\0"
    "glGetnTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[33608]: ColorMask (offset 210) */
+   /* _mesa_function_pool[33650]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[33626]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[33668]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[33651]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[33693]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[33670]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[33712]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[33700]: BindBufferARB (will be remapped) */
+   /* _mesa_function_pool[33742]: BindBufferARB (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[33733]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[33775]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[33755]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[33797]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[33773]: Enable (offset 215) */
+   /* _mesa_function_pool[33815]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[33785]: LineStipple (offset 167) */
+   /* _mesa_function_pool[33827]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[33803]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[33845]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[33829]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[33871]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[33859]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[33901]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[33886]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[33928]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[33940]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[33982]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[33983]: GenBuffersARB (will be remapped) */
+   /* _mesa_function_pool[34025]: GenBuffersARB (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[34016]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[34058]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[34042]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[34084]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[34057]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[34099]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[34088]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[34130]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[34109]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[34151]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[34139]: IsRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[34181]: IsRenderbufferEXT (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[34179]: GenProgramsNV (will be remapped) */
+   /* _mesa_function_pool[34221]: GenProgramsNV (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[34216]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[34258]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[34240]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[34282]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[34265]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[34307]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[34286]: WindowPos2fMESA (will be remapped) */
+   /* _mesa_function_pool[34328]: WindowPos2fMESA (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
@@ -4931,636 +4935,637 @@ static const char _mesa_function_pool[] =
 
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   {  1629, AttachShader_remap_index },
-   { 10274, CreateProgram_remap_index },
-   { 23765, CreateShader_remap_index },
-   { 26289, DeleteProgram_remap_index },
-   { 19245, DeleteShader_remap_index },
-   { 24258, DetachShader_remap_index },
-   { 18534, GetAttachedShaders_remap_index },
-   {  5126, GetProgramInfoLog_remap_index },
-   {   444, GetProgramiv_remap_index },
-   {  6892, GetShaderInfoLog_remap_index },
-   { 32043, GetShaderiv_remap_index },
-   { 13807, IsProgram_remap_index },
-   { 12698, IsShader_remap_index },
-   { 10404, StencilFuncSeparate_remap_index },
-   {  4156, StencilMaskSeparate_remap_index },
-   {  7957, StencilOpSeparate_remap_index },
-   { 22999, UniformMatrix2x3fv_remap_index },
-   {  2998, UniformMatrix2x4fv_remap_index },
-   { 33859, UniformMatrix3x2fv_remap_index },
-   { 31360, UniformMatrix3x4fv_remap_index },
-   { 16726, UniformMatrix4x2fv_remap_index },
-   {  3417, UniformMatrix4x3fv_remap_index },
-   {  5332, ClampColor_remap_index },
-   { 18588, ClearBufferfi_remap_index },
-   { 18004, ClearBufferfv_remap_index },
-   { 30383, ClearBufferiv_remap_index },
-   { 14012, ClearBufferuiv_remap_index },
-   { 20582, GetStringi_remap_index },
-   {  2900, TexBuffer_remap_index },
-   {   977, FramebufferTexture_remap_index },
-   { 27325, GetBufferParameteri64v_remap_index },
-   { 10504, GetInteger64i_v_remap_index },
-   { 24079, VertexAttribDivisor_remap_index },
-   { 10292, LoadTransposeMatrixdARB_remap_index },
-   { 31772, LoadTransposeMatrixfARB_remap_index },
-   {  5971, MultTransposeMatrixdARB_remap_index },
-   { 24445, MultTransposeMatrixfARB_remap_index },
-   {   255, SampleCoverageARB_remap_index },
-   {  6155, CompressedTexImage1DARB_remap_index },
-   { 24973, CompressedTexImage2DARB_remap_index },
-   {  4219, CompressedTexImage3DARB_remap_index },
-   { 18876, CompressedTexSubImage1DARB_remap_index },
-   {  2141, CompressedTexSubImage2DARB_remap_index },
-   { 21004, CompressedTexSubImage3DARB_remap_index },
-   { 29489, GetCompressedTexImageARB_remap_index },
-   {  3983, DisableVertexAttribArrayARB_remap_index },
-   { 30925, EnableVertexAttribArrayARB_remap_index },
-   { 32847, GetProgramEnvParameterdvARB_remap_index },
-   { 24325, GetProgramEnvParameterfvARB_remap_index },
-   { 28354, GetProgramLocalParameterdvARB_remap_index },
-   {  8433, GetProgramLocalParameterfvARB_remap_index },
-   { 19052, GetProgramStringARB_remap_index },
-   { 28549, GetProgramivARB_remap_index },
-   { 21199, GetVertexAttribdvARB_remap_index },
-   { 16534, GetVertexAttribfvARB_remap_index },
-   { 10108, GetVertexAttribivARB_remap_index },
-   { 20045, ProgramEnvParameter4dARB_remap_index },
-   { 26039, ProgramEnvParameter4dvARB_remap_index },
-   { 17302, ProgramEnvParameter4fARB_remap_index },
-   {  9308, ProgramEnvParameter4fvARB_remap_index },
-   {  4182, ProgramLocalParameter4dARB_remap_index },
-   { 13517, ProgramLocalParameter4dvARB_remap_index },
-   { 30404, ProgramLocalParameter4fARB_remap_index },
-   { 26685, ProgramLocalParameter4fvARB_remap_index },
-   { 29243, ProgramStringARB_remap_index },
-   { 20313, VertexAttrib1dARB_remap_index },
-   { 16161, VertexAttrib1dvARB_remap_index },
-   {  4378, VertexAttrib1fARB_remap_index },
-   { 33940, VertexAttrib1fvARB_remap_index },
-   {  7483, VertexAttrib1sARB_remap_index },
-   {  2336, VertexAttrib1svARB_remap_index },
-   { 15592, VertexAttrib2dARB_remap_index },
-   { 18025, VertexAttrib2dvARB_remap_index },
-   {  1687, VertexAttrib2fARB_remap_index },
-   { 18138, VertexAttrib2fvARB_remap_index },
-   { 33540, VertexAttrib2sARB_remap_index },
-   { 32484, VertexAttrib2svARB_remap_index },
-   { 11682, VertexAttrib3dARB_remap_index },
-   {  8975, VertexAttrib3dvARB_remap_index },
-   {  1774, VertexAttrib3fARB_remap_index },
-   { 23316, VertexAttrib3fvARB_remap_index },
-   { 29090, VertexAttrib3sARB_remap_index },
-   { 20941, VertexAttrib3svARB_remap_index },
-   {  5152, VertexAttrib4NbvARB_remap_index },
-   { 18411, VertexAttrib4NivARB_remap_index },
-   { 23271, VertexAttrib4NsvARB_remap_index },
-   { 24277, VertexAttrib4NubARB_remap_index },
-   { 32730, VertexAttrib4NubvARB_remap_index },
-   { 19696, VertexAttrib4NuivARB_remap_index },
-   {  3290, VertexAttrib4NusvARB_remap_index },
-   { 11271, VertexAttrib4bvARB_remap_index },
-   { 27727, VertexAttrib4dARB_remap_index },
-   { 21998, VertexAttrib4dvARB_remap_index },
-   { 11836, VertexAttrib4fARB_remap_index },
-   { 12240, VertexAttrib4fvARB_remap_index },
-   { 10647, VertexAttrib4ivARB_remap_index },
-   { 17818, VertexAttrib4sARB_remap_index },
-   { 31958, VertexAttrib4svARB_remap_index },
-   { 17107, VertexAttrib4ubvARB_remap_index },
-   { 31249, VertexAttrib4uivARB_remap_index },
-   { 20752, VertexAttrib4usvARB_remap_index },
-   { 22814, VertexAttribPointerARB_remap_index },
-   { 33700, BindBufferARB_remap_index },
-   {  7190, BufferDataARB_remap_index },
-   {  1550, BufferSubDataARB_remap_index },
-   { 31535, DeleteBuffersARB_remap_index },
-   { 33983, GenBuffersARB_remap_index },
-   { 18181, GetBufferParameterivARB_remap_index },
-   { 17254, GetBufferPointervARB_remap_index },
-   {  1503, GetBufferSubDataARB_remap_index },
-   { 31197, IsBufferARB_remap_index },
-   { 27169, MapBufferARB_remap_index },
-   { 32173, UnmapBufferARB_remap_index },
-   {   351, BeginQueryARB_remap_index },
-   { 20408, DeleteQueriesARB_remap_index },
-   { 12559, EndQueryARB_remap_index },
-   { 29968, GenQueriesARB_remap_index },
-   {  2033, GetQueryObjectivARB_remap_index },
-   { 17862, GetQueryObjectuivARB_remap_index },
-   {  1831, GetQueryivARB_remap_index },
-   { 20659, IsQueryARB_remap_index },
-   {  8585, AttachObjectARB_remap_index },
-   { 19207, CompileShaderARB_remap_index },
-   {  3359, CreateProgramObjectARB_remap_index },
-   {  7135, CreateShaderObjectARB_remap_index },
-   { 14894, DeleteObjectARB_remap_index },
-   { 24764, DetachObjectARB_remap_index },
-   { 12304, GetActiveUniformARB_remap_index },
-   {  9783, GetAttachedObjectsARB_remap_index },
-   { 10090, GetHandleARB_remap_index },
-   { 33733, GetInfoLogARB_remap_index },
-   { 32801, GetObjectParameterfvARB_remap_index },
-   { 28228, GetObjectParameterivARB_remap_index },
-   { 29726, GetShaderSourceARB_remap_index },
-   { 28950, GetUniformLocationARB_remap_index },
-   { 24547, GetUniformfvARB_remap_index },
-   { 13092, GetUniformivARB_remap_index },
-   { 20797, LinkProgramARB_remap_index },
-   { 20855, ShaderSourceARB_remap_index },
-   {  7857, Uniform1fARB_remap_index },
-   { 30613, Uniform1fvARB_remap_index },
-   { 22762, Uniform1iARB_remap_index },
-   { 21652, Uniform1ivARB_remap_index },
-   {  2285, Uniform2fARB_remap_index },
-   { 14730, Uniform2fvARB_remap_index },
-   { 27056, Uniform2iARB_remap_index },
-   {  2405, Uniform2ivARB_remap_index },
-   { 19317, Uniform3fARB_remap_index },
-   {  9813, Uniform3fvARB_remap_index },
-   {  6746, Uniform3iARB_remap_index },
-   { 17360, Uniform3ivARB_remap_index },
-   { 19851, Uniform4fARB_remap_index },
-   { 24411, Uniform4fvARB_remap_index },
-   { 25673, Uniform4iARB_remap_index },
-   { 21165, Uniform4ivARB_remap_index },
-   {  8637, UniformMatrix2fvARB_remap_index },
+   {  1590, AttachShader_remap_index },
+   { 10243, CreateProgram_remap_index },
+   { 23919, CreateShader_remap_index },
+   { 26443, DeleteProgram_remap_index },
+   { 19399, DeleteShader_remap_index },
+   { 24412, DetachShader_remap_index },
+   { 18646, GetAttachedShaders_remap_index },
+   {  5053, GetProgramInfoLog_remap_index },
+   {   405, GetProgramiv_remap_index },
+   {  6861, GetShaderInfoLog_remap_index },
+   { 32113, GetShaderiv_remap_index },
+   { 13776, IsProgram_remap_index },
+   { 12667, IsShader_remap_index },
+   { 10373, StencilFuncSeparate_remap_index },
+   {  4031, StencilMaskSeparate_remap_index },
+   {  7926, StencilOpSeparate_remap_index },
+   { 23153, UniformMatrix2x3fv_remap_index },
+   {  2920, UniformMatrix2x4fv_remap_index },
+   { 33901, UniformMatrix3x2fv_remap_index },
+   { 31430, UniformMatrix3x4fv_remap_index },
+   { 16766, UniformMatrix4x2fv_remap_index },
+   {  3339, UniformMatrix4x3fv_remap_index },
+   {  5259, ClampColor_remap_index },
+   { 18700, ClearBufferfi_remap_index },
+   { 18116, ClearBufferfv_remap_index },
+   { 30453, ClearBufferiv_remap_index },
+   { 13981, ClearBufferuiv_remap_index },
+   { 20736, GetStringi_remap_index },
+   {  2861, TexBuffer_remap_index },
+   {   938, FramebufferTexture_remap_index },
+   { 27479, GetBufferParameteri64v_remap_index },
+   { 10473, GetInteger64i_v_remap_index },
+   { 24233, VertexAttribDivisor_remap_index },
+   { 10261, LoadTransposeMatrixdARB_remap_index },
+   { 31842, LoadTransposeMatrixfARB_remap_index },
+   {  5898, MultTransposeMatrixdARB_remap_index },
+   { 24599, MultTransposeMatrixfARB_remap_index },
+   {   216, SampleCoverageARB_remap_index },
+   {  6124, CompressedTexImage1DARB_remap_index },
+   { 25127, CompressedTexImage2DARB_remap_index },
+   {  4094, CompressedTexImage3DARB_remap_index },
+   { 18988, CompressedTexSubImage1DARB_remap_index },
+   {  2102, CompressedTexSubImage2DARB_remap_index },
+   { 21158, CompressedTexSubImage3DARB_remap_index },
+   { 29559, GetCompressedTexImageARB_remap_index },
+   {  3905, DisableVertexAttribArrayARB_remap_index },
+   { 30995, EnableVertexAttribArrayARB_remap_index },
+   { 32956, GetProgramEnvParameterdvARB_remap_index },
+   { 24479, GetProgramEnvParameterfvARB_remap_index },
+   { 28476, GetProgramLocalParameterdvARB_remap_index },
+   {  8402, GetProgramLocalParameterfvARB_remap_index },
+   { 19164, GetProgramStringARB_remap_index },
+   { 28671, GetProgramivARB_remap_index },
+   { 21353, GetVertexAttribdvARB_remap_index },
+   { 16574, GetVertexAttribfvARB_remap_index },
+   { 10077, GetVertexAttribivARB_remap_index },
+   { 20199, ProgramEnvParameter4dARB_remap_index },
+   { 26193, ProgramEnvParameter4dvARB_remap_index },
+   { 17414, ProgramEnvParameter4fARB_remap_index },
+   {  9277, ProgramEnvParameter4fvARB_remap_index },
+   {  4057, ProgramLocalParameter4dARB_remap_index },
+   { 13486, ProgramLocalParameter4dvARB_remap_index },
+   { 30474, ProgramLocalParameter4fARB_remap_index },
+   { 26839, ProgramLocalParameter4fvARB_remap_index },
+   { 29313, ProgramStringARB_remap_index },
+   { 20467, VertexAttrib1dARB_remap_index },
+   { 16201, VertexAttrib1dvARB_remap_index },
+   {  4253, VertexAttrib1fARB_remap_index },
+   { 33982, VertexAttrib1fvARB_remap_index },
+   {  7452, VertexAttrib1sARB_remap_index },
+   {  2297, VertexAttrib1svARB_remap_index },
+   { 15632, VertexAttrib2dARB_remap_index },
+   { 18137, VertexAttrib2dvARB_remap_index },
+   {  1648, VertexAttrib2fARB_remap_index },
+   { 18250, VertexAttrib2fvARB_remap_index },
+   { 33582, VertexAttrib2sARB_remap_index },
+   { 32593, VertexAttrib2svARB_remap_index },
+   { 11651, VertexAttrib3dARB_remap_index },
+   {  8944, VertexAttrib3dvARB_remap_index },
+   {  1735, VertexAttrib3fARB_remap_index },
+   { 23470, VertexAttrib3fvARB_remap_index },
+   { 29160, VertexAttrib3sARB_remap_index },
+   { 21095, VertexAttrib3svARB_remap_index },
+   {  5079, VertexAttrib4NbvARB_remap_index },
+   { 18523, VertexAttrib4NivARB_remap_index },
+   { 23425, VertexAttrib4NsvARB_remap_index },
+   { 24431, VertexAttrib4NubARB_remap_index },
+   { 32839, VertexAttrib4NubvARB_remap_index },
+   { 19850, VertexAttrib4NuivARB_remap_index },
+   {  3212, VertexAttrib4NusvARB_remap_index },
+   { 11240, VertexAttrib4bvARB_remap_index },
+   { 27849, VertexAttrib4dARB_remap_index },
+   { 22152, VertexAttrib4dvARB_remap_index },
+   { 11805, VertexAttrib4fARB_remap_index },
+   { 12209, VertexAttrib4fvARB_remap_index },
+   { 10616, VertexAttrib4ivARB_remap_index },
+   { 17930, VertexAttrib4sARB_remap_index },
+   { 32028, VertexAttrib4svARB_remap_index },
+   { 17219, VertexAttrib4ubvARB_remap_index },
+   { 31319, VertexAttrib4uivARB_remap_index },
+   { 20906, VertexAttrib4usvARB_remap_index },
+   { 22968, VertexAttribPointerARB_remap_index },
+   { 33742, BindBufferARB_remap_index },
+   {  7159, BufferDataARB_remap_index },
+   {  1511, BufferSubDataARB_remap_index },
+   { 31605, DeleteBuffersARB_remap_index },
+   { 34025, GenBuffersARB_remap_index },
+   { 18293, GetBufferParameterivARB_remap_index },
+   { 17366, GetBufferPointervARB_remap_index },
+   {  1464, GetBufferSubDataARB_remap_index },
+   { 31267, IsBufferARB_remap_index },
+   { 27323, MapBufferARB_remap_index },
+   { 32243, UnmapBufferARB_remap_index },
+   {   312, BeginQueryARB_remap_index },
+   { 20562, DeleteQueriesARB_remap_index },
+   { 12528, EndQueryARB_remap_index },
+   { 30038, GenQueriesARB_remap_index },
+   {  1994, GetQueryObjectivARB_remap_index },
+   { 17974, GetQueryObjectuivARB_remap_index },
+   {  1792, GetQueryivARB_remap_index },
+   { 20813, IsQueryARB_remap_index },
+   {  8554, AttachObjectARB_remap_index },
+   { 19361, CompileShaderARB_remap_index },
+   {  3281, CreateProgramObjectARB_remap_index },
+   {  7104, CreateShaderObjectARB_remap_index },
+   { 14934, DeleteObjectARB_remap_index },
+   { 24918, DetachObjectARB_remap_index },
+   { 12273, GetActiveUniformARB_remap_index },
+   {  9752, GetAttachedObjectsARB_remap_index },
+   { 10059, GetHandleARB_remap_index },
+   { 33775, GetInfoLogARB_remap_index },
+   { 32910, GetObjectParameterfvARB_remap_index },
+   { 28350, GetObjectParameterivARB_remap_index },
+   { 29796, GetShaderSourceARB_remap_index },
+   { 29020, GetUniformLocationARB_remap_index },
+   { 24701, GetUniformfvARB_remap_index },
+   { 13061, GetUniformivARB_remap_index },
+   { 20951, LinkProgramARB_remap_index },
+   { 21009, ShaderSourceARB_remap_index },
+   {  7826, Uniform1fARB_remap_index },
+   { 30683, Uniform1fvARB_remap_index },
+   { 22916, Uniform1iARB_remap_index },
+   { 21806, Uniform1ivARB_remap_index },
+   {  2246, Uniform2fARB_remap_index },
+   { 14770, Uniform2fvARB_remap_index },
+   { 27210, Uniform2iARB_remap_index },
+   {  2366, Uniform2ivARB_remap_index },
+   { 19471, Uniform3fARB_remap_index },
+   {  9782, Uniform3fvARB_remap_index },
+   {  6715, Uniform3iARB_remap_index },
+   { 17472, Uniform3ivARB_remap_index },
+   { 20005, Uniform4fARB_remap_index },
+   { 24565, Uniform4fvARB_remap_index },
+   { 25827, Uniform4iARB_remap_index },
+   { 21319, Uniform4ivARB_remap_index },
+   {  8606, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
-   {  2802, UniformMatrix4fvARB_remap_index },
-   { 26151, UseProgramObjectARB_remap_index },
-   { 15280, ValidateProgramARB_remap_index },
-   { 22041, BindAttribLocationARB_remap_index },
-   {  5197, GetActiveAttribARB_remap_index },
-   { 17041, GetAttribLocationARB_remap_index },
-   { 30331, DrawBuffersARB_remap_index },
-   { 30164, ClampColorARB_remap_index },
-   { 18456, DrawArraysInstancedARB_remap_index },
-   {  6807, DrawElementsInstancedARB_remap_index },
-   { 13622, RenderbufferStorageMultisample_remap_index },
-   { 14093, FramebufferTextureARB_remap_index },
-   { 26587, FramebufferTextureFaceARB_remap_index },
-   { 24913, ProgramParameteriARB_remap_index },
-   {  6327, VertexAttribDivisorARB_remap_index },
-   { 19899, FlushMappedBufferRange_remap_index },
-   { 28665, MapBufferRange_remap_index },
-   { 28572, TexBufferARB_remap_index },
-   { 16864, BindVertexArray_remap_index },
-   { 15103, GenVertexArrays_remap_index },
-   { 31127, CopyBufferSubData_remap_index },
-   { 32062, ClientWaitSync_remap_index },
-   {  2721, DeleteSync_remap_index },
-   {  7524, FenceSync_remap_index },
-   { 15651, GetInteger64v_remap_index },
-   { 23378, GetSynciv_remap_index },
-   { 30270, IsSync_remap_index },
-   {  9731, WaitSync_remap_index },
-   {  3951, DrawElementsBaseVertex_remap_index },
-   { 31439, DrawRangeElementsBaseVertex_remap_index },
-   { 27200, MultiDrawElementsBaseVertex_remap_index },
-   { 33006, BlendEquationSeparateiARB_remap_index },
-   { 18274, BlendEquationiARB_remap_index },
-   { 13031, BlendFuncSeparateiARB_remap_index },
-   { 10156, BlendFunciARB_remap_index },
-   {  8499, BindSampler_remap_index },
-   {  4357, DeleteSamplers_remap_index },
-   { 20272, GenSamplers_remap_index },
-   { 30202, GetSamplerParameterIiv_remap_index },
-   { 19793, GetSamplerParameterIuiv_remap_index },
-   {  5046, GetSamplerParameterfv_remap_index },
-   { 26308, GetSamplerParameteriv_remap_index },
-   { 14648, IsSampler_remap_index },
-   { 16817, SamplerParameterIiv_remap_index },
-   { 31478, SamplerParameterIuiv_remap_index },
-   { 23051, SamplerParameterf_remap_index },
-   { 16973, SamplerParameterfv_remap_index },
-   { 23026, SamplerParameteri_remap_index },
-   { 18650, SamplerParameteriv_remap_index },
-   {  5393, BindTransformFeedback_remap_index },
-   {  3386, DeleteTransformFeedbacks_remap_index },
-   {  6779, DrawTransformFeedback_remap_index },
-   {  9950, GenTransformFeedbacks_remap_index },
-   { 29133, IsTransformFeedback_remap_index },
-   { 26780, PauseTransformFeedback_remap_index },
-   {  5856, ResumeTransformFeedback_remap_index },
-   { 22361, ClearDepthf_remap_index },
-   {  7083, DepthRangef_remap_index },
-   { 14915, GetShaderPrecisionFormat_remap_index },
-   { 10344, ReleaseShaderCompiler_remap_index },
-   { 11314, ShaderBinary_remap_index },
-   {  1004, GetGraphicsResetStatusARB_remap_index },
-   { 25478, GetnColorTableARB_remap_index },
-   {  8268, GetnCompressedTexImageARB_remap_index },
-   {  4090, GetnConvolutionFilterARB_remap_index },
-   { 16204, GetnHistogramARB_remap_index },
-   { 24237, GetnMapdvARB_remap_index },
-   { 22793, GetnMapfvARB_remap_index },
-   {  2264, GetnMapivARB_remap_index },
-   { 17622, GetnMinmaxARB_remap_index },
-   {  4671, GetnPixelMapfvARB_remap_index },
-   { 19670, GetnPixelMapuivARB_remap_index },
-   {  3111, GetnPixelMapusvARB_remap_index },
-   {  1383, GetnPolygonStippleARB_remap_index },
-   { 21826, GetnSeparableFilterARB_remap_index },
-   { 33582, GetnTexImageARB_remap_index },
-   { 19079, GetnUniformdvARB_remap_index },
-   {  4743, GetnUniformfvARB_remap_index },
-   { 10199, GetnUniformivARB_remap_index },
-   { 23227, GetnUniformuivARB_remap_index },
-   {  3025, ReadnPixelsARB_remap_index },
-   {  5724, PolygonOffsetEXT_remap_index },
-   { 24000, GetPixelTexGenParameterfvSGIS_remap_index },
-   {  4621, GetPixelTexGenParameterivSGIS_remap_index },
-   { 23733, PixelTexGenParameterfSGIS_remap_index },
-   {   663, PixelTexGenParameterfvSGIS_remap_index },
-   { 13130, PixelTexGenParameteriSGIS_remap_index },
-   { 14235, PixelTexGenParameterivSGIS_remap_index },
-   { 18775, SampleMaskSGIS_remap_index },
-   { 20599, SamplePatternSGIS_remap_index },
-   { 27129, ColorPointerEXT_remap_index },
-   { 18068, EdgeFlagPointerEXT_remap_index },
-   {  6400, IndexPointerEXT_remap_index },
-   {  6480, NormalPointerEXT_remap_index },
-   { 16272, TexCoordPointerEXT_remap_index },
-   {  7313, VertexPointerEXT_remap_index },
-   {  3753, PointParameterfEXT_remap_index },
-   {  8164, PointParameterfvEXT_remap_index },
-   { 32899, LockArraysEXT_remap_index },
-   { 15344, UnlockArraysEXT_remap_index },
-   {  1291, SecondaryColor3bEXT_remap_index },
-   {  8357, SecondaryColor3bvEXT_remap_index },
-   { 10824, SecondaryColor3dEXT_remap_index },
-   { 26357, SecondaryColor3dvEXT_remap_index },
-   { 28999, SecondaryColor3fEXT_remap_index },
-   { 18812, SecondaryColor3fvEXT_remap_index },
-   {   509, SecondaryColor3iEXT_remap_index },
-   { 16582, SecondaryColor3ivEXT_remap_index },
-   { 10432, SecondaryColor3sEXT_remap_index },
-   { 31726, SecondaryColor3svEXT_remap_index },
-   { 28064, SecondaryColor3ubEXT_remap_index },
-   { 21932, SecondaryColor3ubvEXT_remap_index },
-   { 13372, SecondaryColor3uiEXT_remap_index },
-   { 23620, SecondaryColor3uivEXT_remap_index },
-   { 26637, SecondaryColor3usEXT_remap_index },
-   { 13445, SecondaryColor3usvEXT_remap_index },
-   { 12183, SecondaryColorPointerEXT_remap_index },
-   { 26451, MultiDrawArraysEXT_remap_index },
-   { 21587, MultiDrawElementsEXT_remap_index },
-   { 21782, FogCoordPointerEXT_remap_index },
-   {  4794, FogCoorddEXT_remap_index },
-   { 32300, FogCoorddvEXT_remap_index },
-   {  4911, FogCoordfEXT_remap_index },
-   { 27987, FogCoordfvEXT_remap_index },
-   { 12283, PixelTexGenSGIX_remap_index },
-   { 28592, BlendFuncSeparateEXT_remap_index },
-   {  7225, FlushVertexArrayRangeNV_remap_index },
-   {  5673, VertexArrayRangeNV_remap_index },
-   { 29064, CombinerInputNV_remap_index },
-   {  2207, CombinerOutputNV_remap_index },
-   { 31879, CombinerParameterfNV_remap_index },
-   {  5547, CombinerParameterfvNV_remap_index },
-   { 23076, CombinerParameteriNV_remap_index },
-   { 33382, CombinerParameterivNV_remap_index },
-   {  7601, FinalCombinerInputNV_remap_index },
-   {  1648, GetCombinerInputParameterfvNV_remap_index },
-   { 33219, GetCombinerInputParameterivNV_remap_index },
-   {   216, GetCombinerOutputParameterfvNV_remap_index },
-   { 14196, GetCombinerOutputParameterivNV_remap_index },
-   {  6987, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 25545, GetFinalCombinerInputParameterivNV_remap_index },
-   { 13009, ResizeBuffersMESA_remap_index },
-   { 11509, WindowPos2dMESA_remap_index },
-   {  1084, WindowPos2dvMESA_remap_index },
-   { 34286, WindowPos2fMESA_remap_index },
-   {  8302, WindowPos2fvMESA_remap_index },
-   { 18722, WindowPos2iMESA_remap_index },
-   { 21072, WindowPos2ivMESA_remap_index },
-   { 21686, WindowPos2sMESA_remap_index },
-   {  6069, WindowPos2svMESA_remap_index },
-   {  8093, WindowPos3dMESA_remap_index },
-   { 14443, WindowPos3dvMESA_remap_index },
-   {   555, WindowPos3fMESA_remap_index },
-   { 15405, WindowPos3fvMESA_remap_index },
-   { 24806, WindowPos3iMESA_remap_index },
-   { 31072, WindowPos3ivMESA_remap_index },
-   { 19462, WindowPos3sMESA_remap_index },
-   { 32556, WindowPos3svMESA_remap_index },
-   { 11460, WindowPos4dMESA_remap_index },
-   { 17498, WindowPos4dvMESA_remap_index },
-   { 14402, WindowPos4fMESA_remap_index },
-   { 31633, WindowPos4fvMESA_remap_index },
-   { 31225, WindowPos4iMESA_remap_index },
-   { 12812, WindowPos4ivMESA_remap_index },
-   { 19646, WindowPos4sMESA_remap_index },
-   {  3337, WindowPos4svMESA_remap_index },
-   { 27695, MultiModeDrawArraysIBM_remap_index },
-   { 29839, MultiModeDrawElementsIBM_remap_index },
-   { 12587, DeleteFencesNV_remap_index },
-   { 28911, FinishFenceNV_remap_index },
-   {  3875, GenFencesNV_remap_index },
-   { 17478, GetFenceivNV_remap_index },
-   {  8570, IsFenceNV_remap_index },
-   { 14123, SetFenceNV_remap_index },
-   {  4434, TestFenceNV_remap_index },
-   { 32527, AreProgramsResidentNV_remap_index },
-   { 31921, BindProgramNV_remap_index },
-   { 26720, DeleteProgramsNV_remap_index },
-   { 22150, ExecuteProgramNV_remap_index },
-   { 34179, GenProgramsNV_remap_index },
-   { 24105, GetProgramParameterdvNV_remap_index },
-   { 10886, GetProgramParameterfvNV_remap_index },
-   { 27103, GetProgramStringNV_remap_index },
-   { 25183, GetProgramivNV_remap_index },
-   { 24360, GetTrackMatrixivNV_remap_index },
-   { 26897, GetVertexAttribPointervNV_remap_index },
-   { 10527, GetVertexAttribdvNV_remap_index },
-   {  9626, GetVertexAttribfvNV_remap_index },
-   { 19025, GetVertexAttribivNV_remap_index },
-   { 19929, IsProgramNV_remap_index },
-   {  9709, LoadProgramNV_remap_index },
-   { 28688, ProgramParameters4dvNV_remap_index },
-   { 25113, ProgramParameters4fvNV_remap_index },
-   { 21376, RequestResidentProgramsNV_remap_index },
-   { 31417, TrackMatrixNV_remap_index },
-   { 33196, VertexAttrib1dNV_remap_index },
-   { 14034, VertexAttrib1dvNV_remap_index },
-   { 29345, VertexAttrib1fNV_remap_index },
-   {  2527, VertexAttrib1fvNV_remap_index },
-   { 31690, VertexAttrib1sNV_remap_index },
-   { 15478, VertexAttrib1svNV_remap_index },
-   {  5102, VertexAttrib2dNV_remap_index },
-   { 13927, VertexAttrib2dvNV_remap_index },
-   { 20831, VertexAttrib2fNV_remap_index },
-   { 13493, VertexAttrib2fvNV_remap_index },
-   {  6281, VertexAttrib2sNV_remap_index },
-   { 19516, VertexAttrib2svNV_remap_index },
-   { 11657, VertexAttrib3dNV_remap_index },
-   { 32777, VertexAttrib3dvNV_remap_index },
-   { 10698, VertexAttrib3fNV_remap_index },
-   { 25505, VertexAttrib3fvNV_remap_index },
-   { 22869, VertexAttrib3sNV_remap_index },
-   { 24387, VertexAttrib3svNV_remap_index },
-   { 29813, VertexAttrib4dNV_remap_index },
-   { 34216, VertexAttrib4dvNV_remap_index },
-   {  5487, VertexAttrib4fNV_remap_index },
-   {  9759, VertexAttrib4fvNV_remap_index },
-   { 27579, VertexAttrib4sNV_remap_index },
-   {  1461, VertexAttrib4svNV_remap_index },
-   {  5260, VertexAttrib4ubNV_remap_index },
-   {   817, VertexAttrib4ubvNV_remap_index },
-   { 22330, VertexAttribPointerNV_remap_index },
-   {  2379, VertexAttribs1dvNV_remap_index },
-   { 26985, VertexAttribs1fvNV_remap_index },
-   { 34016, VertexAttribs1svNV_remap_index },
-   { 10723, VertexAttribs2dvNV_remap_index },
-   { 26112, VertexAttribs2fvNV_remap_index },
-   { 18094, VertexAttribs2svNV_remap_index },
-   {  5575, VertexAttribs3dvNV_remap_index },
-   {  2238, VertexAttribs3fvNV_remap_index },
-   { 30820, VertexAttribs3svNV_remap_index },
-   { 27669, VertexAttribs4dvNV_remap_index },
-   {  5647, VertexAttribs4fvNV_remap_index },
-   { 33803, VertexAttribs4svNV_remap_index },
-   { 30568, VertexAttribs4ubvNV_remap_index },
-   { 27771, GetTexBumpParameterfvATI_remap_index },
-   { 34057, GetTexBumpParameterivATI_remap_index },
-   { 19160, TexBumpParameterfvATI_remap_index },
-   { 21247, TexBumpParameterivATI_remap_index },
-   { 16024, AlphaFragmentOp1ATI_remap_index },
-   { 26403, AlphaFragmentOp2ATI_remap_index },
-   { 25421, AlphaFragmentOp3ATI_remap_index },
-   { 30747, BeginFragmentShaderATI_remap_index },
-   { 32120, BindFragmentShaderATI_remap_index },
-   { 24516, ColorFragmentOp1ATI_remap_index },
-   {  4549, ColorFragmentOp2ATI_remap_index },
-   { 32422, ColorFragmentOp3ATI_remap_index },
-   {  5813, DeleteFragmentShaderATI_remap_index },
-   { 34240, EndFragmentShaderATI_remap_index },
-   { 33410, GenFragmentShadersATI_remap_index },
-   { 26266, PassTexCoordATI_remap_index },
-   {  7293, SampleMapATI_remap_index },
-   { 27882, SetFragmentShaderConstantATI_remap_index },
-   {   402, PointParameteriNV_remap_index },
-   { 14604, PointParameterivNV_remap_index },
-   { 29652, ActiveStencilFaceEXT_remap_index },
-   { 28328, BindVertexArrayAPPLE_remap_index },
-   {  2849, DeleteVertexArraysAPPLE_remap_index },
-   { 18561, GenVertexArraysAPPLE_remap_index },
-   { 24170, IsVertexArrayAPPLE_remap_index },
-   {   858, GetProgramNamedParameterdvNV_remap_index },
-   {  3716, GetProgramNamedParameterfvNV_remap_index },
-   { 27802, ProgramNamedParameter4dNV_remap_index },
-   { 14978, ProgramNamedParameter4dvNV_remap_index },
-   {  9242, ProgramNamedParameter4fNV_remap_index },
-   { 12148, ProgramNamedParameter4fvNV_remap_index },
-   { 17409, PrimitiveRestartIndexNV_remap_index },
-   { 31610, PrimitiveRestartNV_remap_index },
-   { 25092, DepthBoundsEXT_remap_index },
-   {  1183, BlendEquationSeparateEXT_remap_index },
-   { 15179, BindFramebufferEXT_remap_index },
-   { 26496, BindRenderbufferEXT_remap_index },
-   { 10006, CheckFramebufferStatusEXT_remap_index },
-   { 23421, DeleteFramebuffersEXT_remap_index },
-   { 32679, DeleteRenderbuffersEXT_remap_index },
-   { 13951, FramebufferRenderbufferEXT_remap_index },
-   { 14140, FramebufferTexture1DEXT_remap_index },
-   { 11942, FramebufferTexture2DEXT_remap_index },
-   { 11562, FramebufferTexture3DEXT_remap_index },
-   { 24036, GenFramebuffersEXT_remap_index },
-   { 17959, GenRenderbuffersEXT_remap_index },
-   {  7029, GenerateMipmapEXT_remap_index },
-   { 22423, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 33316, GetRenderbufferParameterivEXT_remap_index },
-   { 21127, IsFramebufferEXT_remap_index },
-   { 34139, IsRenderbufferEXT_remap_index },
-   {  8517, RenderbufferStorageEXT_remap_index },
-   {   734, BlitFramebufferEXT_remap_index },
-   { 14764, BufferParameteriAPPLE_remap_index },
-   { 19961, FlushMappedBufferRangeAPPLE_remap_index },
-   {  1906, BindFragDataLocationEXT_remap_index },
-   { 25205, GetFragDataLocationEXT_remap_index },
-   { 11001, GetUniformuivEXT_remap_index },
-   { 33490, GetVertexAttribIivEXT_remap_index },
-   { 28859, GetVertexAttribIuivEXT_remap_index },
-   { 12420, Uniform1uiEXT_remap_index },
-   { 28773, Uniform1uivEXT_remap_index },
-   { 22965, Uniform2uiEXT_remap_index },
-   {  4513, Uniform2uivEXT_remap_index },
-   { 30092, Uniform3uiEXT_remap_index },
-   { 15125, Uniform3uivEXT_remap_index },
-   {  3640, Uniform4uiEXT_remap_index },
-   {  9018, Uniform4uivEXT_remap_index },
-   { 18940, VertexAttribI1iEXT_remap_index },
-   {  5287, VertexAttribI1ivEXT_remap_index },
-   {  2628, VertexAttribI1uiEXT_remap_index },
-   { 13221, VertexAttribI1uivEXT_remap_index },
+   {  2763, UniformMatrix4fvARB_remap_index },
+   { 26305, UseProgramObjectARB_remap_index },
+   { 15320, ValidateProgramARB_remap_index },
+   { 22195, BindAttribLocationARB_remap_index },
+   {  5124, GetActiveAttribARB_remap_index },
+   { 17086, GetAttribLocationARB_remap_index },
+   { 30401, DrawBuffersARB_remap_index },
+   { 30234, ClampColorARB_remap_index },
+   { 18568, DrawArraysInstancedARB_remap_index },
+   {  6776, DrawElementsInstancedARB_remap_index },
+   { 13591, RenderbufferStorageMultisample_remap_index },
+   { 14062, FramebufferTextureARB_remap_index },
+   { 26741, FramebufferTextureFaceARB_remap_index },
+   { 25067, ProgramParameteriARB_remap_index },
+   {  6296, VertexAttribDivisorARB_remap_index },
+   { 20053, FlushMappedBufferRange_remap_index },
+   { 28787, MapBufferRange_remap_index },
+   { 28694, TexBufferARB_remap_index },
+   { 16904, BindVertexArray_remap_index },
+   { 15143, GenVertexArrays_remap_index },
+   { 31197, CopyBufferSubData_remap_index },
+   { 32132, ClientWaitSync_remap_index },
+   {  2682, DeleteSync_remap_index },
+   {  7493, FenceSync_remap_index },
+   { 15691, GetInteger64v_remap_index },
+   { 23532, GetSynciv_remap_index },
+   { 30340, IsSync_remap_index },
+   {  9700, WaitSync_remap_index },
+   {  3873, DrawElementsBaseVertex_remap_index },
+   { 19216, DrawElementsInstancedBaseVertex_remap_index },
+   { 31509, DrawRangeElementsBaseVertex_remap_index },
+   { 27354, MultiDrawElementsBaseVertex_remap_index },
+   { 17152, BlendEquationSeparateiARB_remap_index },
+   { 18386, BlendEquationiARB_remap_index },
+   { 13000, BlendFuncSeparateiARB_remap_index },
+   { 10125, BlendFunciARB_remap_index },
+   {  8468, BindSampler_remap_index },
+   {  4232, DeleteSamplers_remap_index },
+   { 20426, GenSamplers_remap_index },
+   { 30272, GetSamplerParameterIiv_remap_index },
+   { 19947, GetSamplerParameterIuiv_remap_index },
+   {  4973, GetSamplerParameterfv_remap_index },
+   { 26462, GetSamplerParameteriv_remap_index },
+   { 14688, IsSampler_remap_index },
+   { 16857, SamplerParameterIiv_remap_index },
+   { 31548, SamplerParameterIuiv_remap_index },
+   { 23205, SamplerParameterf_remap_index },
+   { 17013, SamplerParameterfv_remap_index },
+   { 23180, SamplerParameteri_remap_index },
+   { 18762, SamplerParameteriv_remap_index },
+   {  5320, BindTransformFeedback_remap_index },
+   {  3308, DeleteTransformFeedbacks_remap_index },
+   {  6748, DrawTransformFeedback_remap_index },
+   {  9919, GenTransformFeedbacks_remap_index },
+   { 29203, IsTransformFeedback_remap_index },
+   { 26934, PauseTransformFeedback_remap_index },
+   {  5783, ResumeTransformFeedback_remap_index },
+   { 22515, ClearDepthf_remap_index },
+   {  7052, DepthRangef_remap_index },
+   { 14955, GetShaderPrecisionFormat_remap_index },
+   { 10313, ReleaseShaderCompiler_remap_index },
+   { 11283, ShaderBinary_remap_index },
+   {   965, GetGraphicsResetStatusARB_remap_index },
+   { 25632, GetnColorTableARB_remap_index },
+   {  8237, GetnCompressedTexImageARB_remap_index },
+   {  3965, GetnConvolutionFilterARB_remap_index },
+   { 16244, GetnHistogramARB_remap_index },
+   { 24391, GetnMapdvARB_remap_index },
+   { 22947, GetnMapfvARB_remap_index },
+   {  2225, GetnMapivARB_remap_index },
+   { 17734, GetnMinmaxARB_remap_index },
+   {  4598, GetnPixelMapfvARB_remap_index },
+   { 19824, GetnPixelMapuivARB_remap_index },
+   {  3033, GetnPixelMapusvARB_remap_index },
+   {  1344, GetnPolygonStippleARB_remap_index },
+   { 21980, GetnSeparableFilterARB_remap_index },
+   { 33624, GetnTexImageARB_remap_index },
+   { 19191, GetnUniformdvARB_remap_index },
+   {  4670, GetnUniformfvARB_remap_index },
+   { 10168, GetnUniformivARB_remap_index },
+   { 23381, GetnUniformuivARB_remap_index },
+   {  2947, ReadnPixelsARB_remap_index },
+   {  5651, PolygonOffsetEXT_remap_index },
+   { 24154, GetPixelTexGenParameterfvSGIS_remap_index },
+   {  4548, GetPixelTexGenParameterivSGIS_remap_index },
+   { 23887, PixelTexGenParameterfSGIS_remap_index },
+   {   624, PixelTexGenParameterfvSGIS_remap_index },
+   { 13099, PixelTexGenParameteriSGIS_remap_index },
+   { 14236, PixelTexGenParameterivSGIS_remap_index },
+   { 18887, SampleMaskSGIS_remap_index },
+   { 20753, SamplePatternSGIS_remap_index },
+   { 27283, ColorPointerEXT_remap_index },
+   { 18180, EdgeFlagPointerEXT_remap_index },
+   {  6369, IndexPointerEXT_remap_index },
+   {  6449, NormalPointerEXT_remap_index },
+   { 16312, TexCoordPointerEXT_remap_index },
+   {  7282, VertexPointerEXT_remap_index },
+   {  3675, PointParameterfEXT_remap_index },
+   {  8133, PointParameterfvEXT_remap_index },
+   { 33008, LockArraysEXT_remap_index },
+   { 15384, UnlockArraysEXT_remap_index },
+   {  1252, SecondaryColor3bEXT_remap_index },
+   {  8326, SecondaryColor3bvEXT_remap_index },
+   { 10793, SecondaryColor3dEXT_remap_index },
+   { 26511, SecondaryColor3dvEXT_remap_index },
+   { 29069, SecondaryColor3fEXT_remap_index },
+   { 18924, SecondaryColor3fvEXT_remap_index },
+   {   470, SecondaryColor3iEXT_remap_index },
+   { 16622, SecondaryColor3ivEXT_remap_index },
+   { 10401, SecondaryColor3sEXT_remap_index },
+   { 31796, SecondaryColor3svEXT_remap_index },
+   { 28186, SecondaryColor3ubEXT_remap_index },
+   { 22086, SecondaryColor3ubvEXT_remap_index },
+   { 13341, SecondaryColor3uiEXT_remap_index },
+   { 23774, SecondaryColor3uivEXT_remap_index },
+   { 26791, SecondaryColor3usEXT_remap_index },
+   { 13414, SecondaryColor3usvEXT_remap_index },
+   { 12152, SecondaryColorPointerEXT_remap_index },
+   { 26605, MultiDrawArraysEXT_remap_index },
+   { 21741, MultiDrawElementsEXT_remap_index },
+   { 21936, FogCoordPointerEXT_remap_index },
+   {  4721, FogCoorddEXT_remap_index },
+   { 32409, FogCoorddvEXT_remap_index },
+   {  4838, FogCoordfEXT_remap_index },
+   { 28109, FogCoordfvEXT_remap_index },
+   { 12252, PixelTexGenSGIX_remap_index },
+   { 28714, BlendFuncSeparateEXT_remap_index },
+   {  7194, FlushVertexArrayRangeNV_remap_index },
+   {  5600, VertexArrayRangeNV_remap_index },
+   { 29134, CombinerInputNV_remap_index },
+   {  2168, CombinerOutputNV_remap_index },
+   { 31949, CombinerParameterfNV_remap_index },
+   {  5474, CombinerParameterfvNV_remap_index },
+   { 23230, CombinerParameteriNV_remap_index },
+   { 33424, CombinerParameterivNV_remap_index },
+   {  7570, FinalCombinerInputNV_remap_index },
+   {  1609, GetCombinerInputParameterfvNV_remap_index },
+   { 33261, GetCombinerInputParameterivNV_remap_index },
+   { 14337, GetCombinerOutputParameterfvNV_remap_index },
+   { 14165, GetCombinerOutputParameterivNV_remap_index },
+   {  6956, GetFinalCombinerInputParameterfvNV_remap_index },
+   { 25699, GetFinalCombinerInputParameterivNV_remap_index },
+   { 12978, ResizeBuffersMESA_remap_index },
+   { 11478, WindowPos2dMESA_remap_index },
+   {  1045, WindowPos2dvMESA_remap_index },
+   { 34328, WindowPos2fMESA_remap_index },
+   {  8271, WindowPos2fvMESA_remap_index },
+   { 18834, WindowPos2iMESA_remap_index },
+   { 21226, WindowPos2ivMESA_remap_index },
+   { 21840, WindowPos2sMESA_remap_index },
+   {  6038, WindowPos2svMESA_remap_index },
+   {  8062, WindowPos3dMESA_remap_index },
+   { 14483, WindowPos3dvMESA_remap_index },
+   {   516, WindowPos3fMESA_remap_index },
+   { 15445, WindowPos3fvMESA_remap_index },
+   { 24960, WindowPos3iMESA_remap_index },
+   { 31142, WindowPos3ivMESA_remap_index },
+   { 19616, WindowPos3sMESA_remap_index },
+   { 32665, WindowPos3svMESA_remap_index },
+   { 11429, WindowPos4dMESA_remap_index },
+   { 17610, WindowPos4dvMESA_remap_index },
+   { 14442, WindowPos4fMESA_remap_index },
+   { 31703, WindowPos4fvMESA_remap_index },
+   { 31295, WindowPos4iMESA_remap_index },
+   { 12781, WindowPos4ivMESA_remap_index },
+   { 19800, WindowPos4sMESA_remap_index },
+   {  3259, WindowPos4svMESA_remap_index },
+   { 14204, MultiModeDrawArraysIBM_remap_index },
+   { 29909, MultiModeDrawElementsIBM_remap_index },
+   { 12556, DeleteFencesNV_remap_index },
+   { 28981, FinishFenceNV_remap_index },
+   {  3797, GenFencesNV_remap_index },
+   { 17590, GetFenceivNV_remap_index },
+   {  8539, IsFenceNV_remap_index },
+   { 14092, SetFenceNV_remap_index },
+   {  4309, TestFenceNV_remap_index },
+   { 32636, AreProgramsResidentNV_remap_index },
+   { 31991, BindProgramNV_remap_index },
+   { 26874, DeleteProgramsNV_remap_index },
+   { 22304, ExecuteProgramNV_remap_index },
+   { 34221, GenProgramsNV_remap_index },
+   { 24259, GetProgramParameterdvNV_remap_index },
+   { 10855, GetProgramParameterfvNV_remap_index },
+   { 27257, GetProgramStringNV_remap_index },
+   { 25337, GetProgramivNV_remap_index },
+   { 24514, GetTrackMatrixivNV_remap_index },
+   { 27051, GetVertexAttribPointervNV_remap_index },
+   { 10496, GetVertexAttribdvNV_remap_index },
+   {  9595, GetVertexAttribfvNV_remap_index },
+   { 19137, GetVertexAttribivNV_remap_index },
+   { 20083, IsProgramNV_remap_index },
+   {  9678, LoadProgramNV_remap_index },
+   { 28810, ProgramParameters4dvNV_remap_index },
+   { 25267, ProgramParameters4fvNV_remap_index },
+   { 21530, RequestResidentProgramsNV_remap_index },
+   { 31487, TrackMatrixNV_remap_index },
+   { 33238, VertexAttrib1dNV_remap_index },
+   { 14003, VertexAttrib1dvNV_remap_index },
+   { 29415, VertexAttrib1fNV_remap_index },
+   {  2488, VertexAttrib1fvNV_remap_index },
+   { 31760, VertexAttrib1sNV_remap_index },
+   { 15518, VertexAttrib1svNV_remap_index },
+   {  5029, VertexAttrib2dNV_remap_index },
+   { 13896, VertexAttrib2dvNV_remap_index },
+   { 20985, VertexAttrib2fNV_remap_index },
+   { 13462, VertexAttrib2fvNV_remap_index },
+   {  6250, VertexAttrib2sNV_remap_index },
+   { 19670, VertexAttrib2svNV_remap_index },
+   { 11626, VertexAttrib3dNV_remap_index },
+   { 32886, VertexAttrib3dvNV_remap_index },
+   { 10667, VertexAttrib3fNV_remap_index },
+   { 25659, VertexAttrib3fvNV_remap_index },
+   { 23023, VertexAttrib3sNV_remap_index },
+   { 24541, VertexAttrib3svNV_remap_index },
+   { 29883, VertexAttrib4dNV_remap_index },
+   { 34258, VertexAttrib4dvNV_remap_index },
+   {  5414, VertexAttrib4fNV_remap_index },
+   {  9728, VertexAttrib4fvNV_remap_index },
+   { 27733, VertexAttrib4sNV_remap_index },
+   {  1422, VertexAttrib4svNV_remap_index },
+   {  5187, VertexAttrib4ubNV_remap_index },
+   {   778, VertexAttrib4ubvNV_remap_index },
+   { 22484, VertexAttribPointerNV_remap_index },
+   {  2340, VertexAttribs1dvNV_remap_index },
+   { 27139, VertexAttribs1fvNV_remap_index },
+   { 34058, VertexAttribs1svNV_remap_index },
+   { 10692, VertexAttribs2dvNV_remap_index },
+   { 26266, VertexAttribs2fvNV_remap_index },
+   { 18206, VertexAttribs2svNV_remap_index },
+   {  5502, VertexAttribs3dvNV_remap_index },
+   {  2199, VertexAttribs3fvNV_remap_index },
+   { 30890, VertexAttribs3svNV_remap_index },
+   { 27823, VertexAttribs4dvNV_remap_index },
+   {  5574, VertexAttribs4fvNV_remap_index },
+   { 33845, VertexAttribs4svNV_remap_index },
+   { 30638, VertexAttribs4ubvNV_remap_index },
+   { 27893, GetTexBumpParameterfvATI_remap_index },
+   { 34099, GetTexBumpParameterivATI_remap_index },
+   { 19314, TexBumpParameterfvATI_remap_index },
+   { 21401, TexBumpParameterivATI_remap_index },
+   { 16064, AlphaFragmentOp1ATI_remap_index },
+   { 26557, AlphaFragmentOp2ATI_remap_index },
+   { 25575, AlphaFragmentOp3ATI_remap_index },
+   { 30817, BeginFragmentShaderATI_remap_index },
+   { 32190, BindFragmentShaderATI_remap_index },
+   { 24670, ColorFragmentOp1ATI_remap_index },
+   {  4476, ColorFragmentOp2ATI_remap_index },
+   { 32531, ColorFragmentOp3ATI_remap_index },
+   {  5740, DeleteFragmentShaderATI_remap_index },
+   { 34282, EndFragmentShaderATI_remap_index },
+   { 33452, GenFragmentShadersATI_remap_index },
+   { 26420, PassTexCoordATI_remap_index },
+   {  7262, SampleMapATI_remap_index },
+   { 28004, SetFragmentShaderConstantATI_remap_index },
+   {   363, PointParameteriNV_remap_index },
+   { 14644, PointParameterivNV_remap_index },
+   { 29722, ActiveStencilFaceEXT_remap_index },
+   { 28450, BindVertexArrayAPPLE_remap_index },
+   {  2810, DeleteVertexArraysAPPLE_remap_index },
+   { 18673, GenVertexArraysAPPLE_remap_index },
+   { 24324, IsVertexArrayAPPLE_remap_index },
+   {   819, GetProgramNamedParameterdvNV_remap_index },
+   {  3638, GetProgramNamedParameterfvNV_remap_index },
+   { 27924, ProgramNamedParameter4dNV_remap_index },
+   { 15018, ProgramNamedParameter4dvNV_remap_index },
+   {  9211, ProgramNamedParameter4fNV_remap_index },
+   { 12117, ProgramNamedParameter4fvNV_remap_index },
+   { 17521, PrimitiveRestartIndexNV_remap_index },
+   { 31680, PrimitiveRestartNV_remap_index },
+   { 25246, DepthBoundsEXT_remap_index },
+   {  1144, BlendEquationSeparateEXT_remap_index },
+   { 15219, BindFramebufferEXT_remap_index },
+   { 26650, BindRenderbufferEXT_remap_index },
+   {  9975, CheckFramebufferStatusEXT_remap_index },
+   { 23575, DeleteFramebuffersEXT_remap_index },
+   { 32788, DeleteRenderbuffersEXT_remap_index },
+   { 13920, FramebufferRenderbufferEXT_remap_index },
+   { 14109, FramebufferTexture1DEXT_remap_index },
+   { 11911, FramebufferTexture2DEXT_remap_index },
+   { 11531, FramebufferTexture3DEXT_remap_index },
+   { 24190, GenFramebuffersEXT_remap_index },
+   { 18071, GenRenderbuffersEXT_remap_index },
+   {  6998, GenerateMipmapEXT_remap_index },
+   { 22577, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 33358, GetRenderbufferParameterivEXT_remap_index },
+   { 21281, IsFramebufferEXT_remap_index },
+   { 34181, IsRenderbufferEXT_remap_index },
+   {  8486, RenderbufferStorageEXT_remap_index },
+   {   695, BlitFramebufferEXT_remap_index },
+   { 14804, BufferParameteriAPPLE_remap_index },
+   { 20115, FlushMappedBufferRangeAPPLE_remap_index },
+   {  1867, BindFragDataLocationEXT_remap_index },
+   { 25359, GetFragDataLocationEXT_remap_index },
+   { 10970, GetUniformuivEXT_remap_index },
+   { 33532, GetVertexAttribIivEXT_remap_index },
+   {  4326, GetVertexAttribIuivEXT_remap_index },
+   { 12389, Uniform1uiEXT_remap_index },
+   { 28895, Uniform1uivEXT_remap_index },
+   { 23119, Uniform2uiEXT_remap_index },
+   {  4440, Uniform2uivEXT_remap_index },
+   { 30162, Uniform3uiEXT_remap_index },
+   { 15165, Uniform3uivEXT_remap_index },
+   {  3562, Uniform4uiEXT_remap_index },
+   {  8987, Uniform4uivEXT_remap_index },
+   { 19052, VertexAttribI1iEXT_remap_index },
+   {  5214, VertexAttribI1ivEXT_remap_index },
+   {  2589, VertexAttribI1uiEXT_remap_index },
+   { 13190, VertexAttribI1uivEXT_remap_index },
    {    81, VertexAttribI2iEXT_remap_index },
-   { 24628, VertexAttribI2ivEXT_remap_index },
-   {  5601, VertexAttribI2uiEXT_remap_index },
-   {  4956, VertexAttribI2uivEXT_remap_index },
-   { 27371, VertexAttribI3iEXT_remap_index },
-   { 25830, VertexAttribI3ivEXT_remap_index },
-   {  3494, VertexAttribI3uiEXT_remap_index },
-   { 31313, VertexAttribI3uivEXT_remap_index },
-   { 22674, VertexAttribI4bvEXT_remap_index },
-   { 15057, VertexAttribI4iEXT_remap_index },
-   { 32948, VertexAttribI4ivEXT_remap_index },
-   { 13854, VertexAttribI4svEXT_remap_index },
-   {  4043, VertexAttribI4ubvEXT_remap_index },
-   { 16645, VertexAttribI4uiEXT_remap_index },
-   {  5747, VertexAttribI4uivEXT_remap_index },
-   { 11725, VertexAttribI4usvEXT_remap_index },
-   { 19104, VertexAttribIPointerEXT_remap_index },
-   {  3181, FramebufferTextureLayerEXT_remap_index },
-   { 16999, ColorMaskIndexedEXT_remap_index },
-   { 19540, DisableIndexedEXT_remap_index },
-   { 27416, EnableIndexedEXT_remap_index },
-   { 22378, GetBooleanIndexedvEXT_remap_index },
-   { 11336, GetIntegerIndexedvEXT_remap_index },
-   { 23497, IsEnabledIndexedEXT_remap_index },
-   { 23397, ClearColorIiEXT_remap_index },
-   {  3590, ClearColorIuiEXT_remap_index },
-   { 10224, GetTexParameterIivEXT_remap_index },
-   {  6229, GetTexParameterIuivEXT_remap_index },
-   {  3137, TexParameterIivEXT_remap_index },
-   { 27238, TexParameterIuivEXT_remap_index },
-   {  4824, BeginConditionalRenderNV_remap_index },
-   { 26216, EndConditionalRenderNV_remap_index },
-   {  9653, BeginTransformFeedbackEXT_remap_index },
-   { 19575, BindBufferBaseEXT_remap_index },
-   { 19434, BindBufferOffsetEXT_remap_index },
-   { 12637, BindBufferRangeEXT_remap_index },
-   { 14679, EndTransformFeedbackEXT_remap_index },
-   { 11199, GetTransformFeedbackVaryingEXT_remap_index },
-   { 21432, TransformFeedbackVaryingsEXT_remap_index },
-   { 30469, ProvokingVertexEXT_remap_index },
-   { 11147, GetTexParameterPointervAPPLE_remap_index },
-   {  5349, TextureRangeAPPLE_remap_index },
-   { 12014, GetObjectParameterivAPPLE_remap_index },
-   { 20554, ObjectPurgeableAPPLE_remap_index },
-   {  6023, ObjectUnpurgeableAPPLE_remap_index },
-   { 17781, ActiveProgramEXT_remap_index },
-   { 17752, CreateShaderProgramEXT_remap_index },
-   { 29437, UseShaderProgramEXT_remap_index },
-   { 16952, TextureBarrierNV_remap_index },
-   { 29678, StencilFuncSeparateATI_remap_index },
-   {  5936, ProgramEnvParameters4fvEXT_remap_index },
-   { 17646, ProgramLocalParameters4fvEXT_remap_index },
-   { 14532, GetQueryObjecti64vEXT_remap_index },
-   { 10749, GetQueryObjectui64vEXT_remap_index },
-   { 24585, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 12526, EGLImageTargetTexture2DOES_remap_index },
+   { 24782, VertexAttribI2ivEXT_remap_index },
+   {  5528, VertexAttribI2uiEXT_remap_index },
+   {  4883, VertexAttribI2uivEXT_remap_index },
+   { 27525, VertexAttribI3iEXT_remap_index },
+   { 25984, VertexAttribI3ivEXT_remap_index },
+   {  3416, VertexAttribI3uiEXT_remap_index },
+   { 31383, VertexAttribI3uivEXT_remap_index },
+   { 22828, VertexAttribI4bvEXT_remap_index },
+   { 15097, VertexAttribI4iEXT_remap_index },
+   { 33057, VertexAttribI4ivEXT_remap_index },
+   { 13823, VertexAttribI4svEXT_remap_index },
+   { 17039, VertexAttribI4ubvEXT_remap_index },
+   { 16685, VertexAttribI4uiEXT_remap_index },
+   {  5674, VertexAttribI4uivEXT_remap_index },
+   { 11694, VertexAttribI4usvEXT_remap_index },
+   { 19258, VertexAttribIPointerEXT_remap_index },
+   {  3103, FramebufferTextureLayerEXT_remap_index },
+   {  5950, ColorMaskIndexedEXT_remap_index },
+   { 19694, DisableIndexedEXT_remap_index },
+   { 27570, EnableIndexedEXT_remap_index },
+   { 22532, GetBooleanIndexedvEXT_remap_index },
+   { 11305, GetIntegerIndexedvEXT_remap_index },
+   { 23651, IsEnabledIndexedEXT_remap_index },
+   { 23551, ClearColorIiEXT_remap_index },
+   {  3512, ClearColorIuiEXT_remap_index },
+   { 10193, GetTexParameterIivEXT_remap_index },
+   {  6198, GetTexParameterIuivEXT_remap_index },
+   {  3059, TexParameterIivEXT_remap_index },
+   { 27392, TexParameterIuivEXT_remap_index },
+   {  4751, BeginConditionalRenderNV_remap_index },
+   { 26370, EndConditionalRenderNV_remap_index },
+   {  9622, BeginTransformFeedbackEXT_remap_index },
+   { 19729, BindBufferBaseEXT_remap_index },
+   { 19588, BindBufferOffsetEXT_remap_index },
+   { 12606, BindBufferRangeEXT_remap_index },
+   { 14719, EndTransformFeedbackEXT_remap_index },
+   { 11168, GetTransformFeedbackVaryingEXT_remap_index },
+   { 21586, TransformFeedbackVaryingsEXT_remap_index },
+   { 30539, ProvokingVertexEXT_remap_index },
+   { 11116, GetTexParameterPointervAPPLE_remap_index },
+   {  5276, TextureRangeAPPLE_remap_index },
+   { 11983, GetObjectParameterivAPPLE_remap_index },
+   { 20708, ObjectPurgeableAPPLE_remap_index },
+   {  5992, ObjectUnpurgeableAPPLE_remap_index },
+   { 17893, ActiveProgramEXT_remap_index },
+   { 17864, CreateShaderProgramEXT_remap_index },
+   { 29507, UseShaderProgramEXT_remap_index },
+   { 16992, TextureBarrierNV_remap_index },
+   { 29748, StencilFuncSeparateATI_remap_index },
+   {  5863, ProgramEnvParameters4fvEXT_remap_index },
+   { 17758, ProgramLocalParameters4fvEXT_remap_index },
+   { 14572, GetQueryObjecti64vEXT_remap_index },
+   { 10718, GetQueryObjectui64vEXT_remap_index },
+   { 24739, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 12495, 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 */
-   {  2767, _gloffset_BlendColor },
+   {  2728, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 11619, _gloffset_BlendEquation },
+   { 11588, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 17520, _gloffset_ColorSubTable },
-   { 32611, _gloffset_CopyColorSubTable },
+   { 17632, _gloffset_ColorSubTable },
+   { 32720, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
-   {   296, _gloffset_ConvolutionFilter1D },
-   {  2566, _gloffset_CopyConvolutionFilter1D },
-   {  4293, _gloffset_GetConvolutionParameteriv },
-   {  8866, _gloffset_ConvolutionFilter2D },
-   {  9068, _gloffset_ConvolutionParameteriv },
-   {  9528, _gloffset_ConvolutionParameterfv },
-   { 21275, _gloffset_GetSeparableFilter },
-   { 24860, _gloffset_SeparableFilter2D },
-   { 25723, _gloffset_ConvolutionParameteri },
-   { 25891, _gloffset_ConvolutionParameterf },
-   { 27605, _gloffset_GetConvolutionParameterfv },
-   { 28494, _gloffset_GetConvolutionFilter },
-   { 31009, _gloffset_CopyConvolutionFilter2D },
+   {   257, _gloffset_ConvolutionFilter1D },
+   {  2527, _gloffset_CopyConvolutionFilter1D },
+   {  4168, _gloffset_GetConvolutionParameteriv },
+   {  8835, _gloffset_ConvolutionFilter2D },
+   {  9037, _gloffset_ConvolutionParameteriv },
+   {  9497, _gloffset_ConvolutionParameterfv },
+   { 21429, _gloffset_GetSeparableFilter },
+   { 25014, _gloffset_SeparableFilter2D },
+   { 25877, _gloffset_ConvolutionParameteri },
+   { 26045, _gloffset_ConvolutionParameterf },
+   { 27759, _gloffset_GetConvolutionParameterfv },
+   { 28616, _gloffset_GetConvolutionFilter },
+   { 31079, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 15538, _gloffset_CopyTexSubImage3D },
-   { 17207, _gloffset_CopyTexImage2D },
-   { 25331, _gloffset_CopyTexImage1D },
-   { 28175, _gloffset_CopyTexSubImage2D },
-   { 30647, _gloffset_CopyTexSubImage1D },
+   { 15578, _gloffset_CopyTexSubImage3D },
+   { 17319, _gloffset_CopyTexImage2D },
+   { 25485, _gloffset_CopyTexImage1D },
+   { 28297, _gloffset_CopyTexSubImage2D },
+   { 30717, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
-   {  9865, _gloffset_DrawRangeElements },
+   {  9834, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
-   {   895, _gloffset_Histogram },
-   {  3676, _gloffset_ResetHistogram },
-   { 10370, _gloffset_GetMinmax },
-   { 15872, _gloffset_GetHistogramParameterfv },
-   { 25256, _gloffset_GetMinmaxParameteriv },
-   { 27495, _gloffset_ResetMinmax },
-   { 28391, _gloffset_GetHistogramParameteriv },
-   { 29612, _gloffset_GetHistogram },
-   { 32236, _gloffset_Minmax },
-   { 33886, _gloffset_GetMinmaxParameterfv },
+   {   856, _gloffset_Histogram },
+   {  3598, _gloffset_ResetHistogram },
+   { 10339, _gloffset_GetMinmax },
+   { 15912, _gloffset_GetHistogramParameterfv },
+   { 25410, _gloffset_GetMinmaxParameteriv },
+   { 27649, _gloffset_ResetMinmax },
+   { 28513, _gloffset_GetHistogramParameteriv },
+   { 29682, _gloffset_GetHistogram },
+   { 32306, _gloffset_Minmax },
+   { 33928, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
-   {  8728, _gloffset_ColorTable },
-   { 15718, _gloffset_GetColorTable },
-   { 23783, _gloffset_GetColorTableParameterfv },
-   { 25947, _gloffset_GetColorTableParameteriv },
+   {  8697, _gloffset_ColorTable },
+   { 15758, _gloffset_GetColorTable },
+   { 23937, _gloffset_GetColorTableParameterfv },
+   { 26101, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
-   {  7439, _gloffset_TexSubImage1D },
-   { 11074, _gloffset_TexSubImage2D },
+   {  7408, _gloffset_TexSubImage1D },
+   { 11043, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
-   {  1865, _gloffset_TexImage3D },
-   { 23552, _gloffset_TexSubImage3D },
+   {  1826, _gloffset_TexImage3D },
+   { 23706, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
-   {  3444, _gloffset_PrioritizeTextures },
-   {  7888, _gloffset_AreTexturesResident },
-   { 14058, _gloffset_GenTextures },
-   { 16231, _gloffset_DeleteTextures },
-   { 20242, _gloffset_IsTexture },
-   { 30712, _gloffset_BindTexture },
+   {  3366, _gloffset_PrioritizeTextures },
+   {  7857, _gloffset_AreTexturesResident },
+   { 14027, _gloffset_GenTextures },
+   { 16271, _gloffset_DeleteTextures },
+   { 20396, _gloffset_IsTexture },
+   { 30782, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 25032, _gloffset_ArrayElement },
-   { 31824, _gloffset_GetPointerv },
-   { 33437, _gloffset_DrawArrays },
+   { 25186, _gloffset_ArrayElement },
+   { 31894, _gloffset_GetPointerv },
+   { 33479, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
-   {  8006, _gloffset_ColorTableParameteriv },
-   {  8728, _gloffset_ColorTable },
-   { 15718, _gloffset_GetColorTable },
-   { 15828, _gloffset_CopyColorTable },
-   { 20103, _gloffset_ColorTableParameterfv },
-   { 23783, _gloffset_GetColorTableParameterfv },
-   { 25947, _gloffset_GetColorTableParameteriv },
+   {  7975, _gloffset_ColorTableParameteriv },
+   {  8697, _gloffset_ColorTable },
+   { 15758, _gloffset_GetColorTable },
+   { 15868, _gloffset_CopyColorTable },
+   { 20257, _gloffset_ColorTableParameterfv },
+   { 23937, _gloffset_GetColorTableParameterfv },
+   { 26101, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
-   {   464, _gloffset_MultiTexCoord3sARB },
-   {   696, _gloffset_ActiveTextureARB },
-   {  4451, _gloffset_MultiTexCoord1fvARB },
-   {  6505, _gloffset_MultiTexCoord3dARB },
-   {  6550, _gloffset_MultiTexCoord2iARB },
-   {  6674, _gloffset_MultiTexCoord2svARB },
-   {  8684, _gloffset_MultiTexCoord2fARB },
-   { 10779, _gloffset_MultiTexCoord3fvARB },
-   { 11381, _gloffset_MultiTexCoord4sARB },
-   { 12062, _gloffset_MultiTexCoord2dvARB },
-   { 12469, _gloffset_MultiTexCoord1svARB },
-   { 12870, _gloffset_MultiTexCoord3svARB },
-   { 12931, _gloffset_MultiTexCoord4iARB },
-   { 13762, _gloffset_MultiTexCoord3iARB },
-   { 14561, _gloffset_MultiTexCoord1dARB },
-   { 14793, _gloffset_MultiTexCoord3dvARB },
-   { 16072, _gloffset_MultiTexCoord3ivARB },
-   { 16117, _gloffset_MultiTexCoord2sARB },
-   { 17577, _gloffset_MultiTexCoord4ivARB },
-   { 19743, _gloffset_ClientActiveTextureARB },
-   { 22106, _gloffset_MultiTexCoord2dARB },
-   { 22543, _gloffset_MultiTexCoord4dvARB },
-   { 22920, _gloffset_MultiTexCoord4fvARB },
-   { 23924, _gloffset_MultiTexCoord3fARB },
-   { 26541, _gloffset_MultiTexCoord4dARB },
-   { 26807, _gloffset_MultiTexCoord1sARB },
-   { 27011, _gloffset_MultiTexCoord1dvARB },
-   { 28019, _gloffset_MultiTexCoord1ivARB },
-   { 28112, _gloffset_MultiTexCoord2ivARB },
-   { 28451, _gloffset_MultiTexCoord1iARB },
-   { 29887, _gloffset_MultiTexCoord4svARB },
-   { 30511, _gloffset_MultiTexCoord1fARB },
-   { 30774, _gloffset_MultiTexCoord4fARB },
-   { 33271, _gloffset_MultiTexCoord2fvARB },
+   {   425, _gloffset_MultiTexCoord3sARB },
+   {   657, _gloffset_ActiveTextureARB },
+   {  4378, _gloffset_MultiTexCoord1fvARB },
+   {  6474, _gloffset_MultiTexCoord3dARB },
+   {  6519, _gloffset_MultiTexCoord2iARB },
+   {  6643, _gloffset_MultiTexCoord2svARB },
+   {  8653, _gloffset_MultiTexCoord2fARB },
+   { 10748, _gloffset_MultiTexCoord3fvARB },
+   { 11350, _gloffset_MultiTexCoord4sARB },
+   { 12031, _gloffset_MultiTexCoord2dvARB },
+   { 12438, _gloffset_MultiTexCoord1svARB },
+   { 12839, _gloffset_MultiTexCoord3svARB },
+   { 12900, _gloffset_MultiTexCoord4iARB },
+   { 13731, _gloffset_MultiTexCoord3iARB },
+   { 14601, _gloffset_MultiTexCoord1dARB },
+   { 14833, _gloffset_MultiTexCoord3dvARB },
+   { 16112, _gloffset_MultiTexCoord3ivARB },
+   { 16157, _gloffset_MultiTexCoord2sARB },
+   { 17689, _gloffset_MultiTexCoord4ivARB },
+   { 19897, _gloffset_ClientActiveTextureARB },
+   { 22260, _gloffset_MultiTexCoord2dARB },
+   { 22697, _gloffset_MultiTexCoord4dvARB },
+   { 23074, _gloffset_MultiTexCoord4fvARB },
+   { 24078, _gloffset_MultiTexCoord3fARB },
+   { 26695, _gloffset_MultiTexCoord4dARB },
+   { 26961, _gloffset_MultiTexCoord1sARB },
+   { 27165, _gloffset_MultiTexCoord1dvARB },
+   { 28141, _gloffset_MultiTexCoord1ivARB },
+   { 28234, _gloffset_MultiTexCoord2ivARB },
+   { 28573, _gloffset_MultiTexCoord1iARB },
+   { 29957, _gloffset_MultiTexCoord4svARB },
+   { 30581, _gloffset_MultiTexCoord1fARB },
+   { 30844, _gloffset_MultiTexCoord4fARB },
+   { 33313, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 
@@ -5568,7 +5573,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[] = {
-   {  9586, -1 }, /* TbufferMask3DFX */
+   {  9555, -1 }, /* TbufferMask3DFX */
    {    -1, -1 }
 };
 #endif
@@ -5667,7 +5672,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[] = {
-   { 12834, -1 }, /* FramebufferTextureLayer */
+   { 12803, -1 }, /* FramebufferTextureLayer */
    {    -1, -1 }
 };
 #endif
@@ -5688,11 +5693,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[] = {
-   {  3927, -1 }, /* MatrixIndexusvARB */
-   { 13583, -1 }, /* MatrixIndexuivARB */
-   { 14948, -1 }, /* MatrixIndexPointerARB */
-   { 20509, -1 }, /* CurrentPaletteMatrixARB */
-   { 23668, -1 }, /* MatrixIndexubvARB */
+   {  3849, -1 }, /* MatrixIndexusvARB */
+   { 13552, -1 }, /* MatrixIndexuivARB */
+   { 14988, -1 }, /* MatrixIndexPointerARB */
+   { 20663, -1 }, /* CurrentPaletteMatrixARB */
+   { 23822, -1 }, /* MatrixIndexubvARB */
    {    -1, -1 }
 };
 #endif
@@ -5790,16 +5795,16 @@ 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[] = {
-   {  2508, -1 }, /* WeightubvARB */
-   {  6917, -1 }, /* WeightivARB */
-   { 11484, -1 }, /* WeightPointerARB */
-   { 14318, -1 }, /* WeightfvARB */
-   { 18120, -1 }, /* WeightbvARB */
-   { 21739, -1 }, /* WeightusvARB */
-   { 24786, -1 }, /* VertexBlendARB */
-   { 30595, -1 }, /* WeightsvARB */
-   { 32661, -1 }, /* WeightdvARB */
-   { 33471, -1 }, /* WeightuivARB */
+   {  2469, -1 }, /* WeightubvARB */
+   {  6886, -1 }, /* WeightivARB */
+   { 11453, -1 }, /* WeightPointerARB */
+   { 14319, -1 }, /* WeightfvARB */
+   { 18232, -1 }, /* WeightbvARB */
+   { 21893, -1 }, /* WeightusvARB */
+   { 24940, -1 }, /* VertexBlendARB */
+   { 30665, -1 }, /* WeightsvARB */
+   { 32770, -1 }, /* WeightdvARB */
+   { 33513, -1 }, /* WeightuivARB */
    {    -1, -1 }
 };
 #endif
@@ -5869,7 +5874,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[] = {
-   {  2767, _gloffset_BlendColor },
+   {  2728, _gloffset_BlendColor },
    {    -1, -1 }
 };
 #endif
@@ -5890,15 +5895,15 @@ 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[] = {
-   { 11619, _gloffset_BlendEquation },
+   { 11588, _gloffset_BlendEquation },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_color_subtable)
 static const struct gl_function_remap GL_EXT_color_subtable_functions[] = {
-   { 17520, _gloffset_ColorSubTable },
-   { 32611, _gloffset_CopyColorSubTable },
+   { 17632, _gloffset_ColorSubTable },
+   { 32720, _gloffset_CopyColorSubTable },
    {    -1, -1 }
 };
 #endif
@@ -5912,66 +5917,66 @@ 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[] = {
-   {   296, _gloffset_ConvolutionFilter1D },
-   {  2566, _gloffset_CopyConvolutionFilter1D },
-   {  4293, _gloffset_GetConvolutionParameteriv },
-   {  8866, _gloffset_ConvolutionFilter2D },
-   {  9068, _gloffset_ConvolutionParameteriv },
-   {  9528, _gloffset_ConvolutionParameterfv },
-   { 21275, _gloffset_GetSeparableFilter },
-   { 24860, _gloffset_SeparableFilter2D },
-   { 25723, _gloffset_ConvolutionParameteri },
-   { 25891, _gloffset_ConvolutionParameterf },
-   { 27605, _gloffset_GetConvolutionParameterfv },
-   { 28494, _gloffset_GetConvolutionFilter },
-   { 31009, _gloffset_CopyConvolutionFilter2D },
+   {   257, _gloffset_ConvolutionFilter1D },
+   {  2527, _gloffset_CopyConvolutionFilter1D },
+   {  4168, _gloffset_GetConvolutionParameteriv },
+   {  8835, _gloffset_ConvolutionFilter2D },
+   {  9037, _gloffset_ConvolutionParameteriv },
+   {  9497, _gloffset_ConvolutionParameterfv },
+   { 21429, _gloffset_GetSeparableFilter },
+   { 25014, _gloffset_SeparableFilter2D },
+   { 25877, _gloffset_ConvolutionParameteri },
+   { 26045, _gloffset_ConvolutionParameterf },
+   { 27759, _gloffset_GetConvolutionParameterfv },
+   { 28616, _gloffset_GetConvolutionFilter },
+   { 31079, _gloffset_CopyConvolutionFilter2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_coordinate_frame)
 static const struct gl_function_remap GL_EXT_coordinate_frame_functions[] = {
-   { 10918, -1 }, /* TangentPointerEXT */
-   { 12989, -1 }, /* Binormal3ivEXT */
-   { 13715, -1 }, /* Tangent3sEXT */
-   { 15013, -1 }, /* Tangent3fvEXT */
-   { 19188, -1 }, /* Tangent3ivEXT */
-   { 19415, -1 }, /* Tangent3dvEXT */
-   { 20189, -1 }, /* Binormal3bvEXT */
-   { 21328, -1 }, /* Binormal3dEXT */
-   { 23600, -1 }, /* Tangent3fEXT */
-   { 25795, -1 }, /* Binormal3sEXT */
-   { 26337, -1 }, /* Tangent3dEXT */
-   { 27284, -1 }, /* Binormal3svEXT */
-   { 27917, -1 }, /* Binormal3fEXT */
-   { 28825, -1 }, /* Binormal3dvEXT */
-   { 30144, -1 }, /* Tangent3iEXT */
-   { 31294, -1 }, /* Tangent3bvEXT */
-   { 31859, -1 }, /* Tangent3bEXT */
-   { 32384, -1 }, /* Binormal3fvEXT */
-   { 33170, -1 }, /* BinormalPointerEXT */
-   { 33651, -1 }, /* Tangent3svEXT */
-   { 34088, -1 }, /* Binormal3bEXT */
-   { 34265, -1 }, /* Binormal3iEXT */
+   { 10887, -1 }, /* TangentPointerEXT */
+   { 12958, -1 }, /* Binormal3ivEXT */
+   { 13684, -1 }, /* Tangent3sEXT */
+   { 15053, -1 }, /* Tangent3fvEXT */
+   { 19342, -1 }, /* Tangent3ivEXT */
+   { 19569, -1 }, /* Tangent3dvEXT */
+   { 20343, -1 }, /* Binormal3bvEXT */
+   { 21482, -1 }, /* Binormal3dEXT */
+   { 23754, -1 }, /* Tangent3fEXT */
+   { 25949, -1 }, /* Binormal3sEXT */
+   { 26491, -1 }, /* Tangent3dEXT */
+   { 27438, -1 }, /* Binormal3svEXT */
+   { 28039, -1 }, /* Binormal3fEXT */
+   { 28947, -1 }, /* Binormal3dvEXT */
+   { 30214, -1 }, /* Tangent3iEXT */
+   { 31364, -1 }, /* Tangent3bvEXT */
+   { 31929, -1 }, /* Tangent3bEXT */
+   { 32493, -1 }, /* Binormal3fvEXT */
+   { 33212, -1 }, /* BinormalPointerEXT */
+   { 33693, -1 }, /* Tangent3svEXT */
+   { 34130, -1 }, /* Binormal3bEXT */
+   { 34307, -1 }, /* Binormal3iEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_copy_texture)
 static const struct gl_function_remap GL_EXT_copy_texture_functions[] = {
-   { 15538, _gloffset_CopyTexSubImage3D },
-   { 17207, _gloffset_CopyTexImage2D },
-   { 25331, _gloffset_CopyTexImage1D },
-   { 28175, _gloffset_CopyTexSubImage2D },
-   { 30647, _gloffset_CopyTexSubImage1D },
+   { 15578, _gloffset_CopyTexSubImage3D },
+   { 17319, _gloffset_CopyTexImage2D },
+   { 25485, _gloffset_CopyTexImage1D },
+   { 28297, _gloffset_CopyTexSubImage2D },
+   { 30717, _gloffset_CopyTexSubImage1D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_cull_vertex)
 static const struct gl_function_remap GL_EXT_cull_vertex_functions[] = {
-   {  9217, -1 }, /* CullParameterdvEXT */
-   { 12107, -1 }, /* CullParameterfvEXT */
+   {  9186, -1 }, /* CullParameterdvEXT */
+   { 12076, -1 }, /* CullParameterfvEXT */
    {    -1, -1 }
 };
 #endif
@@ -5999,7 +6004,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[] = {
-   {  9865, _gloffset_DrawRangeElements },
+   {  9834, _gloffset_DrawRangeElements },
    {    -1, -1 }
 };
 #endif
@@ -6048,39 +6053,39 @@ static const struct gl_function_remap GL_EXT_gpu_shader4_functions[] = {
 
 #if defined(need_GL_EXT_histogram)
 static const struct gl_function_remap GL_EXT_histogram_functions[] = {
-   {   895, _gloffset_Histogram },
-   {  3676, _gloffset_ResetHistogram },
-   { 10370, _gloffset_GetMinmax },
-   { 15872, _gloffset_GetHistogramParameterfv },
-   { 25256, _gloffset_GetMinmaxParameteriv },
-   { 27495, _gloffset_ResetMinmax },
-   { 28391, _gloffset_GetHistogramParameteriv },
-   { 29612, _gloffset_GetHistogram },
-   { 32236, _gloffset_Minmax },
-   { 33886, _gloffset_GetMinmaxParameterfv },
+   {   856, _gloffset_Histogram },
+   {  3598, _gloffset_ResetHistogram },
+   { 10339, _gloffset_GetMinmax },
+   { 15912, _gloffset_GetHistogramParameterfv },
+   { 25410, _gloffset_GetMinmaxParameteriv },
+   { 27649, _gloffset_ResetMinmax },
+   { 28513, _gloffset_GetHistogramParameteriv },
+   { 29682, _gloffset_GetHistogram },
+   { 32306, _gloffset_Minmax },
+   { 33928, _gloffset_GetMinmaxParameterfv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_func)
 static const struct gl_function_remap GL_EXT_index_func_functions[] = {
-   { 11893, -1 }, /* IndexFuncEXT */
+   { 11862, -1 }, /* IndexFuncEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_material)
 static const struct gl_function_remap GL_EXT_index_material_functions[] = {
-   { 21861, -1 }, /* IndexMaterialEXT */
+   { 22015, -1 }, /* IndexMaterialEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_light_texture)
 static const struct gl_function_remap GL_EXT_light_texture_functions[] = {
-   { 27304, -1 }, /* ApplyTextureEXT */
-   { 27449, -1 }, /* TextureMaterialEXT */
-   { 27474, -1 }, /* TextureLightEXT */
+   { 27458, -1 }, /* ApplyTextureEXT */
+   { 27603, -1 }, /* TextureMaterialEXT */
+   { 27628, -1 }, /* TextureLightEXT */
    {    -1, -1 }
 };
 #endif
@@ -6101,20 +6106,20 @@ 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[] = {
-   {  8728, _gloffset_ColorTable },
-   { 15718, _gloffset_GetColorTable },
-   { 23783, _gloffset_GetColorTableParameterfv },
-   { 25947, _gloffset_GetColorTableParameteriv },
+   {  8697, _gloffset_ColorTable },
+   { 15758, _gloffset_GetColorTable },
+   { 23937, _gloffset_GetColorTableParameterfv },
+   { 26101, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_pixel_transform)
 static const struct gl_function_remap GL_EXT_pixel_transform_functions[] = {
-   { 22508, -1 }, /* PixelTransformParameterfEXT */
-   { 22588, -1 }, /* PixelTransformParameteriEXT */
-   { 31574, -1 }, /* PixelTransformParameterfvEXT */
-   { 33134, -1 }, /* PixelTransformParameterivEXT */
+   { 22662, -1 }, /* PixelTransformParameterfEXT */
+   { 22742, -1 }, /* PixelTransformParameteriEXT */
+   { 31644, -1 }, /* PixelTransformParameterfvEXT */
+   { 33176, -1 }, /* PixelTransformParameterivEXT */
    {    -1, -1 }
 };
 #endif
@@ -6163,16 +6168,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[] = {
-   {  7439, _gloffset_TexSubImage1D },
-   { 11074, _gloffset_TexSubImage2D },
+   {  7408, _gloffset_TexSubImage1D },
+   { 11043, _gloffset_TexSubImage2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_texture3D)
 static const struct gl_function_remap GL_EXT_texture3D_functions[] = {
-   {  1865, _gloffset_TexImage3D },
-   { 23552, _gloffset_TexSubImage3D },
+   {  1826, _gloffset_TexImage3D },
+   { 23706, _gloffset_TexSubImage3D },
    {    -1, -1 }
 };
 #endif
@@ -6193,19 +6198,19 @@ static const struct gl_function_remap GL_EXT_texture_integer_functions[] = {
 
 #if defined(need_GL_EXT_texture_object)
 static const struct gl_function_remap GL_EXT_texture_object_functions[] = {
-   {  3444, _gloffset_PrioritizeTextures },
-   {  7888, _gloffset_AreTexturesResident },
-   { 14058, _gloffset_GenTextures },
-   { 16231, _gloffset_DeleteTextures },
-   { 20242, _gloffset_IsTexture },
-   { 30712, _gloffset_BindTexture },
+   {  3366, _gloffset_PrioritizeTextures },
+   {  7857, _gloffset_AreTexturesResident },
+   { 14027, _gloffset_GenTextures },
+   { 16271, _gloffset_DeleteTextures },
+   { 20396, _gloffset_IsTexture },
+   { 30782, _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[] = {
-   { 14268, -1 }, /* TextureNormalEXT */
+   { 14269, -1 }, /* TextureNormalEXT */
    {    -1, -1 }
 };
 #endif
@@ -6227,30 +6232,30 @@ 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[] = {
-   { 25032, _gloffset_ArrayElement },
-   { 31824, _gloffset_GetPointerv },
-   { 33437, _gloffset_DrawArrays },
+   { 25186, _gloffset_ArrayElement },
+   { 31894, _gloffset_GetPointerv },
+   { 33479, _gloffset_DrawArrays },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_vertex_weighting)
 static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
-   { 20290, -1 }, /* VertexWeightfvEXT */
-   { 27860, -1 }, /* VertexWeightfEXT */
-   { 29581, -1 }, /* VertexWeightPointerEXT */
+   { 20444, -1 }, /* VertexWeightfvEXT */
+   { 27982, -1 }, /* VertexWeightfEXT */
+   { 29651, -1 }, /* VertexWeightPointerEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_HP_image_transform)
 static const struct gl_function_remap GL_HP_image_transform_functions[] = {
-   {  2439, -1 }, /* GetImageTransformParameterfvHP */
-   {  3893, -1 }, /* ImageTransformParameterfHP */
-   { 10612, -1 }, /* ImageTransformParameterfvHP */
-   { 12354, -1 }, /* ImageTransformParameteriHP */
-   { 12724, -1 }, /* GetImageTransformParameterivHP */
-   { 20354, -1 }, /* ImageTransformParameterivHP */
+   {  2400, -1 }, /* GetImageTransformParameterfvHP */
+   {  3815, -1 }, /* ImageTransformParameterfHP */
+   { 10581, -1 }, /* ImageTransformParameterfvHP */
+   { 12323, -1 }, /* ImageTransformParameteriHP */
+   { 12693, -1 }, /* GetImageTransformParameterivHP */
+   { 20508, -1 }, /* ImageTransformParameterivHP */
    {    -1, -1 }
 };
 #endif
@@ -6264,14 +6269,14 @@ 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[] = {
-   {  4583, -1 }, /* SecondaryColorPointerListIBM */
-   {  6371, -1 }, /* NormalPointerListIBM */
-   {  8062, -1 }, /* FogCoordPointerListIBM */
-   {  8403, -1 }, /* VertexPointerListIBM */
-   { 12608, -1 }, /* ColorPointerListIBM */
-   { 13822, -1 }, /* TexCoordPointerListIBM */
-   { 14290, -1 }, /* IndexPointerListIBM */
-   { 33829, -1 }, /* EdgeFlagPointerListIBM */
+   {  4510, -1 }, /* SecondaryColorPointerListIBM */
+   {  6340, -1 }, /* NormalPointerListIBM */
+   {  8031, -1 }, /* FogCoordPointerListIBM */
+   {  8372, -1 }, /* VertexPointerListIBM */
+   { 12577, -1 }, /* ColorPointerListIBM */
+   { 13791, -1 }, /* TexCoordPointerListIBM */
+   { 14291, -1 }, /* IndexPointerListIBM */
+   { 33871, -1 }, /* EdgeFlagPointerListIBM */
    {    -1, -1 }
 };
 #endif
@@ -6285,10 +6290,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[] = {
-   { 13162, -1 }, /* VertexPointervINTEL */
-   { 15965, -1 }, /* ColorPointervINTEL */
-   { 30983, -1 }, /* NormalPointervINTEL */
-   { 31506, -1 }, /* TexCoordPointervINTEL */
+   { 13131, -1 }, /* VertexPointervINTEL */
+   { 16005, -1 }, /* ColorPointervINTEL */
+   { 31053, -1 }, /* NormalPointervINTEL */
+   { 31576, -1 }, /* TexCoordPointervINTEL */
    {    -1, -1 }
 };
 #endif
@@ -6302,10 +6307,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[] = {
-   {  1729, -1 }, /* GetDebugLogLengthMESA */
-   {  3615, -1 }, /* ClearDebugLogMESA */
-   {  4768, -1 }, /* GetDebugLogMESA */
-   { 32017, -1 }, /* CreateDebugObjectMESA */
+   {  1690, -1 }, /* GetDebugLogLengthMESA */
+   {  3537, -1 }, /* ClearDebugLogMESA */
+   {  4695, -1 }, /* GetDebugLogMESA */
+   { 32087, -1 }, /* CreateDebugObjectMESA */
    {    -1, -1 }
 };
 #endif
@@ -6326,15 +6331,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[] = {
-   {  7101, -1 }, /* GetMapAttribParameterivNV */
-   {  8834, -1 }, /* MapControlPointsNV */
-   {  8933, -1 }, /* MapParameterfvNV */
-   { 11057, -1 }, /* EvalMapsNV */
-   { 17718, -1 }, /* GetMapAttribParameterfvNV */
-   { 17935, -1 }, /* MapParameterivNV */
-   { 25646, -1 }, /* GetMapParameterivNV */
-   { 26189, -1 }, /* GetMapParameterfvNV */
-   { 30298, -1 }, /* GetMapControlPointsNV */
+   {  7070, -1 }, /* GetMapAttribParameterivNV */
+   {  8803, -1 }, /* MapControlPointsNV */
+   {  8902, -1 }, /* MapParameterfvNV */
+   { 11026, -1 }, /* EvalMapsNV */
+   { 17830, -1 }, /* GetMapAttribParameterfvNV */
+   { 18047, -1 }, /* MapParameterivNV */
+   { 25800, -1 }, /* GetMapParameterivNV */
+   { 26343, -1 }, /* GetMapParameterfvNV */
+   { 30368, -1 }, /* GetMapControlPointsNV */
    {    -1, -1 }
 };
 #endif
@@ -6376,8 +6381,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[] = {
-   { 16384, -1 }, /* CombinerStageParameterfvNV */
-   { 16780, -1 }, /* GetCombinerStageParameterfvNV */
+   { 16424, -1 }, /* CombinerStageParameterfvNV */
+   { 16820, -1 }, /* GetCombinerStageParameterfvNV */
    {    -1, -1 }
 };
 #endif
@@ -6412,23 +6417,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[] = {
-   {  9054, -1 }, /* HintPGI */
+   {  9023, -1 }, /* HintPGI */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_detail_texture)
 static const struct gl_function_remap GL_SGIS_detail_texture_functions[] = {
-   { 16753, -1 }, /* GetDetailTexFuncSGIS */
-   { 17152, -1 }, /* DetailTexFuncSGIS */
+   { 16793, -1 }, /* GetDetailTexFuncSGIS */
+   { 17264, -1 }, /* DetailTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_fog_function)
 static const struct gl_function_remap GL_SGIS_fog_function_functions[] = {
-   { 28157, -1 }, /* FogFuncSGIS */
-   { 28930, -1 }, /* GetFogFuncSGIS */
+   { 28279, -1 }, /* FogFuncSGIS */
+   { 29000, -1 }, /* GetFogFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -6456,112 +6461,112 @@ 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[] = {
-   {  7162, -1 }, /* GetSharpenTexFuncSGIS */
-   { 22894, -1 }, /* SharpenTexFuncSGIS */
+   {  7131, -1 }, /* GetSharpenTexFuncSGIS */
+   { 23048, -1 }, /* SharpenTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture4D)
 static const struct gl_function_remap GL_SGIS_texture4D_functions[] = {
-   {  1034, -1 }, /* TexImage4DSGIS */
-   { 16300, -1 }, /* TexSubImage4DSGIS */
+   {   995, -1 }, /* TexImage4DSGIS */
+   { 16340, -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[] = {
-   { 15671, -1 }, /* TextureColorMaskSGIS */
+   { 15711, -1 }, /* TextureColorMaskSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_filter4)
 static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {
-   {  7339, -1 }, /* GetTexFilterFuncSGIS */
-   { 16926, -1 }, /* TexFilterFuncSGIS */
+   {  7308, -1 }, /* GetTexFilterFuncSGIS */
+   { 16966, -1 }, /* TexFilterFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_async)
 static const struct gl_function_remap GL_SGIX_async_functions[] = {
-   {  3541, -1 }, /* AsyncMarkerSGIX */
-   {  4722, -1 }, /* FinishAsyncSGIX */
-   {  5794, -1 }, /* PollAsyncSGIX */
-   { 23103, -1 }, /* DeleteAsyncMarkersSGIX */
-   { 23158, -1 }, /* IsAsyncMarkerSGIX */
-   { 33626, -1 }, /* GenAsyncMarkersSGIX */
+   {  3463, -1 }, /* AsyncMarkerSGIX */
+   {  4649, -1 }, /* FinishAsyncSGIX */
+   {  5721, -1 }, /* PollAsyncSGIX */
+   { 23257, -1 }, /* DeleteAsyncMarkersSGIX */
+   { 23312, -1 }, /* IsAsyncMarkerSGIX */
+   { 33668, -1 }, /* GenAsyncMarkersSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_flush_raster)
 static const struct gl_function_remap GL_SGIX_flush_raster_functions[] = {
-   {  7716, -1 }, /* FlushRasterSGIX */
+   {  7685, -1 }, /* FlushRasterSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_fragment_lighting)
 static const struct gl_function_remap GL_SGIX_fragment_lighting_functions[] = {
-   {  2737, -1 }, /* FragmentMaterialfvSGIX */
-   {  5698, -1 }, /* FragmentLightiSGIX */
-   {  8470, -1 }, /* FragmentMaterialfSGIX */
-   {  8607, -1 }, /* GetFragmentLightivSGIX */
-   {  9480, -1 }, /* FragmentLightModeliSGIX */
-   { 11120, -1 }, /* FragmentLightivSGIX */
-   { 11427, -1 }, /* GetFragmentMaterialivSGIX */
-   { 16693, -1 }, /* GetFragmentMaterialfvSGIX */
-   { 20159, -1 }, /* FragmentLightModelfSGIX */
-   { 20477, -1 }, /* FragmentColorMaterialSGIX */
-   { 20894, -1 }, /* FragmentMaterialiSGIX */
-   { 22189, -1 }, /* LightEnviSGIX */
-   { 23875, -1 }, /* FragmentLightModelfvSGIX */
-   { 24210, -1 }, /* FragmentLightfvSGIX */
-   { 29314, -1 }, /* FragmentLightModelivSGIX */
-   { 29463, -1 }, /* FragmentLightfSGIX */
-   { 32354, -1 }, /* GetFragmentLightfvSGIX */
-   { 34109, -1 }, /* FragmentMaterialivSGIX */
+   {  2698, -1 }, /* FragmentMaterialfvSGIX */
+   {  5625, -1 }, /* FragmentLightiSGIX */
+   {  8439, -1 }, /* FragmentMaterialfSGIX */
+   {  8576, -1 }, /* GetFragmentLightivSGIX */
+   {  9449, -1 }, /* FragmentLightModeliSGIX */
+   { 11089, -1 }, /* FragmentLightivSGIX */
+   { 11396, -1 }, /* GetFragmentMaterialivSGIX */
+   { 16733, -1 }, /* GetFragmentMaterialfvSGIX */
+   { 20313, -1 }, /* FragmentLightModelfSGIX */
+   { 20631, -1 }, /* FragmentColorMaterialSGIX */
+   { 21048, -1 }, /* FragmentMaterialiSGIX */
+   { 22343, -1 }, /* LightEnviSGIX */
+   { 24029, -1 }, /* FragmentLightModelfvSGIX */
+   { 24364, -1 }, /* FragmentLightfvSGIX */
+   { 29384, -1 }, /* FragmentLightModelivSGIX */
+   { 29533, -1 }, /* FragmentLightfSGIX */
+   { 32463, -1 }, /* GetFragmentLightfvSGIX */
+   { 34151, -1 }, /* FragmentMaterialivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_framezoom)
 static const struct gl_function_remap GL_SGIX_framezoom_functions[] = {
-   { 23181, -1 }, /* FrameZoomSGIX */
+   { 23335, -1 }, /* FrameZoomSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_igloo_interface)
 static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
-   { 29771, -1 }, /* IglooInterfaceSGIX */
+   { 29841, -1 }, /* IglooInterfaceSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_instruments)
 static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
-   {  2917, -1 }, /* ReadInstrumentsSGIX */
-   {  6935, -1 }, /* PollInstrumentsSGIX */
-   { 10978, -1 }, /* GetInstrumentsSGIX */
-   { 13420, -1 }, /* StartInstrumentsSGIX */
-   { 16418, -1 }, /* StopInstrumentsSGIX */
-   { 18383, -1 }, /* InstrumentsBufferSGIX */
+   {  2878, -1 }, /* ReadInstrumentsSGIX */
+   {  6904, -1 }, /* PollInstrumentsSGIX */
+   { 10947, -1 }, /* GetInstrumentsSGIX */
+   { 13389, -1 }, /* StartInstrumentsSGIX */
+   { 16458, -1 }, /* StopInstrumentsSGIX */
+   { 18495, -1 }, /* InstrumentsBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_list_priority)
 static const struct gl_function_remap GL_SGIX_list_priority_functions[] = {
-   {  1265, -1 }, /* ListParameterfSGIX */
-   {  3243, -1 }, /* GetListParameterfvSGIX */
-   { 18248, -1 }, /* ListParameteriSGIX */
-   { 19365, -1 }, /* ListParameterfvSGIX */
-   { 21560, -1 }, /* ListParameterivSGIX */
-   { 33670, -1 }, /* GetListParameterivSGIX */
+   {  1226, -1 }, /* ListParameterfSGIX */
+   {  3165, -1 }, /* GetListParameterfvSGIX */
+   { 18360, -1 }, /* ListParameteriSGIX */
+   { 19519, -1 }, /* ListParameterfvSGIX */
+   { 21714, -1 }, /* ListParameterivSGIX */
+   { 33712, -1 }, /* GetListParameterivSGIX */
    {    -1, -1 }
 };
 #endif
@@ -6575,134 +6580,134 @@ 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[] = {
-   {  2959, -1 }, /* DeformationMap3dSGIX */
-   {  3839, -1 }, /* LoadIdentityDeformationMapSGIX */
-   { 16518, -1 }, /* DeformSGIX */
-   { 25144, -1 }, /* DeformationMap3fSGIX */
+   {  3761, -1 }, /* LoadIdentityDeformationMapSGIX */
+   { 16558, -1 }, /* DeformSGIX */
+   { 25298, -1 }, /* DeformationMap3fSGIX */
+   { 32351, -1 }, /* DeformationMap3dSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_reference_plane)
 static const struct gl_function_remap GL_SGIX_reference_plane_functions[] = {
-   { 15222, -1 }, /* ReferencePlaneSGIX */
+   { 15262, -1 }, /* ReferencePlaneSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_sprite)
 static const struct gl_function_remap GL_SGIX_sprite_functions[] = {
-   {  9978, -1 }, /* SpriteParameterfvSGIX */
-   { 21349, -1 }, /* SpriteParameteriSGIX */
-   { 27529, -1 }, /* SpriteParameterfSGIX */
-   { 30441, -1 }, /* SpriteParameterivSGIX */
+   {  9947, -1 }, /* SpriteParameterfvSGIX */
+   { 21503, -1 }, /* SpriteParameteriSGIX */
+   { 27683, -1 }, /* SpriteParameterfSGIX */
+   { 30511, -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[] = {
-   { 21408, -1 }, /* TagSampleBufferSGIX */
+   { 21562, -1 }, /* TagSampleBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGI_color_table)
 static const struct gl_function_remap GL_SGI_color_table_functions[] = {
-   {  8006, _gloffset_ColorTableParameteriv },
-   {  8728, _gloffset_ColorTable },
-   { 15718, _gloffset_GetColorTable },
-   { 15828, _gloffset_CopyColorTable },
-   { 20103, _gloffset_ColorTableParameterfv },
-   { 23783, _gloffset_GetColorTableParameterfv },
-   { 25947, _gloffset_GetColorTableParameteriv },
+   {  7975, _gloffset_ColorTableParameteriv },
+   {  8697, _gloffset_ColorTable },
+   { 15758, _gloffset_GetColorTable },
+   { 15868, _gloffset_CopyColorTable },
+   { 20257, _gloffset_ColorTableParameterfv },
+   { 23937, _gloffset_GetColorTableParameterfv },
+   { 26101, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUNX_constant_data)
 static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
-   { 32332, -1 }, /* FinishTextureSUNX */
+   { 32441, -1 }, /* FinishTextureSUNX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_global_alpha)
 static const struct gl_function_remap GL_SUN_global_alpha_functions[] = {
-   {  3562, -1 }, /* GlobalAlphaFactorubSUN */
-   {  5075, -1 }, /* GlobalAlphaFactoriSUN */
-   {  6960, -1 }, /* GlobalAlphaFactordSUN */
-   { 10062, -1 }, /* GlobalAlphaFactoruiSUN */
-   { 10569, -1 }, /* GlobalAlphaFactorbSUN */
-   { 13735, -1 }, /* GlobalAlphaFactorfSUN */
-   { 13899, -1 }, /* GlobalAlphaFactorusSUN */
-   { 23470, -1 }, /* GlobalAlphaFactorsSUN */
+   {  3484, -1 }, /* GlobalAlphaFactorubSUN */
+   {  5002, -1 }, /* GlobalAlphaFactoriSUN */
+   {  6929, -1 }, /* GlobalAlphaFactordSUN */
+   { 10031, -1 }, /* GlobalAlphaFactoruiSUN */
+   { 10538, -1 }, /* GlobalAlphaFactorbSUN */
+   { 13704, -1 }, /* GlobalAlphaFactorfSUN */
+   { 13868, -1 }, /* GlobalAlphaFactorusSUN */
+   { 23624, -1 }, /* GlobalAlphaFactorsSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_mesh_array)
 static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
-   { 30232, -1 }, /* DrawMeshArraysSUN */
+   { 30302, -1 }, /* DrawMeshArraysSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_triangle_list)
 static const struct gl_function_remap GL_SUN_triangle_list_functions[] = {
-   {  4696, -1 }, /* ReplacementCodeubSUN */
-   {  6719, -1 }, /* ReplacementCodeubvSUN */
-   { 19824, -1 }, /* ReplacementCodeusvSUN */
-   { 20012, -1 }, /* ReplacementCodePointerSUN */
-   { 22253, -1 }, /* ReplacementCodeuiSUN */
-   { 23132, -1 }, /* ReplacementCodeusSUN */
-   { 30898, -1 }, /* ReplacementCodeuivSUN */
+   {  4623, -1 }, /* ReplacementCodeubSUN */
+   {  6688, -1 }, /* ReplacementCodeubvSUN */
+   { 19978, -1 }, /* ReplacementCodeusvSUN */
+   { 20166, -1 }, /* ReplacementCodePointerSUN */
+   { 22407, -1 }, /* ReplacementCodeuiSUN */
+   { 23286, -1 }, /* ReplacementCodeusSUN */
+   { 30968, -1 }, /* ReplacementCodeuivSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_vertex)
 static const struct gl_function_remap GL_SUN_vertex_functions[] = {
-   {  1139, -1 }, /* ReplacementCodeuiColor3fVertex3fvSUN */
-   {  1337, -1 }, /* TexCoord4fColor4fNormal3fVertex4fvSUN */
-   {  1591, -1 }, /* TexCoord2fColor4ubVertex3fvSUN */
-   {  1960, -1 }, /* ReplacementCodeuiVertex3fvSUN */
-   {  2094, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fvSUN */
-   {  2673, -1 }, /* ReplacementCodeuiNormal3fVertex3fSUN */
-   {  3052, -1 }, /* Color4ubVertex3fvSUN */
-   {  4880, -1 }, /* Color4ubVertex3fSUN */
-   {  5003, -1 }, /* TexCoord2fVertex3fSUN */
-   {  5421, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
-   {  5898, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
-   {  6614, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
-   {  7394, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
-   {  7753, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
-   {  9279, -1 }, /* Color3fVertex3fSUN */
-   { 10478, -1 }, /* Color3fVertex3fvSUN */
-   { 10943, -1 }, /* Color4fNormal3fVertex3fvSUN */
-   { 11772, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 13283, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
-   { 14838, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
-   { 15364, -1 }, /* TexCoord2fColor3fVertex3fSUN */
-   { 16443, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
-   { 16885, -1 }, /* Color4ubVertex2fvSUN */
-   { 17177, -1 }, /* Normal3fVertex3fSUN */
-   { 18324, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
-   { 18676, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 18983, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
-   { 19617, -1 }, /* TexCoord2fVertex3fvSUN */
-   { 20447, -1 }, /* Color4ubVertex2fSUN */
-   { 20685, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
-   { 22719, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
-   { 23200, -1 }, /* Normal3fVertex3fvSUN */
-   { 23692, -1 }, /* Color4fNormal3fVertex3fSUN */
-   { 24693, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
-   { 26850, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
-   { 28273, -1 }, /* TexCoord4fVertex4fSUN */
-   { 28719, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
-   { 29158, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
-   { 29285, -1 }, /* TexCoord4fVertex4fvSUN */
-   { 30019, -1 }, /* ReplacementCodeuiVertex3fSUN */
+   {  1100, -1 }, /* ReplacementCodeuiColor3fVertex3fvSUN */
+   {  1298, -1 }, /* TexCoord4fColor4fNormal3fVertex4fvSUN */
+   {  1552, -1 }, /* TexCoord2fColor4ubVertex3fvSUN */
+   {  1921, -1 }, /* ReplacementCodeuiVertex3fvSUN */
+   {  2055, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fvSUN */
+   {  2634, -1 }, /* ReplacementCodeuiNormal3fVertex3fSUN */
+   {  2974, -1 }, /* Color4ubVertex3fvSUN */
+   {  4807, -1 }, /* Color4ubVertex3fSUN */
+   {  4930, -1 }, /* TexCoord2fVertex3fSUN */
+   {  5348, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
+   {  5825, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
+   {  6583, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
+   {  7363, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
+   {  7722, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
+   {  9248, -1 }, /* Color3fVertex3fSUN */
+   { 10447, -1 }, /* Color3fVertex3fvSUN */
+   { 10912, -1 }, /* Color4fNormal3fVertex3fvSUN */
+   { 11741, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 13252, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
+   { 14878, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
+   { 15404, -1 }, /* TexCoord2fColor3fVertex3fSUN */
+   { 16483, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
+   { 16925, -1 }, /* Color4ubVertex2fvSUN */
+   { 17289, -1 }, /* Normal3fVertex3fSUN */
+   { 18436, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
+   { 18788, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 19095, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
+   { 19771, -1 }, /* TexCoord2fVertex3fvSUN */
+   { 20601, -1 }, /* Color4ubVertex2fSUN */
+   { 20839, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
+   { 22873, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
+   { 23354, -1 }, /* Normal3fVertex3fvSUN */
+   { 23846, -1 }, /* Color4fNormal3fVertex3fSUN */
+   { 24847, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
+   { 27004, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
+   { 28395, -1 }, /* TexCoord4fVertex4fSUN */
+   { 28841, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
+   { 29228, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
+   { 29355, -1 }, /* TexCoord4fVertex4fvSUN */
+   { 30089, -1 }, /* ReplacementCodeuiVertex3fSUN */
    {    -1, -1 }
 };
 #endif
@@ -6710,40 +6715,40 @@ 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[] = {
-   {   464, _gloffset_MultiTexCoord3sARB },
-   {   696, _gloffset_ActiveTextureARB },
-   {  4451, _gloffset_MultiTexCoord1fvARB },
-   {  6505, _gloffset_MultiTexCoord3dARB },
-   {  6550, _gloffset_MultiTexCoord2iARB },
-   {  6674, _gloffset_MultiTexCoord2svARB },
-   {  8684, _gloffset_MultiTexCoord2fARB },
-   { 10779, _gloffset_MultiTexCoord3fvARB },
-   { 11381, _gloffset_MultiTexCoord4sARB },
-   { 12062, _gloffset_MultiTexCoord2dvARB },
-   { 12469, _gloffset_MultiTexCoord1svARB },
-   { 12870, _gloffset_MultiTexCoord3svARB },
-   { 12931, _gloffset_MultiTexCoord4iARB },
-   { 13762, _gloffset_MultiTexCoord3iARB },
-   { 14561, _gloffset_MultiTexCoord1dARB },
-   { 14793, _gloffset_MultiTexCoord3dvARB },
-   { 16072, _gloffset_MultiTexCoord3ivARB },
-   { 16117, _gloffset_MultiTexCoord2sARB },
-   { 17577, _gloffset_MultiTexCoord4ivARB },
-   { 19743, _gloffset_ClientActiveTextureARB },
-   { 22106, _gloffset_MultiTexCoord2dARB },
-   { 22543, _gloffset_MultiTexCoord4dvARB },
-   { 22920, _gloffset_MultiTexCoord4fvARB },
-   { 23924, _gloffset_MultiTexCoord3fARB },
-   { 26541, _gloffset_MultiTexCoord4dARB },
-   { 26807, _gloffset_MultiTexCoord1sARB },
-   { 27011, _gloffset_MultiTexCoord1dvARB },
-   { 28019, _gloffset_MultiTexCoord1ivARB },
-   { 28112, _gloffset_MultiTexCoord2ivARB },
-   { 28451, _gloffset_MultiTexCoord1iARB },
-   { 29887, _gloffset_MultiTexCoord4svARB },
-   { 30511, _gloffset_MultiTexCoord1fARB },
-   { 30774, _gloffset_MultiTexCoord4fARB },
-   { 33271, _gloffset_MultiTexCoord2fvARB },
+   {   425, _gloffset_MultiTexCoord3sARB },
+   {   657, _gloffset_ActiveTextureARB },
+   {  4378, _gloffset_MultiTexCoord1fvARB },
+   {  6474, _gloffset_MultiTexCoord3dARB },
+   {  6519, _gloffset_MultiTexCoord2iARB },
+   {  6643, _gloffset_MultiTexCoord2svARB },
+   {  8653, _gloffset_MultiTexCoord2fARB },
+   { 10748, _gloffset_MultiTexCoord3fvARB },
+   { 11350, _gloffset_MultiTexCoord4sARB },
+   { 12031, _gloffset_MultiTexCoord2dvARB },
+   { 12438, _gloffset_MultiTexCoord1svARB },
+   { 12839, _gloffset_MultiTexCoord3svARB },
+   { 12900, _gloffset_MultiTexCoord4iARB },
+   { 13731, _gloffset_MultiTexCoord3iARB },
+   { 14601, _gloffset_MultiTexCoord1dARB },
+   { 14833, _gloffset_MultiTexCoord3dvARB },
+   { 16112, _gloffset_MultiTexCoord3ivARB },
+   { 16157, _gloffset_MultiTexCoord2sARB },
+   { 17689, _gloffset_MultiTexCoord4ivARB },
+   { 19897, _gloffset_ClientActiveTextureARB },
+   { 22260, _gloffset_MultiTexCoord2dARB },
+   { 22697, _gloffset_MultiTexCoord4dvARB },
+   { 23074, _gloffset_MultiTexCoord4fvARB },
+   { 24078, _gloffset_MultiTexCoord3fARB },
+   { 26695, _gloffset_MultiTexCoord4dARB },
+   { 26961, _gloffset_MultiTexCoord1sARB },
+   { 27165, _gloffset_MultiTexCoord1dvARB },
+   { 28141, _gloffset_MultiTexCoord1ivARB },
+   { 28234, _gloffset_MultiTexCoord2ivARB },
+   { 28573, _gloffset_MultiTexCoord1iARB },
+   { 29957, _gloffset_MultiTexCoord4svARB },
+   { 30581, _gloffset_MultiTexCoord1fARB },
+   { 30844, _gloffset_MultiTexCoord4fARB },
+   { 33313, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 #endif