glapi: regenerated files

1 files changed, 1974 insertions, 1962 deletions

diff --git a/src/mesa/main/remap_helper.h b/src/mesa/main/remap_helper.h
index a332f5da64b..f826f77053d 100644
--- a/src/mesa/main/remap_helper.h
+++ b/src/mesa/main/remap_helper.h
@@ -70,4686 +70,4690 @@ 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]: VertexAttribI1ivEXT (will be remapped) */
+   /* _mesa_function_pool[965]: VertexAttribI1ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1ivEXT\0"
    "glVertexAttribI1iv\0"
    "\0"
-   /* _mesa_function_pool[1049]: TexImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[1010]: TexImage4DSGIS (dynamic) */
    "iiiiiiiiiip\0"
    "glTexImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[1079]: PolygonStipple (offset 175) */
+   /* _mesa_function_pool[1040]: PolygonStipple (offset 175) */
    "p\0"
    "glPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[1099]: WindowPos2dvMESA (will be remapped) */
+   /* _mesa_function_pool[1060]: WindowPos2dvMESA (will be remapped) */
    "p\0"
    "glWindowPos2dv\0"
    "glWindowPos2dvARB\0"
    "glWindowPos2dvMESA\0"
    "\0"
-   /* _mesa_function_pool[1154]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1115]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1198]: BlendEquationSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[1159]: BlendEquationSeparateEXT (will be remapped) */
    "ii\0"
    "glBlendEquationSeparate\0"
    "glBlendEquationSeparateEXT\0"
    "glBlendEquationSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[1280]: ListParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[1241]: ListParameterfSGIX (dynamic) */
    "iif\0"
    "glListParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[1306]: SecondaryColor3bEXT (will be remapped) */
+   /* _mesa_function_pool[1267]: SecondaryColor3bEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3b\0"
    "glSecondaryColor3bEXT\0"
    "\0"
-   /* _mesa_function_pool[1352]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[1313]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1398]: GetPixelMapfv (offset 271) */
+   /* _mesa_function_pool[1359]: GetPixelMapfv (offset 271) */
    "ip\0"
    "glGetPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[1418]: Color3uiv (offset 22) */
+   /* _mesa_function_pool[1379]: Color3uiv (offset 22) */
    "p\0"
    "glColor3uiv\0"
    "\0"
-   /* _mesa_function_pool[1433]: IsEnabled (offset 286) */
+   /* _mesa_function_pool[1394]: IsEnabled (offset 286) */
    "i\0"
    "glIsEnabled\0"
    "\0"
-   /* _mesa_function_pool[1448]: VertexAttrib4svNV (will be remapped) */
+   /* _mesa_function_pool[1409]: VertexAttrib4svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4svNV\0"
    "\0"
-   /* _mesa_function_pool[1472]: EvalCoord2fv (offset 235) */
+   /* _mesa_function_pool[1433]: EvalCoord2fv (offset 235) */
    "p\0"
    "glEvalCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[1490]: GetBufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1451]: GetBufferSubDataARB (will be remapped) */
    "iiip\0"
    "glGetBufferSubData\0"
    "glGetBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1537]: BufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1498]: BufferSubDataARB (will be remapped) */
    "iiip\0"
    "glBufferSubData\0"
    "glBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1578]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1539]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1616]: AttachShader (will be remapped) */
+   /* _mesa_function_pool[1577]: AttachShader (will be remapped) */
    "ii\0"
    "glAttachShader\0"
    "\0"
-   /* _mesa_function_pool[1635]: VertexAttrib2fARB (will be remapped) */
+   /* _mesa_function_pool[1596]: VertexAttrib2fARB (will be remapped) */
    "iff\0"
    "glVertexAttrib2f\0"
    "glVertexAttrib2fARB\0"
    "\0"
-   /* _mesa_function_pool[1677]: GetDebugLogLengthMESA (dynamic) */
+   /* _mesa_function_pool[1638]: GetDebugLogLengthMESA (dynamic) */
    "iii\0"
    "glGetDebugLogLengthMESA\0"
    "\0"
-   /* _mesa_function_pool[1706]: GetMapiv (offset 268) */
+   /* _mesa_function_pool[1667]: GetMapiv (offset 268) */
    "iip\0"
    "glGetMapiv\0"
    "\0"
-   /* _mesa_function_pool[1722]: VertexAttrib3fARB (will be remapped) */
+   /* _mesa_function_pool[1683]: VertexAttrib3fARB (will be remapped) */
    "ifff\0"
    "glVertexAttrib3f\0"
    "glVertexAttrib3fARB\0"
    "\0"
-   /* _mesa_function_pool[1765]: Indexubv (offset 316) */
+   /* _mesa_function_pool[1726]: Indexubv (offset 316) */
    "p\0"
    "glIndexubv\0"
    "\0"
-   /* _mesa_function_pool[1779]: GetQueryivARB (will be remapped) */
+   /* _mesa_function_pool[1740]: GetQueryivARB (will be remapped) */
    "iip\0"
    "glGetQueryiv\0"
    "glGetQueryivARB\0"
    "\0"
-   /* _mesa_function_pool[1813]: TexImage3D (offset 371) */
+   /* _mesa_function_pool[1774]: TexImage3D (offset 371) */
    "iiiiiiiiip\0"
    "glTexImage3D\0"
    "glTexImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[1854]: BindFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[1815]: BindFragDataLocationEXT (will be remapped) */
    "iip\0"
    "glBindFragDataLocationEXT\0"
    "glBindFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[1908]: ReplacementCodeuiVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1869]: ReplacementCodeuiVertex3fvSUN (dynamic) */
    "pp\0"
    "glReplacementCodeuiVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1944]: EdgeFlagPointer (offset 312) */
+   /* _mesa_function_pool[1905]: EdgeFlagPointer (offset 312) */
    "ip\0"
    "glEdgeFlagPointer\0"
    "\0"
-   /* _mesa_function_pool[1966]: Color3ubv (offset 20) */
+   /* _mesa_function_pool[1927]: Color3ubv (offset 20) */
    "p\0"
    "glColor3ubv\0"
    "\0"
-   /* _mesa_function_pool[1981]: GetQueryObjectivARB (will be remapped) */
+   /* _mesa_function_pool[1942]: GetQueryObjectivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectiv\0"
    "glGetQueryObjectivARB\0"
    "\0"
-   /* _mesa_function_pool[2027]: Vertex3dv (offset 135) */
+   /* _mesa_function_pool[1988]: Vertex3dv (offset 135) */
    "p\0"
    "glVertex3dv\0"
    "\0"
-   /* _mesa_function_pool[2042]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2003]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2089]: CompressedTexSubImage2DARB (will be remapped) */
+   /* _mesa_function_pool[2050]: CompressedTexSubImage2DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexSubImage2D\0"
    "glCompressedTexSubImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[2155]: CombinerOutputNV (will be remapped) */
+   /* _mesa_function_pool[2116]: CombinerOutputNV (will be remapped) */
    "iiiiiiiiii\0"
    "glCombinerOutputNV\0"
    "\0"
-   /* _mesa_function_pool[2186]: VertexAttribs3fvNV (will be remapped) */
+   /* _mesa_function_pool[2147]: VertexAttribs3fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3fvNV\0"
    "\0"
-   /* _mesa_function_pool[2212]: Uniform2fARB (will be remapped) */
+   /* _mesa_function_pool[2173]: Uniform2fARB (will be remapped) */
    "iff\0"
    "glUniform2f\0"
    "glUniform2fARB\0"
    "\0"
-   /* _mesa_function_pool[2244]: LightModeliv (offset 166) */
+   /* _mesa_function_pool[2205]: LightModeliv (offset 166) */
    "ip\0"
    "glLightModeliv\0"
    "\0"
-   /* _mesa_function_pool[2263]: VertexAttrib1svARB (will be remapped) */
+   /* _mesa_function_pool[2224]: VertexAttrib1svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1sv\0"
    "glVertexAttrib1svARB\0"
    "\0"
-   /* _mesa_function_pool[2306]: VertexAttribs1dvNV (will be remapped) */
+   /* _mesa_function_pool[2267]: VertexAttribs1dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1dvNV\0"
    "\0"
-   /* _mesa_function_pool[2332]: Uniform2ivARB (will be remapped) */
+   /* _mesa_function_pool[2293]: Uniform2ivARB (will be remapped) */
    "iip\0"
    "glUniform2iv\0"
    "glUniform2ivARB\0"
    "\0"
-   /* _mesa_function_pool[2366]: GetImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[2327]: GetImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[2404]: Normal3bv (offset 53) */
+   /* _mesa_function_pool[2365]: Normal3bv (offset 53) */
    "p\0"
    "glNormal3bv\0"
    "\0"
-   /* _mesa_function_pool[2419]: TexGeniv (offset 193) */
+   /* _mesa_function_pool[2380]: TexGeniv (offset 193) */
    "iip\0"
    "glTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[2435]: WeightubvARB (dynamic) */
+   /* _mesa_function_pool[2396]: WeightubvARB (dynamic) */
    "ip\0"
    "glWeightubvARB\0"
    "\0"
-   /* _mesa_function_pool[2454]: VertexAttrib1fvNV (will be remapped) */
+   /* _mesa_function_pool[2415]: VertexAttrib1fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1fvNV\0"
    "\0"
-   /* _mesa_function_pool[2478]: Vertex3iv (offset 139) */
+   /* _mesa_function_pool[2439]: Vertex3iv (offset 139) */
    "p\0"
    "glVertex3iv\0"
    "\0"
-   /* _mesa_function_pool[2493]: CopyConvolutionFilter1D (offset 354) */
+   /* _mesa_function_pool[2454]: CopyConvolutionFilter1D (offset 354) */
    "iiiii\0"
    "glCopyConvolutionFilter1D\0"
    "glCopyConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[2555]: VertexAttribI1uiEXT (will be remapped) */
+   /* _mesa_function_pool[2516]: VertexAttribI1uiEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1uiEXT\0"
    "glVertexAttribI1ui\0"
    "\0"
-   /* _mesa_function_pool[2600]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[2561]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[2648]: DeleteSync (will be remapped) */
+   /* _mesa_function_pool[2609]: DeleteSync (will be remapped) */
    "i\0"
    "glDeleteSync\0"
    "\0"
-   /* _mesa_function_pool[2664]: FragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[2625]: FragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[2694]: BlendColor (offset 336) */
+   /* _mesa_function_pool[2655]: BlendColor (offset 336) */
    "ffff\0"
    "glBlendColor\0"
    "glBlendColorEXT\0"
    "\0"
-   /* _mesa_function_pool[2729]: UniformMatrix4fvARB (will be remapped) */
+   /* _mesa_function_pool[2690]: UniformMatrix4fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix4fv\0"
    "glUniformMatrix4fvARB\0"
    "\0"
-   /* _mesa_function_pool[2776]: DeleteVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[2737]: DeleteVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glDeleteVertexArrays\0"
    "glDeleteVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[2827]: TexBuffer (will be remapped) */
+   /* _mesa_function_pool[2788]: TexBuffer (will be remapped) */
    "iii\0"
    "glTexBuffer\0"
    "\0"
-   /* _mesa_function_pool[2844]: ReadInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[2805]: ReadInstrumentsSGIX (dynamic) */
    "i\0"
    "glReadInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[2869]: CallLists (offset 3) */
+   /* _mesa_function_pool[2830]: CallLists (offset 3) */
    "iip\0"
    "glCallLists\0"
    "\0"
-   /* _mesa_function_pool[2886]: UniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[2847]: UniformMatrix2x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x4fv\0"
    "\0"
-   /* _mesa_function_pool[2913]: Color4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2874]: Color4ubVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2940]: Normal3iv (offset 59) */
+   /* _mesa_function_pool[2901]: Normal3iv (offset 59) */
    "p\0"
    "glNormal3iv\0"
    "\0"
-   /* _mesa_function_pool[2955]: PassThrough (offset 199) */
+   /* _mesa_function_pool[2916]: PassThrough (offset 199) */
    "f\0"
    "glPassThrough\0"
    "\0"
-   /* _mesa_function_pool[2972]: GetVertexAttribIivEXT (will be remapped) */
+   /* _mesa_function_pool[2933]: GetVertexAttribIivEXT (will be remapped) */
    "iip\0"
    "glGetVertexAttribIivEXT\0"
    "glGetVertexAttribIiv\0"
    "\0"
-   /* _mesa_function_pool[3022]: TexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[2983]: TexParameterIivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIivEXT\0"
    "glTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[3066]: FramebufferTextureLayerEXT (will be remapped) */
+   /* _mesa_function_pool[3027]: FramebufferTextureLayerEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[3128]: GetListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[3089]: GetListParameterfvSGIX (dynamic) */
    "iip\0"
    "glGetListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[3158]: Viewport (offset 305) */
+   /* _mesa_function_pool[3119]: Viewport (offset 305) */
    "iiii\0"
    "glViewport\0"
    "\0"
-   /* _mesa_function_pool[3175]: VertexAttrib4NusvARB (will be remapped) */
+   /* _mesa_function_pool[3136]: VertexAttrib4NusvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nusv\0"
    "glVertexAttrib4NusvARB\0"
    "\0"
-   /* _mesa_function_pool[3222]: WindowPos4svMESA (will be remapped) */
+   /* _mesa_function_pool[3183]: WindowPos4svMESA (will be remapped) */
    "p\0"
    "glWindowPos4svMESA\0"
    "\0"
-   /* _mesa_function_pool[3244]: CreateProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[3205]: CreateProgramObjectARB (will be remapped) */
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[3271]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[3232]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
    "glDeleteTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[3302]: UniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[3263]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[3329]: PrioritizeTextures (offset 331) */
+   /* _mesa_function_pool[3290]: PrioritizeTextures (offset 331) */
    "ipp\0"
    "glPrioritizeTextures\0"
    "glPrioritizeTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[3379]: VertexAttribI3uiEXT (will be remapped) */
+   /* _mesa_function_pool[3340]: VertexAttribI3uiEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3uiEXT\0"
    "glVertexAttribI3ui\0"
    "\0"
-   /* _mesa_function_pool[3426]: AsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[3387]: AsyncMarkerSGIX (dynamic) */
    "i\0"
    "glAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[3447]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[3408]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[3475]: ClearColorIuiEXT (will be remapped) */
+   /* _mesa_function_pool[3436]: ClearColorIuiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIuiEXT\0"
    "\0"
-   /* _mesa_function_pool[3500]: ClearDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[3461]: ClearDebugLogMESA (dynamic) */
    "iii\0"
    "glClearDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[3525]: Uniform4uiEXT (will be remapped) */
+   /* _mesa_function_pool[3486]: Uniform4uiEXT (will be remapped) */
    "iiiii\0"
    "glUniform4uiEXT\0"
    "glUniform4ui\0"
    "\0"
-   /* _mesa_function_pool[3561]: ResetHistogram (offset 369) */
+   /* _mesa_function_pool[3522]: ResetHistogram (offset 369) */
    "i\0"
    "glResetHistogram\0"
    "glResetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[3601]: GetProgramNamedParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[3562]: GetProgramNamedParameterfvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[3638]: PointParameterfEXT (will be remapped) */
+   /* _mesa_function_pool[3599]: PointParameterfEXT (will be remapped) */
    "if\0"
    "glPointParameterf\0"
    "glPointParameterfARB\0"
    "glPointParameterfEXT\0"
    "glPointParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[3724]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[3685]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[3760]: GenFencesNV (will be remapped) */
+   /* _mesa_function_pool[3721]: GenFencesNV (will be remapped) */
    "ip\0"
    "glGenFencesNV\0"
    "\0"
-   /* _mesa_function_pool[3778]: ImageTransformParameterfHP (dynamic) */
+   /* _mesa_function_pool[3739]: ImageTransformParameterfHP (dynamic) */
    "iif\0"
    "glImageTransformParameterfHP\0"
    "\0"
-   /* _mesa_function_pool[3812]: MatrixIndexusvARB (dynamic) */
+   /* _mesa_function_pool[3773]: MatrixIndexusvARB (dynamic) */
    "ip\0"
    "glMatrixIndexusvARB\0"
    "\0"
-   /* _mesa_function_pool[3836]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[3797]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[3868]: DisableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[3829]: DisableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[3928]: TexCoord2sv (offset 109) */
+   /* _mesa_function_pool[3889]: TexCoord2sv (offset 109) */
    "p\0"
    "glTexCoord2sv\0"
    "\0"
-   /* _mesa_function_pool[3945]: Vertex4dv (offset 143) */
+   /* _mesa_function_pool[3906]: Vertex4dv (offset 143) */
    "p\0"
    "glVertex4dv\0"
    "\0"
-   /* _mesa_function_pool[3960]: StencilMaskSeparate (will be remapped) */
+   /* _mesa_function_pool[3921]: StencilMaskSeparate (will be remapped) */
    "ii\0"
    "glStencilMaskSeparate\0"
    "\0"
-   /* _mesa_function_pool[3986]: ProgramLocalParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[3947]: ProgramLocalParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramLocalParameter4dARB\0"
    "\0"
-   /* _mesa_function_pool[4023]: CompressedTexImage3DARB (will be remapped) */
+   /* _mesa_function_pool[3984]: CompressedTexImage3DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexImage3D\0"
    "glCompressedTexImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[4083]: Color3sv (offset 18) */
+   /* _mesa_function_pool[4044]: Color3sv (offset 18) */
    "p\0"
    "glColor3sv\0"
    "\0"
-   /* _mesa_function_pool[4097]: GetConvolutionParameteriv (offset 358) */
+   /* _mesa_function_pool[4058]: GetConvolutionParameteriv (offset 358) */
    "iip\0"
    "glGetConvolutionParameteriv\0"
    "glGetConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[4161]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[4122]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[4202]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[4163]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[4217]: TestFenceNV (will be remapped) */
+   /* _mesa_function_pool[4178]: TestFenceNV (will be remapped) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[4234]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[4195]: GetVertexAttribIuivEXT (will be remapped) */
+   "iip\0"
+   "glGetVertexAttribIuivEXT\0"
+   "glGetVertexAttribIuiv\0"
+   "\0"
+   /* _mesa_function_pool[4247]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[4279]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[4292]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[4296]: Uniform2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4309]: Uniform2uivEXT (will be remapped) */
    "iip\0"
    "glUniform2uivEXT\0"
    "glUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[4332]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[4345]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[4366]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[4379]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4404]: GetPixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[4417]: GetPixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[4440]: Color3fv (offset 14) */
+   /* _mesa_function_pool[4453]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[4454]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[4467]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[4480]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[4493]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[4506]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[4519]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[4527]: GetDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[4540]: GetDebugLogMESA (dynamic) */
    "iiiipp\0"
    "glGetDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[4553]: FogCoorddEXT (will be remapped) */
+   /* _mesa_function_pool[4566]: FogCoorddEXT (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[4583]: BeginConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[4596]: BeginConditionalRenderNV (will be remapped) */
    "ii\0"
    "glBeginConditionalRenderNV\0"
    "glBeginConditionalRender\0"
    "\0"
-   /* _mesa_function_pool[4639]: Color4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4652]: Color4ubVertex3fSUN (dynamic) */
    "iiiifff\0"
    "glColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4670]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[4683]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[4700]: PointSize (offset 173) */
+   /* _mesa_function_pool[4713]: PointSize (offset 173) */
    "f\0"
    "glPointSize\0"
    "\0"
-   /* _mesa_function_pool[4715]: VertexAttribI2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4728]: VertexAttribI2uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2uivEXT\0"
    "glVertexAttribI2uiv\0"
    "\0"
-   /* _mesa_function_pool[4762]: TexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4775]: TexCoord2fVertex3fSUN (dynamic) */
    "fffff\0"
    "glTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4793]: PopName (offset 200) */
+   /* _mesa_function_pool[4806]: PopName (offset 200) */
    "\0"
    "glPopName\0"
    "\0"
-   /* _mesa_function_pool[4805]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[4818]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[4832]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[4845]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[4856]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[4869]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[4882]: VertexAttrib4NbvARB (will be remapped) */
+   /* _mesa_function_pool[4895]: VertexAttrib4NbvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[4927]: GetActiveAttribARB (will be remapped) */
+   /* _mesa_function_pool[4940]: GetActiveAttribARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[4975]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[4988]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[4990]: VertexAttrib4ubNV (will be remapped) */
+   /* _mesa_function_pool[5003]: VertexAttrib4ubNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4ubNV\0"
    "\0"
-   /* _mesa_function_pool[5017]: ClampColor (will be remapped) */
+   /* _mesa_function_pool[5030]: ClampColor (will be remapped) */
    "ii\0"
    "glClampColor\0"
    "\0"
-   /* _mesa_function_pool[5034]: TextureRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[5047]: TextureRangeAPPLE (will be remapped) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[5059]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[5072]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[5078]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5091]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5106]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5119]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5159]: Indexub (offset 315) */
+   /* _mesa_function_pool[5172]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[5172]: ColorMaskIndexedEXT (will be remapped) */
-   "iiiii\0"
-   "glColorMaskIndexedEXT\0"
-   "glColorMaski\0"
-   "\0"
-   /* _mesa_function_pool[5214]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[5185]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[5229]: GetClipPlane (offset 259) */
+   /* _mesa_function_pool[5200]: GetClipPlane (offset 259) */
    "ip\0"
    "glGetClipPlane\0"
    "\0"
-   /* _mesa_function_pool[5248]: CombinerParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[5219]: CombinerParameterfvNV (will be remapped) */
    "ip\0"
    "glCombinerParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[5276]: VertexAttribs3dvNV (will be remapped) */
+   /* _mesa_function_pool[5247]: VertexAttribs3dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3dvNV\0"
    "\0"
-   /* _mesa_function_pool[5302]: VertexAttribI2uiEXT (will be remapped) */
+   /* _mesa_function_pool[5273]: VertexAttribI2uiEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2uiEXT\0"
    "glVertexAttribI2ui\0"
    "\0"
-   /* _mesa_function_pool[5348]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[5319]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[5374]: VertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[5345]: VertexArrayRangeNV (will be remapped) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[5399]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[5370]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[5425]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[5396]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[5448]: VertexAttribI4uivEXT (will be remapped) */
+   /* _mesa_function_pool[5419]: VertexAttribI4uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4uivEXT\0"
    "glVertexAttribI4uiv\0"
    "\0"
-   /* _mesa_function_pool[5495]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[5466]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[5514]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[5485]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[5543]: Scaled (offset 301) */
+   /* _mesa_function_pool[5514]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[5557]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5528]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5585]: Scalef (offset 302) */
+   /* _mesa_function_pool[5556]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[5599]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[5570]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[5637]: MultTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[5608]: MultTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[5689]: ObjectUnpurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[5660]: ColorMaskIndexedEXT (will be remapped) */
+   "iiiii\0"
+   "glColorMaskIndexedEXT\0"
+   "glColorMaski\0"
+   "\0"
+   /* _mesa_function_pool[5702]: ObjectUnpurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectUnpurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[5719]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[5732]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[5735]: WindowPos2svMESA (will be remapped) */
+   /* _mesa_function_pool[5748]: WindowPos2svMESA (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[5790]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[5803]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[5804]: TexCoord2iv (offset 107) */
+   /* _mesa_function_pool[5817]: TexCoord2iv (offset 107) */
    "p\0"
    "glTexCoord2iv\0"
    "\0"
-   /* _mesa_function_pool[5821]: CompressedTexImage1DARB (will be remapped) */
+   /* _mesa_function_pool[5834]: CompressedTexImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[5879]: Rotated (offset 299) */
+   /* _mesa_function_pool[5892]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[5895]: GetTexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[5908]: GetTexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIuivEXT\0"
    "glGetTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[5947]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[5960]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[5971]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[5984]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[5993]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[6006]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[6008]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[6021]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[6037]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6050]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6061]: Color4iv (offset 32) */
+   /* _mesa_function_pool[6074]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[6075]: TexParameterf (offset 178) */
+   /* _mesa_function_pool[6088]: TexParameterf (offset 178) */
    "iif\0"
    "glTexParameterf\0"
    "\0"
-   /* _mesa_function_pool[6096]: TexParameteri (offset 180) */
+   /* _mesa_function_pool[6109]: TexParameteri (offset 180) */
    "iii\0"
    "glTexParameteri\0"
    "\0"
-   /* _mesa_function_pool[6117]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6130]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6142]: MultiTexCoord3dARB (offset 392) */
+   /* _mesa_function_pool[6155]: MultiTexCoord3dARB (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[6187]: MultiTexCoord2iARB (offset 388) */
+   /* _mesa_function_pool[6200]: MultiTexCoord2iARB (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[6231]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[6244]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[6251]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[6264]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[6311]: MultiTexCoord2svARB (offset 391) */
+   /* _mesa_function_pool[6324]: MultiTexCoord2svARB (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[6356]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[6369]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[6383]: Uniform3iARB (will be remapped) */
+   /* _mesa_function_pool[6396]: Uniform3iARB (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[6416]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[6429]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[6444]: DrawElementsInstancedARB (will be remapped) */
+   /* _mesa_function_pool[6457]: DrawElementsInstancedARB (will be remapped) */
    "iiipi\0"
    "glDrawElementsInstancedARB\0"
    "glDrawElementsInstancedEXT\0"
    "glDrawElementsInstanced\0"
    "\0"
-   /* _mesa_function_pool[6529]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[6542]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[6554]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[6567]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[6572]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[6585]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[6597]: GlobalAlphaFactordSUN (dynamic) */
+   /* _mesa_function_pool[6610]: GlobalAlphaFactordSUN (dynamic) */
    "d\0"
    "glGlobalAlphaFactordSUN\0"
    "\0"
-   /* _mesa_function_pool[6624]: GetFinalCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[6637]: GetFinalCombinerInputParameterfvNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[6666]: GenerateMipmapEXT (will be remapped) */
+   /* _mesa_function_pool[6679]: GenerateMipmapEXT (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "\0"
-   /* _mesa_function_pool[6706]: GenLists (offset 5) */
+   /* _mesa_function_pool[6719]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[6720]: DepthRangef (will be remapped) */
+   /* _mesa_function_pool[6733]: DepthRangef (will be remapped) */
    "ff\0"
    "glDepthRangef\0"
    "\0"
-   /* _mesa_function_pool[6738]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[6751]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[6772]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[6785]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[6799]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[6812]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[6827]: BufferDataARB (will be remapped) */
+   /* _mesa_function_pool[6840]: BufferDataARB (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[6862]: FlushVertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[6875]: FlushVertexArrayRangeNV (will be remapped) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[6890]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[6903]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[6910]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[6923]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[6930]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[6943]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[6950]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6963]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6976]: GetTexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[6989]: GetTexFilterFuncSGIS (dynamic) */
    "iip\0"
    "glGetTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[7004]: Scissor (offset 176) */
+   /* _mesa_function_pool[7017]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[7020]: Fogf (offset 153) */
+   /* _mesa_function_pool[7033]: Fogf (offset 153) */
    "if\0"
    "glFogf\0"
    "\0"
-   /* _mesa_function_pool[7031]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[7044]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[7076]: TexSubImage1D (offset 332) */
+   /* _mesa_function_pool[7089]: TexSubImage1D (offset 332) */
    "iiiiiip\0"
    "glTexSubImage1D\0"
    "glTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[7120]: VertexAttrib1sARB (will be remapped) */
+   /* _mesa_function_pool[7133]: VertexAttrib1sARB (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[7161]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[7174]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[7177]: Color4usv (offset 40) */
+   /* _mesa_function_pool[7190]: Color4usv (offset 40) */
    "p\0"
    "glColor4usv\0"
    "\0"
-   /* _mesa_function_pool[7192]: Fogi (offset 155) */
+   /* _mesa_function_pool[7205]: Fogi (offset 155) */
    "ii\0"
    "glFogi\0"
    "\0"
-   /* _mesa_function_pool[7203]: DepthRange (offset 288) */
+   /* _mesa_function_pool[7216]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[7220]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[7233]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[7238]: FinalCombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[7251]: FinalCombinerInputNV (will be remapped) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[7267]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[7280]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[7284]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[7297]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[7302]: Color4ui (offset 37) */
+   /* _mesa_function_pool[7315]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[7319]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[7332]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[7338]: Color3usv (offset 24) */
+   /* _mesa_function_pool[7351]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[7353]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[7366]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[7373]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[7386]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[7390]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[7403]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7439]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[7452]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[7456]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[7469]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[7475]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[7488]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[7494]: Uniform1fARB (will be remapped) */
+   /* _mesa_function_pool[7507]: Uniform1fARB (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[7525]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[7538]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[7577]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[7590]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[7594]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[7607]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[7643]: ColorTableParameteriv (offset 341) */
+   /* _mesa_function_pool[7656]: ColorTableParameteriv (offset 341) */
    "iip\0"
    "glColorTableParameteriv\0"
    "glColorTableParameterivSGI\0"
    "\0"
-   /* _mesa_function_pool[7699]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[7712]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[7730]: WindowPos3dMESA (will be remapped) */
+   /* _mesa_function_pool[7743]: WindowPos3dMESA (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[7784]: Color4us (offset 39) */
+   /* _mesa_function_pool[7797]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[7801]: PointParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[7814]: PointParameterfvEXT (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[7891]: Color3bv (offset 10) */
+   /* _mesa_function_pool[7904]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[7905]: WindowPos2fvMESA (will be remapped) */
+   /* _mesa_function_pool[7918]: WindowPos2fvMESA (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[7960]: SecondaryColor3bvEXT (will be remapped) */
+   /* _mesa_function_pool[7973]: SecondaryColor3bvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[8006]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[8019]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[8036]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[8049]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[8073]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[8086]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[8102]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[8115]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[8144]: RenderbufferStorageEXT (will be remapped) */
+   /* _mesa_function_pool[8157]: RenderbufferStorageEXT (will be remapped) */
    "iiii\0"
    "glRenderbufferStorage\0"
    "glRenderbufferStorageEXT\0"
    "\0"
-   /* _mesa_function_pool[8197]: IsFenceNV (will be remapped) */
+   /* _mesa_function_pool[8210]: IsFenceNV (will be remapped) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[8212]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[8225]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[8234]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[8247]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[8264]: UniformMatrix2fvARB (will be remapped) */
+   /* _mesa_function_pool[8277]: UniformMatrix2fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[8311]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[8324]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[8355]: ColorTable (offset 339) */
+   /* _mesa_function_pool[8368]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[8408]: IndexPointer (offset 314) */
+   /* _mesa_function_pool[8421]: IndexPointer (offset 314) */
    "iip\0"
    "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[8428]: Accum (offset 213) */
+   /* _mesa_function_pool[8441]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[8440]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[8453]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[8461]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[8474]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[8493]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[8506]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[8549]: Finish (offset 216) */
+   /* _mesa_function_pool[8562]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[8560]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[8573]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[8584]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[8597]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[8602]: VertexAttrib3dvARB (will be remapped) */
+   /* _mesa_function_pool[8615]: VertexAttrib3dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[8645]: Uniform4uivEXT (will be remapped) */
+   /* _mesa_function_pool[8658]: Uniform4uivEXT (will be remapped) */
    "iip\0"
    "glUniform4uivEXT\0"
    "glUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[8681]: HintPGI (dynamic) */
+   /* _mesa_function_pool[8694]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[8695]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[8708]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[8753]: Color4s (offset 33) */
+   /* _mesa_function_pool[8766]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[8769]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[8782]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[8794]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[8807]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[8812]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[8825]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[8829]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[8842]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[8844]: CullParameterdvEXT (dynamic) */
+   /* _mesa_function_pool[8857]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[8869]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[8882]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[8906]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[8919]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[8935]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[8948]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[8992]: Color4i (offset 31) */
+   /* _mesa_function_pool[9005]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[9008]: Color4f (offset 29) */
+   /* _mesa_function_pool[9021]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[9024]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[9037]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[9042]: Color4d (offset 27) */
+   /* _mesa_function_pool[9055]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[9058]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[9071]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[9074]: Color4b (offset 25) */
+   /* _mesa_function_pool[9087]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[9090]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[9103]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[9107]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[9120]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[9137]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[9150]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[9155]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[9168]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[9213]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[9226]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[9234]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[9247]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[9253]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[9266]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[9280]: BeginTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[9293]: BeginTransformFeedbackEXT (will be remapped) */
    "i\0"
    "glBeginTransformFeedbackEXT\0"
    "glBeginTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[9336]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[9349]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[9358]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[9371]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[9374]: EndList (offset 1) */
+   /* _mesa_function_pool[9387]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[9386]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[9399]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[9410]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[9423]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[9440]: Uniform3fvARB (will be remapped) */
+   /* _mesa_function_pool[9453]: Uniform3fvARB (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[9474]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[9487]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[9492]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[9505]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[9543]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[9556]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[9562]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[9575]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[9577]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[9590]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[9605]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[9618]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[9633]: CheckFramebufferStatusEXT (will be remapped) */
+   /* _mesa_function_pool[9646]: CheckFramebufferStatusEXT (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "\0"
-   /* _mesa_function_pool[9689]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[9702]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[9717]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[9730]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[9735]: GetVertexAttribivARB (will be remapped) */
+   /* _mesa_function_pool[9748]: GetVertexAttribivARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[9783]: GetCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[9796]: GetCombinerInputParameterfvNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9822]: GetTexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[9835]: GetTexParameterIivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIivEXT\0"
    "glGetTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[9872]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[9885]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[9890]: LoadTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[9903]: LoadTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[9942]: ReleaseShaderCompiler (will be remapped) */
+   /* _mesa_function_pool[9955]: ReleaseShaderCompiler (will be remapped) */
    "\0"
    "glReleaseShaderCompiler\0"
    "\0"
-   /* _mesa_function_pool[9968]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[9981]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[10002]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[10015]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[10030]: SecondaryColor3sEXT (will be remapped) */
+   /* _mesa_function_pool[10043]: SecondaryColor3sEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[10076]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10089]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10102]: GetInteger64i_v (will be remapped) */
+   /* _mesa_function_pool[10115]: GetInteger64i_v (will be remapped) */
    "iip\0"
    "glGetInteger64i_v\0"
    "\0"
-   /* _mesa_function_pool[10125]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[10138]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[10140]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[10153]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[10167]: Color3us (offset 23) */
+   /* _mesa_function_pool[10180]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[10183]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[10196]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[10218]: VertexAttrib4ivARB (will be remapped) */
+   /* _mesa_function_pool[10231]: VertexAttrib4ivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[10261]: End (offset 43) */
+   /* _mesa_function_pool[10274]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[10269]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[10282]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[10294]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[10307]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[10320]: GetQueryObjectui64vEXT (will be remapped) */
+   /* _mesa_function_pool[10333]: GetQueryObjectui64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[10350]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[10363]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[10395]: SecondaryColor3dEXT (will be remapped) */
+   /* _mesa_function_pool[10408]: SecondaryColor3dEXT (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[10441]: Color3ub (offset 19) */
+   /* _mesa_function_pool[10454]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[10457]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[10470]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[10489]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[10502]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[10514]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10527]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10549]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[10562]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[10572]: GetUniformuivEXT (will be remapped) */
+   /* _mesa_function_pool[10585]: GetUniformuivEXT (will be remapped) */
    "iip\0"
    "glGetUniformuivEXT\0"
    "glGetUniformuiv\0"
    "\0"
-   /* _mesa_function_pool[10612]: Color3ui (offset 21) */
+   /* _mesa_function_pool[10625]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[10628]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[10641]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[10645]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[10658]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[10691]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[10704]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[10718]: GetTexParameterPointervAPPLE (will be remapped) */
+   /* _mesa_function_pool[10731]: GetTexParameterPointervAPPLE (will be remapped) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[10754]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[10767]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[10770]: GetTransformFeedbackVaryingEXT (will be remapped) */
+   /* _mesa_function_pool[10783]: GetTransformFeedbackVaryingEXT (will be remapped) */
    "iiipppp\0"
    "glGetTransformFeedbackVaryingEXT\0"
    "glGetTransformFeedbackVarying\0"
    "\0"
-   /* _mesa_function_pool[10842]: VertexAttrib4bvARB (will be remapped) */
+   /* _mesa_function_pool[10855]: VertexAttrib4bvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[10885]: ShaderBinary (will be remapped) */
+   /* _mesa_function_pool[10898]: ShaderBinary (will be remapped) */
    "ipipi\0"
    "glShaderBinary\0"
    "\0"
-   /* _mesa_function_pool[10907]: GetIntegerIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[10920]: GetIntegerIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "glGetIntegeri_v\0"
    "\0"
-   /* _mesa_function_pool[10952]: MultiTexCoord4sARB (offset 406) */
+   /* _mesa_function_pool[10965]: MultiTexCoord4sARB (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[10998]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[11011]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11031]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[11044]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[11055]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[11068]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "\0"
-   /* _mesa_function_pool[11080]: WindowPos2dMESA (will be remapped) */
+   /* _mesa_function_pool[11093]: WindowPos2dMESA (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[11133]: FramebufferTexture3DEXT (will be remapped) */
+   /* _mesa_function_pool[11146]: FramebufferTexture3DEXT (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "\0"
-   /* _mesa_function_pool[11190]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[11203]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "\0"
-   /* _mesa_function_pool[11228]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[11241]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[11253]: VertexAttrib3dARB (will be remapped) */
+   /* _mesa_function_pool[11266]: VertexAttrib3dARB (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[11296]: VertexAttribI4usvEXT (will be remapped) */
+   /* _mesa_function_pool[11309]: VertexAttribI4usvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4usvEXT\0"
    "glVertexAttribI4usv\0"
    "\0"
-   /* _mesa_function_pool[11343]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11356]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11407]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[11420]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[11451]: GetError (offset 261) */
+   /* _mesa_function_pool[11464]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[11464]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[11477]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[11483]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[11496]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[11500]: Indexdv (offset 45) */
+   /* _mesa_function_pool[11513]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[11513]: FramebufferTexture2DEXT (will be remapped) */
+   /* _mesa_function_pool[11526]: FramebufferTexture2DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "\0"
-   /* _mesa_function_pool[11569]: Normal3s (offset 60) */
+   /* _mesa_function_pool[11582]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[11585]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[11598]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[11619]: PushName (offset 201) */
+   /* _mesa_function_pool[11632]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[11633]: MultiTexCoord2dvARB (offset 385) */
+   /* _mesa_function_pool[11646]: MultiTexCoord2dvARB (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[11678]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[11691]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[11703]: Normal3i (offset 58) */
+   /* _mesa_function_pool[11716]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[11719]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[11732]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[11754]: SecondaryColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[11767]: SecondaryColorPointerEXT (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[11811]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[11824]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[11854]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[11867]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[11883]: GetActiveUniformARB (will be remapped) */
+   /* _mesa_function_pool[11896]: GetActiveUniformARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[11933]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[11946]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[11967]: Normal3b (offset 52) */
+   /* _mesa_function_pool[11980]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[11983]: Normal3d (offset 54) */
+   /* _mesa_function_pool[11996]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[11999]: Uniform1uiEXT (will be remapped) */
+   /* _mesa_function_pool[12012]: Uniform1uiEXT (will be remapped) */
    "ii\0"
    "glUniform1uiEXT\0"
    "glUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[12032]: Normal3f (offset 56) */
+   /* _mesa_function_pool[12045]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[12048]: MultiTexCoord1svARB (offset 383) */
+   /* _mesa_function_pool[12061]: MultiTexCoord1svARB (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[12093]: Indexi (offset 48) */
+   /* _mesa_function_pool[12106]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[12105]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[12118]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[12138]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[12151]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[12166]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[12179]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[12187]: DeformationMap3dSGIX (dynamic) */
-   "iddiiddiiddiip\0"
-   "glDeformationMap3dSGIX\0"
-   "\0"
-   /* _mesa_function_pool[12226]: BindBufferRangeEXT (will be remapped) */
+   /* _mesa_function_pool[12200]: BindBufferRangeEXT (will be remapped) */
    "iiiii\0"
    "glBindBufferRangeEXT\0"
    "glBindBufferRange\0"
    "\0"
-   /* _mesa_function_pool[12272]: DepthMask (offset 211) */
+   /* _mesa_function_pool[12246]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[12287]: IsShader (will be remapped) */
+   /* _mesa_function_pool[12261]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[12301]: Indexf (offset 46) */
+   /* _mesa_function_pool[12275]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[12313]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[12287]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[12351]: Indexd (offset 44) */
+   /* _mesa_function_pool[12325]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[12363]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[12337]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[12384]: StencilOp (offset 244) */
+   /* _mesa_function_pool[12358]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[12401]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[12375]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[12423]: FramebufferTextureLayer (dynamic) */
+   /* _mesa_function_pool[12397]: FramebufferTextureLayer (dynamic) */
    "iiiii\0"
    "glFramebufferTextureLayerARB\0"
    "\0"
-   /* _mesa_function_pool[12459]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[12433]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[12504]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[12478]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[12520]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[12494]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[12566]: Indexs (offset 50) */
+   /* _mesa_function_pool[12540]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[12578]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[12552]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[12598]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[12572]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[12620]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[12594]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[12658]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[12632]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[12690]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[12664]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[12717]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[12691]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[12732]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[12706]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[12749]: VertexAttribI1uivEXT (will be remapped) */
+   /* _mesa_function_pool[12723]: VertexAttribI1uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1uivEXT\0"
    "glVertexAttribI1uiv\0"
    "\0"
-   /* _mesa_function_pool[12796]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[12770]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[12811]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[12785]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[12864]: Color4bv (offset 26) */
+   /* _mesa_function_pool[12838]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[12878]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[12852]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[12900]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[12874]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[12948]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[12922]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[12973]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[12947]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[13021]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[12995]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[13045]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[13019]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[13080]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[13054]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[13098]: LogicOp (offset 242) */
+   /* _mesa_function_pool[13072]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[13111]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[13085]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[13135]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[13109]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[13150]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[13124]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[13226]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[13200]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[13243]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[13217]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[13263]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[13237]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[13290]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[13264]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[13335]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[13309]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[13350]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13324]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13382]: VertexAttribI4svEXT (will be remapped) */
+   /* _mesa_function_pool[13356]: VertexAttribI4svEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4svEXT\0"
    "glVertexAttribI4sv\0"
    "\0"
-   /* _mesa_function_pool[13427]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[13401]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[13455]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[13429]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[13479]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[13453]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[13540]: ClearBufferuiv (will be remapped) */
+   /* _mesa_function_pool[13514]: ClearBufferuiv (will be remapped) */
    "iip\0"
    "glClearBufferuiv\0"
    "\0"
-   /* _mesa_function_pool[13562]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[13536]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[13586]: GenTextures (offset 328) */
+   /* _mesa_function_pool[13560]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[13621]: FramebufferTextureARB (will be remapped) */
+   /* _mesa_function_pool[13595]: FramebufferTextureARB (will be remapped) */
    "iiii\0"
    "glFramebufferTextureARB\0"
    "\0"
-   /* _mesa_function_pool[13651]: SetFenceNV (will be remapped) */
+   /* _mesa_function_pool[13625]: SetFenceNV (will be remapped) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[13668]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[13642]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[13724]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[13698]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[13763]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[13737]: MultiModeDrawArraysIBM (will be remapped) */
+   "pppii\0"
+   "glMultiModeDrawArraysIBM\0"
+   "\0"
+   /* _mesa_function_pool[13769]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[13796]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[13802]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[13818]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13824]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13846]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[13852]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[13864]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[13870]: GetCombinerOutputParameterfvNV (will be remapped) */
+   "iiip\0"
+   "glGetCombinerOutputParameterfvNV\0"
+   "\0"
+   /* _mesa_function_pool[13909]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[13882]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[13927]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[13897]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[13942]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[13913]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[13958]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[13930]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[13975]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[13954]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[13999]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[13971]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[14016]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[14026]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[14071]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[14041]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[14086]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[14060]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[14105]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[14089]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[14134]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[14132]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[14177]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[14176]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[14221]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[14192]: EndTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[14237]: EndTransformFeedbackEXT (will be remapped) */
    "\0"
    "glEndTransformFeedbackEXT\0"
    "glEndTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[14243]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[14288]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[14277]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[14322]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[14306]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[14351]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[14351]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[14396]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[14407]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[14452]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[14428]: GetShaderPrecisionFormat (will be remapped) */
+   /* _mesa_function_pool[14473]: GetShaderPrecisionFormat (will be remapped) */
    "iipp\0"
    "glGetShaderPrecisionFormat\0"
    "\0"
-   /* _mesa_function_pool[14461]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[14506]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[14491]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[14536]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[14526]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[14571]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[14545]: Flush (offset 217) */
+   /* _mesa_function_pool[14590]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[14555]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[14600]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[14570]: VertexAttribI4iEXT (will be remapped) */
+   /* _mesa_function_pool[14615]: VertexAttribI4iEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4iEXT\0"
    "glVertexAttribI4i\0"
    "\0"
-   /* _mesa_function_pool[14616]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[14661]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[14638]: Uniform3uivEXT (will be remapped) */
+   /* _mesa_function_pool[14683]: Uniform3uivEXT (will be remapped) */
    "iip\0"
    "glUniform3uivEXT\0"
    "glUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[14674]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[14719]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[14692]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[14737]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[14735]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[14780]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[14759]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[14804]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[14775]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[14820]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[14793]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[14838]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[14835]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[14880]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[14857]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[14902]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[14877]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[14922]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[14918]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[14963]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[14973]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[15018]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[14991]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[15036]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[15015]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[15060]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[15033]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[15078]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[15051]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[15096]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[15105]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[15150]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[15147]: Color4ub (offset 35) */
+   /* _mesa_function_pool[15192]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[15164]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[15209]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[15184]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[15229]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[15213]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[15258]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[15231]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[15276]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[15291]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[15336]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[15310]: Indexiv (offset 49) */
+   /* _mesa_function_pool[15355]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[15323]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[15368]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[15341]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[15386]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[15385]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[15430]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[15445]: Frustum (offset 289) */
+   /* _mesa_function_pool[15490]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[15463]: GetString (offset 275) */
+   /* _mesa_function_pool[15508]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[15478]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[15523]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[15504]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[15549]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[15519]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[15564]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[15537]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[15582]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[15567]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[15612]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[15585]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[15630]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[15630]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[15675]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[15674]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[15719]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[15717]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[15762]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[15758]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[15803]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[15786]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[15831]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[15821]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[15866]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[15839]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[15884]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[15870]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[15915]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[15904]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[15949]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[15929]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[15974]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[15985]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[16030]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[16004]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[16049]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[16020]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[16065]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[16068]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[16113]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[16114]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[16159]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[16131]: VertexAttribI4uiEXT (will be remapped) */
+   /* _mesa_function_pool[16176]: VertexAttribI4uiEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4uiEXT\0"
    "glVertexAttribI4ui\0"
    "\0"
-   /* _mesa_function_pool[16179]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[16224]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[16212]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[16257]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[16239]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16284]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[16266]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[16311]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[16303]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[16348]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[16323]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[16368]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[16344]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[16389]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[16371]: Rectd (offset 86) */
+   /* _mesa_function_pool[16416]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[16385]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16430]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[16411]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[16456]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[16448]: VertexAttribI4ubvEXT (will be remapped) */
+   /* _mesa_function_pool[16493]: VertexAttribI4ubvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ubvEXT\0"
    "glVertexAttribI4ubv\0"
    "\0"
-   /* _mesa_function_pool[16495]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[16540]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[16542]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[16587]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[16561]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[16606]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[16606]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16651]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[16631]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[16676]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[16661]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[16706]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[16708]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[16753]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[16756]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[16801]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[16814]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[16859]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[16848]: Lightfv (offset 160) */
+   /* _mesa_function_pool[16893]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[16863]: PrimitiveRestartIndexNV (will be remapped) */
+   /* _mesa_function_pool[16908]: PrimitiveRestartIndexNV (will be remapped) */
    "i\0"
    "glPrimitiveRestartIndexNV\0"
    "glPrimitiveRestartIndex\0"
    "\0"
-   /* _mesa_function_pool[16916]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[16961]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[16932]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[16977]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[16952]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[16997]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[16974]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[17019]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[17017]: Color4fv (offset 30) */
+   /* _mesa_function_pool[17062]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[17031]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[17076]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[17076]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[17121]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[17113]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[17158]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[17134]: Rects (offset 92) */
+   /* _mesa_function_pool[17179]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[17148]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17193]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17182]: CreateShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[17227]: CreateShaderProgramEXT (will be remapped) */
    "ip\0"
    "glCreateShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[17211]: ActiveProgramEXT (will be remapped) */
+   /* _mesa_function_pool[17256]: ActiveProgramEXT (will be remapped) */
    "i\0"
    "glActiveProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[17233]: Lightiv (offset 162) */
+   /* _mesa_function_pool[17278]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[17248]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[17293]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[17292]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[17337]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[17340]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[17385]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[17365]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[17410]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[17389]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[17434]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[17434]: ClearBufferfv (will be remapped) */
+   /* _mesa_function_pool[17479]: ClearBufferfv (will be remapped) */
    "iip\0"
    "glClearBufferfv\0"
    "\0"
-   /* _mesa_function_pool[17455]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[17500]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[17498]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[17543]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[17524]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[17569]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[17550]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[17595]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[17568]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[17613]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[17611]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[17656]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[17665]: Rectdv (offset 87) */
+   /* _mesa_function_pool[17710]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[17678]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[17723]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[17704]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[17749]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[17763]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[17808]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[17791]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[17836]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[17836]: DrawArraysInstancedARB (will be remapped) */
+   /* _mesa_function_pool[17881]: DrawArraysInstancedARB (will be remapped) */
    "iiii\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "glDrawArraysInstanced\0"
    "\0"
-   /* _mesa_function_pool[17914]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[17959]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[17941]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[17986]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[17968]: ClearBufferfi (will be remapped) */
+   /* _mesa_function_pool[18013]: ClearBufferfi (will be remapped) */
    "iifi\0"
    "glClearBufferfi\0"
    "\0"
-   /* _mesa_function_pool[17990]: Materialiv (offset 172) */
+   /* _mesa_function_pool[18035]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[18008]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[18053]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[18030]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[18075]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[18065]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[18110]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[18111]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[18156]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[18164]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[18209]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[18210]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[18255]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[18228]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[18273]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[18292]: VertexAttribI1iEXT (will be remapped) */
+   /* _mesa_function_pool[18337]: VertexAttribI1iEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1iEXT\0"
    "glVertexAttribI1i\0"
    "\0"
-   /* _mesa_function_pool[18335]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[18380]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[18362]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[18407]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[18389]: VertexAttribIPointerEXT (will be remapped) */
+   /* _mesa_function_pool[18434]: VertexAttribIPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexAttribIPointerEXT\0"
    "glVertexAttribIPointer\0"
    "\0"
-   /* _mesa_function_pool[18445]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[18490]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[18473]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[18518]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[18511]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[18556]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[18529]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[18574]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[18553]: TexGeni (offset 192) */
+   /* _mesa_function_pool[18598]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[18568]: TexGenf (offset 190) */
+   /* _mesa_function_pool[18613]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[18583]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[18628]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[18616]: TexGend (offset 188) */
+   /* _mesa_function_pool[18661]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[18631]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[18676]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[18658]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[18703]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[18681]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[18726]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[18700]: BindBufferOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[18745]: BindBufferOffsetEXT (will be remapped) */
    "iiii\0"
    "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[18728]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[18773]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[18782]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[18827]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[18806]: DisableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[18851]: DisableIndexedEXT (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "glDisablei\0"
    "\0"
-   /* _mesa_function_pool[18841]: BindBufferBaseEXT (will be remapped) */
+   /* _mesa_function_pool[18886]: BindBufferBaseEXT (will be remapped) */
    "iii\0"
    "glBindBufferBaseEXT\0"
    "glBindBufferBase\0"
    "\0"
-   /* _mesa_function_pool[18883]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[18928]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[18912]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[18957]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[18936]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[18981]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[18983]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[19028]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[19033]: PixelTexGenSGIX (will be remapped) */
+   /* _mesa_function_pool[19078]: PixelTexGenSGIX (will be remapped) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[19054]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[19099]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[19081]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[19126]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[19115]: Color4sv (offset 34) */
+   /* _mesa_function_pool[19160]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[19129]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[19174]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[19159]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[19204]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[19191]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[19236]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[19226]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[19271]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[19242]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[19287]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[19275]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[19320]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[19333]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[19378]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[19389]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[19434]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[19419]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[19464]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[19439]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[19484]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[19458]: Color3dv (offset 12) */
+   /* _mesa_function_pool[19503]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[19472]: IsTexture (offset 330) */
+   /* _mesa_function_pool[19517]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[19502]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[19547]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[19525]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[19570]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[19566]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[19611]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[19601]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[19646]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[19620]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[19665]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[19659]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[19704]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[19689]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[19734]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[19721]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[19766]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[19750]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[19795]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[19766]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[19811]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[19794]: GetStringi (will be remapped) */
+   /* _mesa_function_pool[19839]: GetStringi (will be remapped) */
    "ii\0"
    "glGetStringi\0"
    "\0"
-   /* _mesa_function_pool[19811]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[19856]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[19853]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[19898]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[19871]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[19916]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[19897]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19942]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19946]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[19991]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[19964]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[20009]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[20009]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[20054]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[20043]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[20088]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[20067]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[20112]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[20106]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[20151]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[20135]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[20180]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[20153]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[20198]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[20196]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[20241]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[20216]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[20261]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[20284]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[20329]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[20339]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[20384]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[20377]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[20422]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[20411]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[20456]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[20459]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[20504]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[20487]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[20532]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[20540]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[20585]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[20561]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[20606]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[20588]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[20633]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[20620]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[20665]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[20644]: TransformFeedbackVaryingsEXT (will be remapped) */
+   /* _mesa_function_pool[20689]: TransformFeedbackVaryingsEXT (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryingsEXT\0"
    "glTransformFeedbackVaryings\0"
    "\0"
-   /* _mesa_function_pool[20709]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[20754]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[20731]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[20776]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[20749]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[20794]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[20772]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[20817]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[20799]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[20844]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[20849]: Color3s (offset 17) */
+   /* _mesa_function_pool[20894]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[20864]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[20909]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[20898]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[20943]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[20951]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[20996]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[20970]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[21015]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[20994]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[21039]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[21038]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[21083]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[21061]: Color3i (offset 15) */
+   /* _mesa_function_pool[21106]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[21076]: FrontFace (offset 157) */
+   /* _mesa_function_pool[21121]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[21091]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[21136]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[21109]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[21154]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[21157]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[21202]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[21175]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[21220]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[21218]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[21263]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[21268]: Color3b (offset 9) */
+   /* _mesa_function_pool[21313]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[21283]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[21328]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[21327]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[21372]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[21351]: Color3f (offset 13) */
+   /* _mesa_function_pool[21396]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[21366]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[21411]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[21386]: Color3d (offset 11) */
+   /* _mesa_function_pool[21431]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[21401]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[21446]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[21416]: Lightf (offset 159) */
+   /* _mesa_function_pool[21461]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[21430]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[21475]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[21456]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[21501]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[21472]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[21517]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[21493]: Lighti (offset 161) */
+   /* _mesa_function_pool[21538]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[21507]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[21552]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[21538]: ClearDepthf (will be remapped) */
+   /* _mesa_function_pool[21583]: ClearDepthf (will be remapped) */
    "f\0"
    "glClearDepthf\0"
    "\0"
-   /* _mesa_function_pool[21555]: GetBooleanIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[21600]: GetBooleanIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "glGetBooleani_v\0"
    "\0"
-   /* _mesa_function_pool[21600]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[21645]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[21685]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[21730]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[21720]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[21765]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[21765]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[21810]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[21800]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[21845]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[21817]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[21862]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[21834]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[21879]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[21851]: VertexAttribI4bvEXT (will be remapped) */
+   /* _mesa_function_pool[21896]: VertexAttribI4bvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4bvEXT\0"
    "glVertexAttribI4bv\0"
    "\0"
-   /* _mesa_function_pool[21896]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[21941]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[21939]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[21984]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[21970]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[22015]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[22025]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[22070]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[22050]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[22095]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[22076]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[22121]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[22121]: Uniform2uiEXT (will be remapped) */
+   /* _mesa_function_pool[22166]: Uniform2uiEXT (will be remapped) */
    "iii\0"
    "glUniform2uiEXT\0"
    "glUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[22155]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[22200]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[22182]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[22227]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[22204]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[22249]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[22231]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[22276]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[22260]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[22305]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[22286]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[22331]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[22309]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[22354]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[22328]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[22373]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[22355]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[22400]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[22373]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[22418]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[22418]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[22463]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[22461]: ClearColor (offset 206) */
+   /* _mesa_function_pool[22506]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[22480]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[22525]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[22499]: ClearColorIiEXT (will be remapped) */
+   /* _mesa_function_pool[22544]: ClearColorIiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIiEXT\0"
    "\0"
-   /* _mesa_function_pool[22523]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[22568]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[22572]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[22617]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[22599]: IsEnabledIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[22644]: IsEnabledIndexedEXT (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "glIsEnabledi\0"
    "\0"
-   /* _mesa_function_pool[22638]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[22683]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[22654]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[22699]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[22702]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[22747]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[22722]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[22767]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[22770]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[22815]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[22794]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[22839]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[22835]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[22880]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[22867]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[22912]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[22885]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[22930]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[22977]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[23022]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[23008]: Bitmap (offset 8) */
+   /* _mesa_function_pool[23053]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[23026]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[23071]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[23071]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[23116]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[23102]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[23147]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[23138]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[23183]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[23181]: VertexAttribDivisor (will be remapped) */
+   /* _mesa_function_pool[23226]: VertexAttribDivisor (will be remapped) */
    "ii\0"
    "glVertexAttribDivisor\0"
    "\0"
-   /* _mesa_function_pool[23207]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[23252]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[23239]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[23284]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[23254]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[23299]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[23272]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[23317]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[23312]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[23357]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[23339]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[23384]: VertexAttribDivisorARB (will be remapped) */
+   "ii\0"
+   "glVertexAttribDivisorARB\0"
+   "\0"
+   /* _mesa_function_pool[23413]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[23358]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[23432]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[23406]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[23480]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[23441]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[23515]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[23468]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[23542]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[23492]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[23566]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[23526]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[23600]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[23578]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[23652]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[23597]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[23671]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[23628]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[23702]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[23666]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[23740]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[23709]: VertexAttribI2ivEXT (will be remapped) */
+   /* _mesa_function_pool[23783]: VertexAttribI2ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2ivEXT\0"
    "glVertexAttribI2iv\0"
    "\0"
-   /* _mesa_function_pool[23754]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[23828]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[23774]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[23848]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[23845]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[23919]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[23867]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[23941]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[23887]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[23961]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[23941]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[24015]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[23994]: ProgramParameteriARB (will be remapped) */
+   /* _mesa_function_pool[24068]: ProgramParameteriARB (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "\0"
-   /* _mesa_function_pool[24022]: Map1d (offset 220) */
+   /* _mesa_function_pool[24096]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[24038]: Map1f (offset 221) */
+   /* _mesa_function_pool[24112]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[24054]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[24128]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[24113]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[24187]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[24149]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[24223]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[24173]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[24247]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[24194]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[24268]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[24225]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[24299]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[24264]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[24338]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[24286]: GetFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[24360]: GetFragDataLocationEXT (will be remapped) */
    "ip\0"
    "glGetFragDataLocationEXT\0"
    "glGetFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[24337]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[24411]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[24391]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[24465]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[24412]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[24486]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[24458]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[24532]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[24473]: Fogiv (offset 156) */
+   /* _mesa_function_pool[24547]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[24485]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[24559]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[24502]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[24576]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[24538]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[24612]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[24559]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[24633]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[24586]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[24660]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[24610]: Rotatef (offset 300) */
+   /* _mesa_function_pool[24684]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[24626]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[24700]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[24668]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[24742]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[24684]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[24758]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[24700]: Clear (offset 203) */
+   /* _mesa_function_pool[24774]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[24711]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[24785]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[24727]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[24801]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[24754]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[24828]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[24788]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[24862]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[24804]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[24878]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[24860]: Ortho (offset 296) */
+   /* _mesa_function_pool[24934]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[24876]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[24950]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[24897]: ListBase (offset 6) */
+   /* _mesa_function_pool[24971]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[24911]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[24985]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[24927]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[25001]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[24983]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[25057]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[25075]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[25149]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[25132]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[25206]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[25148]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[25222]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[25174]: Rectiv (offset 91) */
+   /* _mesa_function_pool[25248]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[25187]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[25261]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[25225]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[25299]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[25252]: EndConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[25326]: EndConditionalRenderNV (will be remapped) */
    "\0"
    "glEndConditionalRenderNV\0"
    "glEndConditionalRender\0"
    "\0"
-   /* _mesa_function_pool[25302]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[25376]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[25325]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[25399]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[25344]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[25418]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[25363]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[25437]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[25383]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[25457]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[25429]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[25503]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[25462]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[25536]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[25477]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[25551]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[25522]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[25596]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[25567]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[25641]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[25613]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[25687]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[25648]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[25722]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[25663]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[25737]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[25711]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[25785]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[25746]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[25820]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[25789]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[25863]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[25806]: PauseTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[25880]: PauseTransformFeedback (will be remapped) */
    "\0"
    "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[25833]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[25907]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[25876]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[25950]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[25923]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[25997]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[26011]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[26085]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[26037]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[26111]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[26082]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[26156]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[26114]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[26188]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[26129]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[26203]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[26155]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[26229]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[26180]: LineWidth (offset 168) */
+   /* _mesa_function_pool[26254]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[26195]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[26269]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[26226]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[26300]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[26264]: TexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[26338]: TexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIuivEXT\0"
    "glTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[26310]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[26384]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[26330]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[26404]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[26351]: GetBufferParameteri64v (will be remapped) */
+   /* _mesa_function_pool[26425]: GetBufferParameteri64v (will be remapped) */
    "iip\0"
    "glGetBufferParameteri64v\0"
    "\0"
-   /* _mesa_function_pool[26381]: TexGendv (offset 189) */
+   /* _mesa_function_pool[26455]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[26397]: VertexAttribI3iEXT (will be remapped) */
+   /* _mesa_function_pool[26471]: VertexAttribI3iEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3iEXT\0"
    "glVertexAttribI3i\0"
    "\0"
-   /* _mesa_function_pool[26442]: EnableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[26516]: EnableIndexedEXT (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "glEnablei\0"
    "\0"
-   /* _mesa_function_pool[26475]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[26549]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[26500]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[26574]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[26521]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[26595]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[26555]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[26629]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[26582]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[26656]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[26605]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[26679]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[26631]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[26705]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[26695]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[26769]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[26721]: MultiModeDrawArraysIBM (will be remapped) */
-   "pppii\0"
-   "glMultiModeDrawArraysIBM\0"
-   "\0"
-   /* _mesa_function_pool[26753]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[26795]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[26797]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[26839]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[26828]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[26870]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[26865]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[26907]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[26886]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[26928]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[26908]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[26950]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[26943]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[26985]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[26964]: CallList (offset 2) */
+   /* _mesa_function_pool[27006]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[26978]: Materialfv (offset 170) */
+   /* _mesa_function_pool[27020]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[26996]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[27038]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[27013]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[27055]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[27045]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[27087]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[27090]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[27132]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[27138]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[27180]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[27183]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[27225]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[27201]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[27243]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[27254]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[27296]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[27285]: Color3iv (offset 16) */
+   /* _mesa_function_pool[27327]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[27299]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[27341]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[27333]: DrawElements (offset 311) */
+   /* _mesa_function_pool[27375]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[27354]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[27396]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[27380]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[27422]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[27417]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[27459]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[27477]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[27519]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[27520]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[27562]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[27575]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[27617]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[27598]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[27640]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[27671]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[27713]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[27694]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[27736]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[27725]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[27767]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[27762]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[27804]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[27779]: Uniform1uivEXT (will be remapped) */
+   /* _mesa_function_pool[27821]: Uniform1uivEXT (will be remapped) */
    "iip\0"
    "glUniform1uivEXT\0"
    "glUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[27815]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[27857]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[27831]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[27873]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[27851]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[27893]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[27865]: GetVertexAttribIuivEXT (will be remapped) */
-   "iip\0"
-   "glGetVertexAttribIuivEXT\0"
-   "glGetVertexAttribIuiv\0"
-   "\0"
-   /* _mesa_function_pool[27917]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[27907]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[27936]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[27926]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[27956]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[27946]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[28005]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[27995]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[28051]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[28041]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[28070]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[28060]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[28096]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[28086]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[28139]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[28129]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[28164]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[28154]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[28209]: Map2d (offset 222) */
+   /* _mesa_function_pool[28199]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[28229]: Map2f (offset 223) */
+   /* _mesa_function_pool[28219]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[28249]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[28239]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[28274]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[28264]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[28291]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[28281]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[28320]: FragmentLightModelivSGIX (dynamic) */
+   /* _mesa_function_pool[28310]: FragmentLightModelivSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelivSGIX\0"
    "\0"
-   /* _mesa_function_pool[28351]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[28341]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[28374]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[28364]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[28391]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[28381]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[28408]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[28398]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[28425]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[28415]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[28443]: UseShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[28433]: UseShaderProgramEXT (will be remapped) */
    "ii\0"
    "glUseShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[28469]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[28459]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[28495]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[28485]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[28551]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[28541]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[28570]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[28560]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[28587]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[28577]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[28618]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[28608]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[28658]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[28648]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[28684]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[28674]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[28715]: Materialf (offset 169) */
+   /* _mesa_function_pool[28705]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[28732]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[28722]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[28777]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[28767]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[28802]: Materiali (offset 171) */
+   /* _mesa_function_pool[28792]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[28819]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[28809]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[28845]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[28835]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[28880]: Indexsv (offset 51) */
+   /* _mesa_function_pool[28870]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[28893]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[28883]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[28938]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[28928]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[28957]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[28947]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[28974]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[28964]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[29007]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[28997]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[29025]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[29015]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[29062]: Translated (offset 303) */
+   /* _mesa_function_pool[29052]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[29080]: Translatef (offset 304) */
+   /* _mesa_function_pool[29070]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[29098]: Uniform3uiEXT (will be remapped) */
+   /* _mesa_function_pool[29088]: Uniform3uiEXT (will be remapped) */
    "iiii\0"
    "glUniform3uiEXT\0"
    "glUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[29133]: StencilMask (offset 209) */
+   /* _mesa_function_pool[29123]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[29150]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[29140]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[29170]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[29160]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[29188]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[29178]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[29214]: IsList (offset 287) */
+   /* _mesa_function_pool[29204]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[29226]: IsSync (will be remapped) */
+   /* _mesa_function_pool[29216]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[29238]: RenderMode (offset 196) */
+   /* _mesa_function_pool[29228]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[29254]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[29244]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[29287]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[29277]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "\0"
-   /* _mesa_function_pool[29339]: ClearBufferiv (will be remapped) */
+   /* _mesa_function_pool[29329]: ClearBufferiv (will be remapped) */
    "iip\0"
    "glClearBufferiv\0"
    "\0"
-   /* _mesa_function_pool[29360]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[29350]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[29397]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[29387]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[29425]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[29415]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[29467]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[29457]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[29510]: LoadName (offset 198) */
+   /* _mesa_function_pool[29500]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[29524]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[29514]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[29551]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[29541]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[29569]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[29559]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[29603]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[29593]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[29654]: CullFace (offset 152) */
+   /* _mesa_function_pool[29644]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[29668]: BindTexture (offset 307) */
+   /* _mesa_function_pool[29658]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[29703]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[29693]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[29730]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[29720]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[29776]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[29766]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[29802]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[29792]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[29821]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[29811]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[29841]: Rectsv (offset 93) */
+   /* _mesa_function_pool[29831]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[29854]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[29844]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[29881]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[29871]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[29939]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[29929]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[29965]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[29955]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[30028]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[30018]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[30083]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[30073]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[30110]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[30100]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[30131]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[30121]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[30153]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[30143]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[30181]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[30171]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[30205]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[30195]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[30250]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[30240]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[30269]: VertexAttribI3uivEXT (will be remapped) */
+   /* _mesa_function_pool[30259]: VertexAttribI3uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3uivEXT\0"
    "glVertexAttribI3uiv\0"
    "\0"
-   /* _mesa_function_pool[30316]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[30306]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[30343]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[30333]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[30359]: Recti (offset 90) */
+   /* _mesa_function_pool[30349]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[30373]: VertexAttribI3ivEXT (will be remapped) */
+   /* _mesa_function_pool[30363]: VertexAttribI3ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3ivEXT\0"
    "glVertexAttribI3iv\0"
    "\0"
-   /* _mesa_function_pool[30418]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[30408]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[30457]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[30447]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[30486]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[30476]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[30525]: PixelTransformParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[30515]: PixelTransformParameterfvEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[30561]: PrimitiveRestartNV (will be remapped) */
+   /* _mesa_function_pool[30551]: PrimitiveRestartNV (will be remapped) */
    "\0"
    "glPrimitiveRestartNV\0"
    "\0"
-   /* _mesa_function_pool[30584]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[30574]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[30606]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[30596]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[30627]: Rectf (offset 88) */
+   /* _mesa_function_pool[30617]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[30641]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[30631]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[30664]: Indexfv (offset 47) */
+   /* _mesa_function_pool[30654]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[30677]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[30667]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[30723]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[30713]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[30775]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[30765]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[30810]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[30800]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[30830]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[30820]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[30857]: IndexMask (offset 212) */
+   /* _mesa_function_pool[30847]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[30872]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[30862]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[30909]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[30899]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[30952]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[30942]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[30968]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[30958]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[30994]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[30984]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[31013]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[31003]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[31035]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[31025]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[31054]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[31044]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[31071]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[31061]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[31098]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[31088]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[31112]: Fogfv (offset 154) */
+   /* _mesa_function_pool[31102]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[31124]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[31114]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[31158]: InitNames (offset 197) */
+   /* _mesa_function_pool[31148]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[31172]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[31162]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[31187]: Minmax (offset 368) */
+   /* _mesa_function_pool[31177]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[31213]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[31203]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[31232]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[31222]: DeformationMap3dSGIX (dynamic) */
+   "iddiiddiiddiip\0"
+   "glDeformationMap3dSGIX\0"
+   "\0"
+   /* _mesa_function_pool[31261]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[31251]: FogCoorddvEXT (will be remapped) */
+   /* _mesa_function_pool[31280]: FogCoorddvEXT (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[31283]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[31312]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[31305]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[31334]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[31335]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[31364]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[31355]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[31384]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[31373]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[31402]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[31410]: Hint (offset 158) */
+   /* _mesa_function_pool[31439]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[31421]: Color4dv (offset 28) */
+   /* _mesa_function_pool[31450]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[31435]: VertexAttrib2svARB (will be remapped) */
+   /* _mesa_function_pool[31464]: VertexAttrib2svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[31478]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[31507]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[31507]: WindowPos3svMESA (will be remapped) */
+   /* _mesa_function_pool[31536]: WindowPos3svMESA (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[31562]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[31591]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[31612]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[31641]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[31630]: DeleteRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[31659]: DeleteRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[31681]: VertexAttrib4NubvARB (will be remapped) */
+   /* _mesa_function_pool[31710]: VertexAttrib4NubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[31728]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[31757]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[31752]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[31781]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[31783]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[31812]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[31798]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[31827]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[31833]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[31862]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[31850]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[31879]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[31870]: Begin (offset 7) */
+   /* _mesa_function_pool[31899]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[31881]: LightModeli (offset 165) */
+   /* _mesa_function_pool[31910]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[31899]: VertexAttribI4ivEXT (will be remapped) */
+   /* _mesa_function_pool[31928]: VertexAttribI4ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ivEXT\0"
    "glVertexAttribI4iv\0"
    "\0"
-   /* _mesa_function_pool[31944]: Rectfv (offset 89) */
+   /* _mesa_function_pool[31973]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[31957]: LightModelf (offset 163) */
+   /* _mesa_function_pool[31986]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[31975]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[32004]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[32000]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[32029]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[32018]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[32047]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[32054]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[32083]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[32080]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[32109]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[32103]: GetCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[32132]: GetCombinerInputParameterivNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[32142]: Disable (offset 214) */
+   /* _mesa_function_pool[32171]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[32155]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[32184]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[32200]: GetRenderbufferParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[32229]: GetRenderbufferParameterivEXT (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[32266]: CombinerParameterivNV (will be remapped) */
+   /* _mesa_function_pool[32295]: CombinerParameterivNV (will be remapped) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[32294]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[32323]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[32321]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[32350]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[32355]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[32384]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[32374]: VertexAttrib2sARB (will be remapped) */
+   /* _mesa_function_pool[32403]: VertexAttrib2sARB (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[32416]: ColorMask (offset 210) */
+   /* _mesa_function_pool[32445]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[32434]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[32463]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[32459]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[32488]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[32478]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[32507]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[32508]: BindBufferARB (will be remapped) */
+   /* _mesa_function_pool[32537]: BindBufferARB (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[32541]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[32570]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[32563]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[32592]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[32581]: Enable (offset 215) */
+   /* _mesa_function_pool[32610]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[32593]: LineStipple (offset 167) */
+   /* _mesa_function_pool[32622]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[32611]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[32640]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[32637]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[32666]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[32667]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[32696]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[32694]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[32723]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[32748]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[32777]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[32791]: GenBuffersARB (will be remapped) */
+   /* _mesa_function_pool[32820]: GenBuffersARB (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[32824]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[32853]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[32850]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[32879]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[32865]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[32894]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[32896]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[32925]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[32917]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[32946]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[32947]: IsRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[32976]: IsRenderbufferEXT (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[32987]: GenProgramsNV (will be remapped) */
+   /* _mesa_function_pool[33016]: GenProgramsNV (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[33024]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[33053]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[33048]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[33077]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[33073]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[33102]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[33094]: WindowPos2fMESA (will be remapped) */
+   /* _mesa_function_pool[33123]: WindowPos2fMESA (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
@@ -4759,594 +4763,595 @@ static const char _mesa_function_pool[] =
 
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   {  1616, AttachShader_remap_index },
-   {  9872, CreateProgram_remap_index },
-   { 22867, CreateShader_remap_index },
-   { 25325, DeleteProgram_remap_index },
-   { 18511, DeleteShader_remap_index },
-   { 23339, DetachShader_remap_index },
-   { 17914, GetAttachedShaders_remap_index },
-   {  4856, GetProgramInfoLog_remap_index },
-   {   444, GetProgramiv_remap_index },
-   {  6529, GetShaderInfoLog_remap_index },
-   { 30994, GetShaderiv_remap_index },
-   { 13335, IsProgram_remap_index },
-   { 12287, IsShader_remap_index },
-   { 10002, StencilFuncSeparate_remap_index },
-   {  3960, StencilMaskSeparate_remap_index },
-   {  7594, StencilOpSeparate_remap_index },
-   { 22155, UniformMatrix2x3fv_remap_index },
-   {  2886, UniformMatrix2x4fv_remap_index },
-   { 32667, UniformMatrix3x2fv_remap_index },
-   { 30316, UniformMatrix3x4fv_remap_index },
-   { 16212, UniformMatrix4x2fv_remap_index },
-   {  3302, UniformMatrix4x3fv_remap_index },
-   {  5017, ClampColor_remap_index },
-   { 17968, ClearBufferfi_remap_index },
-   { 17434, ClearBufferfv_remap_index },
-   { 29339, ClearBufferiv_remap_index },
-   { 13540, ClearBufferuiv_remap_index },
-   { 19794, GetStringi_remap_index },
-   {  2827, TexBuffer_remap_index },
-   {   977, FramebufferTexture_remap_index },
-   { 26351, GetBufferParameteri64v_remap_index },
-   { 10102, GetInteger64i_v_remap_index },
-   { 23181, VertexAttribDivisor_remap_index },
-   {  9890, LoadTransposeMatrixdARB_remap_index },
-   { 30723, LoadTransposeMatrixfARB_remap_index },
-   {  5637, MultTransposeMatrixdARB_remap_index },
-   { 23526, MultTransposeMatrixfARB_remap_index },
-   {   255, SampleCoverageARB_remap_index },
-   {  5821, CompressedTexImage1DARB_remap_index },
-   { 24054, CompressedTexImage2DARB_remap_index },
-   {  4023, CompressedTexImage3DARB_remap_index },
-   { 18228, CompressedTexSubImage1DARB_remap_index },
-   {  2089, CompressedTexSubImage2DARB_remap_index },
-   { 20216, CompressedTexSubImage3DARB_remap_index },
-   { 28495, GetCompressedTexImageARB_remap_index },
-   {  3868, DisableVertexAttribArrayARB_remap_index },
-   { 29881, EnableVertexAttribArrayARB_remap_index },
-   { 31798, GetProgramEnvParameterdvARB_remap_index },
-   { 23406, GetProgramEnvParameterfvARB_remap_index },
-   { 27380, GetProgramLocalParameterdvARB_remap_index },
-   {  8036, GetProgramLocalParameterfvARB_remap_index },
-   { 18362, GetProgramStringARB_remap_index },
-   { 27575, GetProgramivARB_remap_index },
-   { 20411, GetVertexAttribdvARB_remap_index },
-   { 16020, GetVertexAttribfvARB_remap_index },
-   {  9735, GetVertexAttribivARB_remap_index },
-   { 19275, ProgramEnvParameter4dARB_remap_index },
-   { 25075, ProgramEnvParameter4dvARB_remap_index },
-   { 16756, ProgramEnvParameter4fARB_remap_index },
-   {  8935, ProgramEnvParameter4fvARB_remap_index },
-   {  3986, ProgramLocalParameter4dARB_remap_index },
-   { 13045, ProgramLocalParameter4dvARB_remap_index },
-   { 29360, ProgramLocalParameter4fARB_remap_index },
-   { 25711, ProgramLocalParameter4fvARB_remap_index },
-   { 28249, ProgramStringARB_remap_index },
-   { 19525, VertexAttrib1dARB_remap_index },
-   { 15674, VertexAttrib1dvARB_remap_index },
-   {  4161, VertexAttrib1fARB_remap_index },
-   { 32748, VertexAttrib1fvARB_remap_index },
-   {  7120, VertexAttrib1sARB_remap_index },
-   {  2263, VertexAttrib1svARB_remap_index },
-   { 15105, VertexAttrib2dARB_remap_index },
-   { 17455, VertexAttrib2dvARB_remap_index },
-   {  1635, VertexAttrib2fARB_remap_index },
-   { 17568, VertexAttrib2fvARB_remap_index },
-   { 32374, VertexAttrib2sARB_remap_index },
-   { 31435, VertexAttrib2svARB_remap_index },
-   { 11253, VertexAttrib3dARB_remap_index },
-   {  8602, VertexAttrib3dvARB_remap_index },
-   {  1722, VertexAttrib3fARB_remap_index },
-   { 22418, VertexAttrib3fvARB_remap_index },
-   { 28096, VertexAttrib3sARB_remap_index },
-   { 20153, VertexAttrib3svARB_remap_index },
-   {  4882, VertexAttrib4NbvARB_remap_index },
-   { 17791, VertexAttrib4NivARB_remap_index },
-   { 22373, VertexAttrib4NsvARB_remap_index },
-   { 23358, VertexAttrib4NubARB_remap_index },
-   { 31681, VertexAttrib4NubvARB_remap_index },
-   { 18936, VertexAttrib4NuivARB_remap_index },
-   {  3175, VertexAttrib4NusvARB_remap_index },
-   { 10842, VertexAttrib4bvARB_remap_index },
-   { 26753, VertexAttrib4dARB_remap_index },
-   { 21175, VertexAttrib4dvARB_remap_index },
-   { 11407, VertexAttrib4fARB_remap_index },
-   { 11811, VertexAttrib4fvARB_remap_index },
-   { 10218, VertexAttrib4ivARB_remap_index },
-   { 17248, VertexAttrib4sARB_remap_index },
-   { 30909, VertexAttrib4svARB_remap_index },
-   { 16561, VertexAttrib4ubvARB_remap_index },
-   { 30205, VertexAttrib4uivARB_remap_index },
-   { 19964, VertexAttrib4usvARB_remap_index },
-   { 21970, VertexAttribPointerARB_remap_index },
-   { 32508, BindBufferARB_remap_index },
-   {  6827, BufferDataARB_remap_index },
-   {  1537, BufferSubDataARB_remap_index },
-   { 30486, DeleteBuffersARB_remap_index },
-   { 32791, GenBuffersARB_remap_index },
-   { 17611, GetBufferParameterivARB_remap_index },
-   { 16708, GetBufferPointervARB_remap_index },
-   {  1490, GetBufferSubDataARB_remap_index },
-   { 30153, IsBufferARB_remap_index },
-   { 26195, MapBufferARB_remap_index },
-   { 31124, UnmapBufferARB_remap_index },
-   {   351, BeginQueryARB_remap_index },
-   { 19620, DeleteQueriesARB_remap_index },
-   { 12138, EndQueryARB_remap_index },
-   { 28974, GenQueriesARB_remap_index },
-   {  1981, GetQueryObjectivARB_remap_index },
-   { 17292, GetQueryObjectuivARB_remap_index },
-   {  1779, GetQueryivARB_remap_index },
-   { 19871, IsQueryARB_remap_index },
-   {  8212, AttachObjectARB_remap_index },
-   { 18473, CompileShaderARB_remap_index },
-   {  3244, CreateProgramObjectARB_remap_index },
-   {  6772, CreateShaderObjectARB_remap_index },
-   { 14407, DeleteObjectARB_remap_index },
-   { 23845, DetachObjectARB_remap_index },
-   { 11883, GetActiveUniformARB_remap_index },
-   {  9410, GetAttachedObjectsARB_remap_index },
-   {  9717, GetHandleARB_remap_index },
-   { 32541, GetInfoLogARB_remap_index },
-   { 31752, GetObjectParameterfvARB_remap_index },
-   { 27254, GetObjectParameterivARB_remap_index },
-   { 28732, GetShaderSourceARB_remap_index },
-   { 27956, GetUniformLocationARB_remap_index },
-   { 23628, GetUniformfvARB_remap_index },
-   { 12620, GetUniformivARB_remap_index },
-   { 20009, LinkProgramARB_remap_index },
-   { 20067, ShaderSourceARB_remap_index },
-   {  7494, Uniform1fARB_remap_index },
-   { 29569, Uniform1fvARB_remap_index },
-   { 21939, Uniform1iARB_remap_index },
-   { 20864, Uniform1ivARB_remap_index },
-   {  2212, Uniform2fARB_remap_index },
-   { 14243, Uniform2fvARB_remap_index },
-   { 26082, Uniform2iARB_remap_index },
-   {  2332, Uniform2ivARB_remap_index },
-   { 18583, Uniform3fARB_remap_index },
-   {  9440, Uniform3fvARB_remap_index },
-   {  6383, Uniform3iARB_remap_index },
-   { 16814, Uniform3ivARB_remap_index },
-   { 19081, Uniform4fARB_remap_index },
-   { 23492, Uniform4fvARB_remap_index },
-   { 24754, Uniform4iARB_remap_index },
-   { 20377, Uniform4ivARB_remap_index },
-   {  8264, UniformMatrix2fvARB_remap_index },
+   {  1577, AttachShader_remap_index },
+   {  9885, CreateProgram_remap_index },
+   { 22912, CreateShader_remap_index },
+   { 25399, DeleteProgram_remap_index },
+   { 18556, DeleteShader_remap_index },
+   { 23413, DetachShader_remap_index },
+   { 17959, GetAttachedShaders_remap_index },
+   {  4869, GetProgramInfoLog_remap_index },
+   {   405, GetProgramiv_remap_index },
+   {  6542, GetShaderInfoLog_remap_index },
+   { 30984, GetShaderiv_remap_index },
+   { 13309, IsProgram_remap_index },
+   { 12261, IsShader_remap_index },
+   { 10015, StencilFuncSeparate_remap_index },
+   {  3921, StencilMaskSeparate_remap_index },
+   {  7607, StencilOpSeparate_remap_index },
+   { 22200, UniformMatrix2x3fv_remap_index },
+   {  2847, UniformMatrix2x4fv_remap_index },
+   { 32696, UniformMatrix3x2fv_remap_index },
+   { 30306, UniformMatrix3x4fv_remap_index },
+   { 16257, UniformMatrix4x2fv_remap_index },
+   {  3263, UniformMatrix4x3fv_remap_index },
+   {  5030, ClampColor_remap_index },
+   { 18013, ClearBufferfi_remap_index },
+   { 17479, ClearBufferfv_remap_index },
+   { 29329, ClearBufferiv_remap_index },
+   { 13514, ClearBufferuiv_remap_index },
+   { 19839, GetStringi_remap_index },
+   {  2788, TexBuffer_remap_index },
+   {   938, FramebufferTexture_remap_index },
+   { 26425, GetBufferParameteri64v_remap_index },
+   { 10115, GetInteger64i_v_remap_index },
+   { 23226, VertexAttribDivisor_remap_index },
+   {  9903, LoadTransposeMatrixdARB_remap_index },
+   { 30713, LoadTransposeMatrixfARB_remap_index },
+   {  5608, MultTransposeMatrixdARB_remap_index },
+   { 23600, MultTransposeMatrixfARB_remap_index },
+   {   216, SampleCoverageARB_remap_index },
+   {  5834, CompressedTexImage1DARB_remap_index },
+   { 24128, CompressedTexImage2DARB_remap_index },
+   {  3984, CompressedTexImage3DARB_remap_index },
+   { 18273, CompressedTexSubImage1DARB_remap_index },
+   {  2050, CompressedTexSubImage2DARB_remap_index },
+   { 20261, CompressedTexSubImage3DARB_remap_index },
+   { 28485, GetCompressedTexImageARB_remap_index },
+   {  3829, DisableVertexAttribArrayARB_remap_index },
+   { 29871, EnableVertexAttribArrayARB_remap_index },
+   { 31827, GetProgramEnvParameterdvARB_remap_index },
+   { 23480, GetProgramEnvParameterfvARB_remap_index },
+   { 27422, GetProgramLocalParameterdvARB_remap_index },
+   {  8049, GetProgramLocalParameterfvARB_remap_index },
+   { 18407, GetProgramStringARB_remap_index },
+   { 27617, GetProgramivARB_remap_index },
+   { 20456, GetVertexAttribdvARB_remap_index },
+   { 16065, GetVertexAttribfvARB_remap_index },
+   {  9748, GetVertexAttribivARB_remap_index },
+   { 19320, ProgramEnvParameter4dARB_remap_index },
+   { 25149, ProgramEnvParameter4dvARB_remap_index },
+   { 16801, ProgramEnvParameter4fARB_remap_index },
+   {  8948, ProgramEnvParameter4fvARB_remap_index },
+   {  3947, ProgramLocalParameter4dARB_remap_index },
+   { 13019, ProgramLocalParameter4dvARB_remap_index },
+   { 29350, ProgramLocalParameter4fARB_remap_index },
+   { 25785, ProgramLocalParameter4fvARB_remap_index },
+   { 28239, ProgramStringARB_remap_index },
+   { 19570, VertexAttrib1dARB_remap_index },
+   { 15719, VertexAttrib1dvARB_remap_index },
+   {  4122, VertexAttrib1fARB_remap_index },
+   { 32777, VertexAttrib1fvARB_remap_index },
+   {  7133, VertexAttrib1sARB_remap_index },
+   {  2224, VertexAttrib1svARB_remap_index },
+   { 15150, VertexAttrib2dARB_remap_index },
+   { 17500, VertexAttrib2dvARB_remap_index },
+   {  1596, VertexAttrib2fARB_remap_index },
+   { 17613, VertexAttrib2fvARB_remap_index },
+   { 32403, VertexAttrib2sARB_remap_index },
+   { 31464, VertexAttrib2svARB_remap_index },
+   { 11266, VertexAttrib3dARB_remap_index },
+   {  8615, VertexAttrib3dvARB_remap_index },
+   {  1683, VertexAttrib3fARB_remap_index },
+   { 22463, VertexAttrib3fvARB_remap_index },
+   { 28086, VertexAttrib3sARB_remap_index },
+   { 20198, VertexAttrib3svARB_remap_index },
+   {  4895, VertexAttrib4NbvARB_remap_index },
+   { 17836, VertexAttrib4NivARB_remap_index },
+   { 22418, VertexAttrib4NsvARB_remap_index },
+   { 23432, VertexAttrib4NubARB_remap_index },
+   { 31710, VertexAttrib4NubvARB_remap_index },
+   { 18981, VertexAttrib4NuivARB_remap_index },
+   {  3136, VertexAttrib4NusvARB_remap_index },
+   { 10855, VertexAttrib4bvARB_remap_index },
+   { 26795, VertexAttrib4dARB_remap_index },
+   { 21220, VertexAttrib4dvARB_remap_index },
+   { 11420, VertexAttrib4fARB_remap_index },
+   { 11824, VertexAttrib4fvARB_remap_index },
+   { 10231, VertexAttrib4ivARB_remap_index },
+   { 17293, VertexAttrib4sARB_remap_index },
+   { 30899, VertexAttrib4svARB_remap_index },
+   { 16606, VertexAttrib4ubvARB_remap_index },
+   { 30195, VertexAttrib4uivARB_remap_index },
+   { 20009, VertexAttrib4usvARB_remap_index },
+   { 22015, VertexAttribPointerARB_remap_index },
+   { 32537, BindBufferARB_remap_index },
+   {  6840, BufferDataARB_remap_index },
+   {  1498, BufferSubDataARB_remap_index },
+   { 30476, DeleteBuffersARB_remap_index },
+   { 32820, GenBuffersARB_remap_index },
+   { 17656, GetBufferParameterivARB_remap_index },
+   { 16753, GetBufferPointervARB_remap_index },
+   {  1451, GetBufferSubDataARB_remap_index },
+   { 30143, IsBufferARB_remap_index },
+   { 26269, MapBufferARB_remap_index },
+   { 31114, UnmapBufferARB_remap_index },
+   {   312, BeginQueryARB_remap_index },
+   { 19665, DeleteQueriesARB_remap_index },
+   { 12151, EndQueryARB_remap_index },
+   { 28964, GenQueriesARB_remap_index },
+   {  1942, GetQueryObjectivARB_remap_index },
+   { 17337, GetQueryObjectuivARB_remap_index },
+   {  1740, GetQueryivARB_remap_index },
+   { 19916, IsQueryARB_remap_index },
+   {  8225, AttachObjectARB_remap_index },
+   { 18518, CompileShaderARB_remap_index },
+   {  3205, CreateProgramObjectARB_remap_index },
+   {  6785, CreateShaderObjectARB_remap_index },
+   { 14452, DeleteObjectARB_remap_index },
+   { 23919, DetachObjectARB_remap_index },
+   { 11896, GetActiveUniformARB_remap_index },
+   {  9423, GetAttachedObjectsARB_remap_index },
+   {  9730, GetHandleARB_remap_index },
+   { 32570, GetInfoLogARB_remap_index },
+   { 31781, GetObjectParameterfvARB_remap_index },
+   { 27296, GetObjectParameterivARB_remap_index },
+   { 28722, GetShaderSourceARB_remap_index },
+   { 27946, GetUniformLocationARB_remap_index },
+   { 23702, GetUniformfvARB_remap_index },
+   { 12594, GetUniformivARB_remap_index },
+   { 20054, LinkProgramARB_remap_index },
+   { 20112, ShaderSourceARB_remap_index },
+   {  7507, Uniform1fARB_remap_index },
+   { 29559, Uniform1fvARB_remap_index },
+   { 21984, Uniform1iARB_remap_index },
+   { 20909, Uniform1ivARB_remap_index },
+   {  2173, Uniform2fARB_remap_index },
+   { 14288, Uniform2fvARB_remap_index },
+   { 26156, Uniform2iARB_remap_index },
+   {  2293, Uniform2ivARB_remap_index },
+   { 18628, Uniform3fARB_remap_index },
+   {  9453, Uniform3fvARB_remap_index },
+   {  6396, Uniform3iARB_remap_index },
+   { 16859, Uniform3ivARB_remap_index },
+   { 19126, Uniform4fARB_remap_index },
+   { 23566, Uniform4fvARB_remap_index },
+   { 24828, Uniform4iARB_remap_index },
+   { 20422, Uniform4ivARB_remap_index },
+   {  8277, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
-   {  2729, UniformMatrix4fvARB_remap_index },
-   { 25187, UseProgramObjectARB_remap_index },
-   { 14793, ValidateProgramARB_remap_index },
-   { 21218, BindAttribLocationARB_remap_index },
-   {  4927, GetActiveAttribARB_remap_index },
-   { 16495, GetAttribLocationARB_remap_index },
-   { 29287, DrawBuffersARB_remap_index },
-   { 17836, DrawArraysInstancedARB_remap_index },
-   {  6444, DrawElementsInstancedARB_remap_index },
-   { 13150, RenderbufferStorageMultisample_remap_index },
-   { 13621, FramebufferTextureARB_remap_index },
-   { 25613, FramebufferTextureFaceARB_remap_index },
-   { 23994, ProgramParameteriARB_remap_index },
-   { 19129, FlushMappedBufferRange_remap_index },
-   { 27671, MapBufferRange_remap_index },
-   { 16323, BindVertexArray_remap_index },
-   { 14616, GenVertexArrays_remap_index },
-   { 30083, CopyBufferSubData_remap_index },
-   { 31013, ClientWaitSync_remap_index },
-   {  2648, DeleteSync_remap_index },
-   {  7161, FenceSync_remap_index },
-   { 15164, GetInteger64v_remap_index },
-   { 22480, GetSynciv_remap_index },
-   { 29226, IsSync_remap_index },
-   {  9358, WaitSync_remap_index },
-   {  3836, DrawElementsBaseVertex_remap_index },
-   { 30418, DrawRangeElementsBaseVertex_remap_index },
-   { 26226, MultiDrawElementsBaseVertex_remap_index },
-   {  5078, BindTransformFeedback_remap_index },
-   {  3271, DeleteTransformFeedbacks_remap_index },
-   {  6416, DrawTransformFeedback_remap_index },
-   {  9577, GenTransformFeedbacks_remap_index },
-   { 28139, IsTransformFeedback_remap_index },
-   { 25806, PauseTransformFeedback_remap_index },
-   {  5557, ResumeTransformFeedback_remap_index },
-   { 21538, ClearDepthf_remap_index },
-   {  6720, DepthRangef_remap_index },
-   { 14428, GetShaderPrecisionFormat_remap_index },
-   {  9942, ReleaseShaderCompiler_remap_index },
-   { 10885, ShaderBinary_remap_index },
-   {  5425, PolygonOffsetEXT_remap_index },
-   { 23102, GetPixelTexGenParameterfvSGIS_remap_index },
-   {  4404, GetPixelTexGenParameterivSGIS_remap_index },
-   { 22835, PixelTexGenParameterfSGIS_remap_index },
-   {   663, PixelTexGenParameterfvSGIS_remap_index },
-   { 12658, PixelTexGenParameteriSGIS_remap_index },
-   { 13763, PixelTexGenParameterivSGIS_remap_index },
-   { 16411, SampleMaskSGIS_remap_index },
-   { 19811, SamplePatternSGIS_remap_index },
-   { 26155, ColorPointerEXT_remap_index },
-   { 17498, EdgeFlagPointerEXT_remap_index },
-   {  6037, IndexPointerEXT_remap_index },
-   {  6117, NormalPointerEXT_remap_index },
-   { 15758, TexCoordPointerEXT_remap_index },
-   {  6950, VertexPointerEXT_remap_index },
-   {  3638, PointParameterfEXT_remap_index },
-   {  7801, PointParameterfvEXT_remap_index },
-   { 31850, LockArraysEXT_remap_index },
-   { 14857, UnlockArraysEXT_remap_index },
-   {  1306, SecondaryColor3bEXT_remap_index },
-   {  7960, SecondaryColor3bvEXT_remap_index },
-   { 10395, SecondaryColor3dEXT_remap_index },
-   { 25383, SecondaryColor3dvEXT_remap_index },
-   { 28005, SecondaryColor3fEXT_remap_index },
-   { 18164, SecondaryColor3fvEXT_remap_index },
-   {   509, SecondaryColor3iEXT_remap_index },
-   { 16068, SecondaryColor3ivEXT_remap_index },
-   { 10030, SecondaryColor3sEXT_remap_index },
-   { 30677, SecondaryColor3svEXT_remap_index },
-   { 27090, SecondaryColor3ubEXT_remap_index },
-   { 21109, SecondaryColor3ubvEXT_remap_index },
-   { 12900, SecondaryColor3uiEXT_remap_index },
-   { 22722, SecondaryColor3uivEXT_remap_index },
-   { 25663, SecondaryColor3usEXT_remap_index },
-   { 12973, SecondaryColor3usvEXT_remap_index },
-   { 11754, SecondaryColorPointerEXT_remap_index },
-   { 25477, MultiDrawArraysEXT_remap_index },
-   { 20799, MultiDrawElementsEXT_remap_index },
-   { 20994, FogCoordPointerEXT_remap_index },
-   {  4553, FogCoorddEXT_remap_index },
-   { 31251, FogCoorddvEXT_remap_index },
-   {  4670, FogCoordfEXT_remap_index },
-   { 27013, FogCoordfvEXT_remap_index },
-   { 19033, PixelTexGenSGIX_remap_index },
-   { 27598, BlendFuncSeparateEXT_remap_index },
-   {  6862, FlushVertexArrayRangeNV_remap_index },
-   {  5374, VertexArrayRangeNV_remap_index },
-   { 28070, CombinerInputNV_remap_index },
-   {  2155, CombinerOutputNV_remap_index },
-   { 30830, CombinerParameterfNV_remap_index },
-   {  5248, CombinerParameterfvNV_remap_index },
-   { 22204, CombinerParameteriNV_remap_index },
-   { 32266, CombinerParameterivNV_remap_index },
-   {  7238, FinalCombinerInputNV_remap_index },
-   {  9783, GetCombinerInputParameterfvNV_remap_index },
-   { 32103, GetCombinerInputParameterivNV_remap_index },
-   {   216, GetCombinerOutputParameterfvNV_remap_index },
-   { 13724, GetCombinerOutputParameterivNV_remap_index },
-   {  6624, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 24626, GetFinalCombinerInputParameterivNV_remap_index },
-   { 12598, ResizeBuffersMESA_remap_index },
-   { 11080, WindowPos2dMESA_remap_index },
-   {  1099, WindowPos2dvMESA_remap_index },
-   { 33094, WindowPos2fMESA_remap_index },
-   {  7905, WindowPos2fvMESA_remap_index },
-   { 18111, WindowPos2iMESA_remap_index },
-   { 20284, WindowPos2ivMESA_remap_index },
-   { 20898, WindowPos2sMESA_remap_index },
-   {  5735, WindowPos2svMESA_remap_index },
-   {  7730, WindowPos3dMESA_remap_index },
-   { 13971, WindowPos3dvMESA_remap_index },
-   {   555, WindowPos3fMESA_remap_index },
-   { 14918, WindowPos3fvMESA_remap_index },
-   { 23887, WindowPos3iMESA_remap_index },
-   { 30028, WindowPos3ivMESA_remap_index },
-   { 18728, WindowPos3sMESA_remap_index },
-   { 31507, WindowPos3svMESA_remap_index },
-   { 11031, WindowPos4dMESA_remap_index },
-   { 16952, WindowPos4dvMESA_remap_index },
-   { 13930, WindowPos4fMESA_remap_index },
-   { 30584, WindowPos4fvMESA_remap_index },
-   { 30181, WindowPos4iMESA_remap_index },
-   { 12401, WindowPos4ivMESA_remap_index },
-   { 18912, WindowPos4sMESA_remap_index },
-   {  3222, WindowPos4svMESA_remap_index },
-   { 26721, MultiModeDrawArraysIBM_remap_index },
-   { 28845, MultiModeDrawElementsIBM_remap_index },
-   { 12166, DeleteFencesNV_remap_index },
-   { 27917, FinishFenceNV_remap_index },
-   {  3760, GenFencesNV_remap_index },
-   { 16932, GetFenceivNV_remap_index },
-   {  8197, IsFenceNV_remap_index },
-   { 13651, SetFenceNV_remap_index },
-   {  4217, TestFenceNV_remap_index },
-   { 31478, AreProgramsResidentNV_remap_index },
-   { 30872, BindProgramNV_remap_index },
-   { 25746, DeleteProgramsNV_remap_index },
-   { 21327, ExecuteProgramNV_remap_index },
-   { 32987, GenProgramsNV_remap_index },
-   { 23207, GetProgramParameterdvNV_remap_index },
-   { 10457, GetProgramParameterfvNV_remap_index },
-   { 26129, GetProgramStringNV_remap_index },
-   { 24264, GetProgramivNV_remap_index },
-   { 23441, GetTrackMatrixivNV_remap_index },
-   { 25923, GetVertexAttribPointervNV_remap_index },
-   { 24559, GetVertexAttribdvNV_remap_index },
-   {  9253, GetVertexAttribfvNV_remap_index },
-   { 18335, GetVertexAttribivNV_remap_index },
-   { 19159, IsProgramNV_remap_index },
-   {  9336, LoadProgramNV_remap_index },
-   { 27694, ProgramParameters4dvNV_remap_index },
-   { 24194, ProgramParameters4fvNV_remap_index },
-   { 20588, RequestResidentProgramsNV_remap_index },
-   { 22182, TrackMatrixNV_remap_index },
-   { 32080, VertexAttrib1dNV_remap_index },
-   { 13562, VertexAttrib1dvNV_remap_index },
-   { 28351, VertexAttrib1fNV_remap_index },
-   {  2454, VertexAttrib1fvNV_remap_index },
-   { 30641, VertexAttrib1sNV_remap_index },
-   { 14991, VertexAttrib1svNV_remap_index },
-   {  4832, VertexAttrib2dNV_remap_index },
-   { 13455, VertexAttrib2dvNV_remap_index },
-   { 20043, VertexAttrib2fNV_remap_index },
-   { 13021, VertexAttrib2fvNV_remap_index },
-   {  5947, VertexAttrib2sNV_remap_index },
-   { 18782, VertexAttrib2svNV_remap_index },
-   { 11228, VertexAttrib3dNV_remap_index },
-   { 31728, VertexAttrib3dvNV_remap_index },
-   { 10269, VertexAttrib3fNV_remap_index },
-   { 24586, VertexAttrib3fvNV_remap_index },
-   { 22025, VertexAttrib3sNV_remap_index },
-   { 23468, VertexAttrib3svNV_remap_index },
-   { 28819, VertexAttrib4dNV_remap_index },
-   { 33024, VertexAttrib4dvNV_remap_index },
-   {  4454, VertexAttrib4fNV_remap_index },
-   {  9386, VertexAttrib4fvNV_remap_index },
-   { 26605, VertexAttrib4sNV_remap_index },
-   {  1448, VertexAttrib4svNV_remap_index },
-   {  4990, VertexAttrib4ubNV_remap_index },
-   {   817, VertexAttrib4ubvNV_remap_index },
-   { 21507, VertexAttribPointerNV_remap_index },
-   {  2306, VertexAttribs1dvNV_remap_index },
-   { 26011, VertexAttribs1fvNV_remap_index },
-   { 32824, VertexAttribs1svNV_remap_index },
-   { 10294, VertexAttribs2dvNV_remap_index },
-   { 25148, VertexAttribs2fvNV_remap_index },
-   { 17524, VertexAttribs2svNV_remap_index },
-   {  5276, VertexAttribs3dvNV_remap_index },
-   {  2186, VertexAttribs3fvNV_remap_index },
-   { 29776, VertexAttribs3svNV_remap_index },
-   { 26695, VertexAttribs4dvNV_remap_index },
-   {  5348, VertexAttribs4fvNV_remap_index },
-   { 32611, VertexAttribs4svNV_remap_index },
-   { 29524, VertexAttribs4ubvNV_remap_index },
-   { 26797, GetTexBumpParameterfvATI_remap_index },
-   { 32865, GetTexBumpParameterivATI_remap_index },
-   { 18445, TexBumpParameterfvATI_remap_index },
-   { 20459, TexBumpParameterivATI_remap_index },
-   { 15537, AlphaFragmentOp1ATI_remap_index },
-   { 25429, AlphaFragmentOp2ATI_remap_index },
-   { 24502, AlphaFragmentOp3ATI_remap_index },
-   { 29703, BeginFragmentShaderATI_remap_index },
-   { 31071, BindFragmentShaderATI_remap_index },
-   { 23597, ColorFragmentOp1ATI_remap_index },
-   {  4332, ColorFragmentOp2ATI_remap_index },
-   { 31373, ColorFragmentOp3ATI_remap_index },
-   {  5514, DeleteFragmentShaderATI_remap_index },
-   { 33048, EndFragmentShaderATI_remap_index },
-   { 32294, GenFragmentShadersATI_remap_index },
-   { 25302, PassTexCoordATI_remap_index },
-   {  6930, SampleMapATI_remap_index },
-   { 26908, SetFragmentShaderConstantATI_remap_index },
-   {   402, PointParameteriNV_remap_index },
-   { 14132, PointParameterivNV_remap_index },
-   { 28658, ActiveStencilFaceEXT_remap_index },
-   { 27354, BindVertexArrayAPPLE_remap_index },
-   {  2776, DeleteVertexArraysAPPLE_remap_index },
-   { 17941, GenVertexArraysAPPLE_remap_index },
-   { 23272, IsVertexArrayAPPLE_remap_index },
-   {   858, GetProgramNamedParameterdvNV_remap_index },
-   {  3601, GetProgramNamedParameterfvNV_remap_index },
-   { 26828, ProgramNamedParameter4dNV_remap_index },
-   { 14491, ProgramNamedParameter4dvNV_remap_index },
-   {  8869, ProgramNamedParameter4fNV_remap_index },
-   { 11719, ProgramNamedParameter4fvNV_remap_index },
-   { 16863, PrimitiveRestartIndexNV_remap_index },
-   { 30561, PrimitiveRestartNV_remap_index },
-   { 24173, DepthBoundsEXT_remap_index },
-   {  1198, BlendEquationSeparateEXT_remap_index },
-   { 14692, BindFramebufferEXT_remap_index },
-   { 25522, BindRenderbufferEXT_remap_index },
-   {  9633, CheckFramebufferStatusEXT_remap_index },
-   { 22523, DeleteFramebuffersEXT_remap_index },
-   { 31630, DeleteRenderbuffersEXT_remap_index },
-   { 13479, FramebufferRenderbufferEXT_remap_index },
-   { 13668, FramebufferTexture1DEXT_remap_index },
-   { 11513, FramebufferTexture2DEXT_remap_index },
-   { 11133, FramebufferTexture3DEXT_remap_index },
-   { 23138, GenFramebuffersEXT_remap_index },
-   { 17389, GenRenderbuffersEXT_remap_index },
-   {  6666, GenerateMipmapEXT_remap_index },
-   { 21600, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 32200, GetRenderbufferParameterivEXT_remap_index },
-   { 20339, IsFramebufferEXT_remap_index },
-   { 32947, IsRenderbufferEXT_remap_index },
-   {  8144, RenderbufferStorageEXT_remap_index },
-   {   734, BlitFramebufferEXT_remap_index },
-   { 14277, BufferParameteriAPPLE_remap_index },
-   { 19191, FlushMappedBufferRangeAPPLE_remap_index },
-   {  1854, BindFragDataLocationEXT_remap_index },
-   { 24286, GetFragDataLocationEXT_remap_index },
-   { 10572, GetUniformuivEXT_remap_index },
-   {  2972, GetVertexAttribIivEXT_remap_index },
-   { 27865, GetVertexAttribIuivEXT_remap_index },
-   { 11999, Uniform1uiEXT_remap_index },
-   { 27779, Uniform1uivEXT_remap_index },
-   { 22121, Uniform2uiEXT_remap_index },
-   {  4296, Uniform2uivEXT_remap_index },
-   { 29098, Uniform3uiEXT_remap_index },
-   { 14638, Uniform3uivEXT_remap_index },
-   {  3525, Uniform4uiEXT_remap_index },
-   {  8645, Uniform4uivEXT_remap_index },
-   { 18292, VertexAttribI1iEXT_remap_index },
-   {  1004, VertexAttribI1ivEXT_remap_index },
-   {  2555, VertexAttribI1uiEXT_remap_index },
-   { 12749, VertexAttribI1uivEXT_remap_index },
+   {  2690, UniformMatrix4fvARB_remap_index },
+   { 25261, UseProgramObjectARB_remap_index },
+   { 14838, ValidateProgramARB_remap_index },
+   { 21263, BindAttribLocationARB_remap_index },
+   {  4940, GetActiveAttribARB_remap_index },
+   { 16540, GetAttribLocationARB_remap_index },
+   { 29277, DrawBuffersARB_remap_index },
+   { 17881, DrawArraysInstancedARB_remap_index },
+   {  6457, DrawElementsInstancedARB_remap_index },
+   { 13124, RenderbufferStorageMultisample_remap_index },
+   { 13595, FramebufferTextureARB_remap_index },
+   { 25687, FramebufferTextureFaceARB_remap_index },
+   { 24068, ProgramParameteriARB_remap_index },
+   { 23384, VertexAttribDivisorARB_remap_index },
+   { 19174, FlushMappedBufferRange_remap_index },
+   { 27713, MapBufferRange_remap_index },
+   { 16368, BindVertexArray_remap_index },
+   { 14661, GenVertexArrays_remap_index },
+   { 30073, CopyBufferSubData_remap_index },
+   { 31003, ClientWaitSync_remap_index },
+   {  2609, DeleteSync_remap_index },
+   {  7174, FenceSync_remap_index },
+   { 15209, GetInteger64v_remap_index },
+   { 22525, GetSynciv_remap_index },
+   { 29216, IsSync_remap_index },
+   {  9371, WaitSync_remap_index },
+   {  3797, DrawElementsBaseVertex_remap_index },
+   { 30408, DrawRangeElementsBaseVertex_remap_index },
+   { 26300, MultiDrawElementsBaseVertex_remap_index },
+   {  5091, BindTransformFeedback_remap_index },
+   {  3232, DeleteTransformFeedbacks_remap_index },
+   {  6429, DrawTransformFeedback_remap_index },
+   {  9590, GenTransformFeedbacks_remap_index },
+   { 28129, IsTransformFeedback_remap_index },
+   { 25880, PauseTransformFeedback_remap_index },
+   {  5528, ResumeTransformFeedback_remap_index },
+   { 21583, ClearDepthf_remap_index },
+   {  6733, DepthRangef_remap_index },
+   { 14473, GetShaderPrecisionFormat_remap_index },
+   {  9955, ReleaseShaderCompiler_remap_index },
+   { 10898, ShaderBinary_remap_index },
+   {  5396, PolygonOffsetEXT_remap_index },
+   { 23147, GetPixelTexGenParameterfvSGIS_remap_index },
+   {  4417, GetPixelTexGenParameterivSGIS_remap_index },
+   { 22880, PixelTexGenParameterfSGIS_remap_index },
+   {   624, PixelTexGenParameterfvSGIS_remap_index },
+   { 12632, PixelTexGenParameteriSGIS_remap_index },
+   { 13769, PixelTexGenParameterivSGIS_remap_index },
+   { 16456, SampleMaskSGIS_remap_index },
+   { 19856, SamplePatternSGIS_remap_index },
+   { 26229, ColorPointerEXT_remap_index },
+   { 17543, EdgeFlagPointerEXT_remap_index },
+   {  6050, IndexPointerEXT_remap_index },
+   {  6130, NormalPointerEXT_remap_index },
+   { 15803, TexCoordPointerEXT_remap_index },
+   {  6963, VertexPointerEXT_remap_index },
+   {  3599, PointParameterfEXT_remap_index },
+   {  7814, PointParameterfvEXT_remap_index },
+   { 31879, LockArraysEXT_remap_index },
+   { 14902, UnlockArraysEXT_remap_index },
+   {  1267, SecondaryColor3bEXT_remap_index },
+   {  7973, SecondaryColor3bvEXT_remap_index },
+   { 10408, SecondaryColor3dEXT_remap_index },
+   { 25457, SecondaryColor3dvEXT_remap_index },
+   { 27995, SecondaryColor3fEXT_remap_index },
+   { 18209, SecondaryColor3fvEXT_remap_index },
+   {   470, SecondaryColor3iEXT_remap_index },
+   { 16113, SecondaryColor3ivEXT_remap_index },
+   { 10043, SecondaryColor3sEXT_remap_index },
+   { 30667, SecondaryColor3svEXT_remap_index },
+   { 27132, SecondaryColor3ubEXT_remap_index },
+   { 21154, SecondaryColor3ubvEXT_remap_index },
+   { 12874, SecondaryColor3uiEXT_remap_index },
+   { 22767, SecondaryColor3uivEXT_remap_index },
+   { 25737, SecondaryColor3usEXT_remap_index },
+   { 12947, SecondaryColor3usvEXT_remap_index },
+   { 11767, SecondaryColorPointerEXT_remap_index },
+   { 25551, MultiDrawArraysEXT_remap_index },
+   { 20844, MultiDrawElementsEXT_remap_index },
+   { 21039, FogCoordPointerEXT_remap_index },
+   {  4566, FogCoorddEXT_remap_index },
+   { 31280, FogCoorddvEXT_remap_index },
+   {  4683, FogCoordfEXT_remap_index },
+   { 27055, FogCoordfvEXT_remap_index },
+   { 19078, PixelTexGenSGIX_remap_index },
+   { 27640, BlendFuncSeparateEXT_remap_index },
+   {  6875, FlushVertexArrayRangeNV_remap_index },
+   {  5345, VertexArrayRangeNV_remap_index },
+   { 28060, CombinerInputNV_remap_index },
+   {  2116, CombinerOutputNV_remap_index },
+   { 30820, CombinerParameterfNV_remap_index },
+   {  5219, CombinerParameterfvNV_remap_index },
+   { 22249, CombinerParameteriNV_remap_index },
+   { 32295, CombinerParameterivNV_remap_index },
+   {  7251, FinalCombinerInputNV_remap_index },
+   {  9796, GetCombinerInputParameterfvNV_remap_index },
+   { 32132, GetCombinerInputParameterivNV_remap_index },
+   { 13870, GetCombinerOutputParameterfvNV_remap_index },
+   { 13698, GetCombinerOutputParameterivNV_remap_index },
+   {  6637, GetFinalCombinerInputParameterfvNV_remap_index },
+   { 24700, GetFinalCombinerInputParameterivNV_remap_index },
+   { 12572, ResizeBuffersMESA_remap_index },
+   { 11093, WindowPos2dMESA_remap_index },
+   {  1060, WindowPos2dvMESA_remap_index },
+   { 33123, WindowPos2fMESA_remap_index },
+   {  7918, WindowPos2fvMESA_remap_index },
+   { 18156, WindowPos2iMESA_remap_index },
+   { 20329, WindowPos2ivMESA_remap_index },
+   { 20943, WindowPos2sMESA_remap_index },
+   {  5748, WindowPos2svMESA_remap_index },
+   {  7743, WindowPos3dMESA_remap_index },
+   { 14016, WindowPos3dvMESA_remap_index },
+   {   516, WindowPos3fMESA_remap_index },
+   { 14963, WindowPos3fvMESA_remap_index },
+   { 23961, WindowPos3iMESA_remap_index },
+   { 30018, WindowPos3ivMESA_remap_index },
+   { 18773, WindowPos3sMESA_remap_index },
+   { 31536, WindowPos3svMESA_remap_index },
+   { 11044, WindowPos4dMESA_remap_index },
+   { 16997, WindowPos4dvMESA_remap_index },
+   { 13975, WindowPos4fMESA_remap_index },
+   { 30574, WindowPos4fvMESA_remap_index },
+   { 30171, WindowPos4iMESA_remap_index },
+   { 12375, WindowPos4ivMESA_remap_index },
+   { 18957, WindowPos4sMESA_remap_index },
+   {  3183, WindowPos4svMESA_remap_index },
+   { 13737, MultiModeDrawArraysIBM_remap_index },
+   { 28835, MultiModeDrawElementsIBM_remap_index },
+   { 12179, DeleteFencesNV_remap_index },
+   { 27907, FinishFenceNV_remap_index },
+   {  3721, GenFencesNV_remap_index },
+   { 16977, GetFenceivNV_remap_index },
+   {  8210, IsFenceNV_remap_index },
+   { 13625, SetFenceNV_remap_index },
+   {  4178, TestFenceNV_remap_index },
+   { 31507, AreProgramsResidentNV_remap_index },
+   { 30862, BindProgramNV_remap_index },
+   { 25820, DeleteProgramsNV_remap_index },
+   { 21372, ExecuteProgramNV_remap_index },
+   { 33016, GenProgramsNV_remap_index },
+   { 23252, GetProgramParameterdvNV_remap_index },
+   { 10470, GetProgramParameterfvNV_remap_index },
+   { 26203, GetProgramStringNV_remap_index },
+   { 24338, GetProgramivNV_remap_index },
+   { 23515, GetTrackMatrixivNV_remap_index },
+   { 25997, GetVertexAttribPointervNV_remap_index },
+   { 24633, GetVertexAttribdvNV_remap_index },
+   {  9266, GetVertexAttribfvNV_remap_index },
+   { 18380, GetVertexAttribivNV_remap_index },
+   { 19204, IsProgramNV_remap_index },
+   {  9349, LoadProgramNV_remap_index },
+   { 27736, ProgramParameters4dvNV_remap_index },
+   { 24268, ProgramParameters4fvNV_remap_index },
+   { 20633, RequestResidentProgramsNV_remap_index },
+   { 22227, TrackMatrixNV_remap_index },
+   { 32109, VertexAttrib1dNV_remap_index },
+   { 13536, VertexAttrib1dvNV_remap_index },
+   { 28341, VertexAttrib1fNV_remap_index },
+   {  2415, VertexAttrib1fvNV_remap_index },
+   { 30631, VertexAttrib1sNV_remap_index },
+   { 15036, VertexAttrib1svNV_remap_index },
+   {  4845, VertexAttrib2dNV_remap_index },
+   { 13429, VertexAttrib2dvNV_remap_index },
+   { 20088, VertexAttrib2fNV_remap_index },
+   { 12995, VertexAttrib2fvNV_remap_index },
+   {  5960, VertexAttrib2sNV_remap_index },
+   { 18827, VertexAttrib2svNV_remap_index },
+   { 11241, VertexAttrib3dNV_remap_index },
+   { 31757, VertexAttrib3dvNV_remap_index },
+   { 10282, VertexAttrib3fNV_remap_index },
+   { 24660, VertexAttrib3fvNV_remap_index },
+   { 22070, VertexAttrib3sNV_remap_index },
+   { 23542, VertexAttrib3svNV_remap_index },
+   { 28809, VertexAttrib4dNV_remap_index },
+   { 33053, VertexAttrib4dvNV_remap_index },
+   {  4467, VertexAttrib4fNV_remap_index },
+   {  9399, VertexAttrib4fvNV_remap_index },
+   { 26679, VertexAttrib4sNV_remap_index },
+   {  1409, VertexAttrib4svNV_remap_index },
+   {  5003, VertexAttrib4ubNV_remap_index },
+   {   778, VertexAttrib4ubvNV_remap_index },
+   { 21552, VertexAttribPointerNV_remap_index },
+   {  2267, VertexAttribs1dvNV_remap_index },
+   { 26085, VertexAttribs1fvNV_remap_index },
+   { 32853, VertexAttribs1svNV_remap_index },
+   { 10307, VertexAttribs2dvNV_remap_index },
+   { 25222, VertexAttribs2fvNV_remap_index },
+   { 17569, VertexAttribs2svNV_remap_index },
+   {  5247, VertexAttribs3dvNV_remap_index },
+   {  2147, VertexAttribs3fvNV_remap_index },
+   { 29766, VertexAttribs3svNV_remap_index },
+   { 26769, VertexAttribs4dvNV_remap_index },
+   {  5319, VertexAttribs4fvNV_remap_index },
+   { 32640, VertexAttribs4svNV_remap_index },
+   { 29514, VertexAttribs4ubvNV_remap_index },
+   { 26839, GetTexBumpParameterfvATI_remap_index },
+   { 32894, GetTexBumpParameterivATI_remap_index },
+   { 18490, TexBumpParameterfvATI_remap_index },
+   { 20504, TexBumpParameterivATI_remap_index },
+   { 15582, AlphaFragmentOp1ATI_remap_index },
+   { 25503, AlphaFragmentOp2ATI_remap_index },
+   { 24576, AlphaFragmentOp3ATI_remap_index },
+   { 29693, BeginFragmentShaderATI_remap_index },
+   { 31061, BindFragmentShaderATI_remap_index },
+   { 23671, ColorFragmentOp1ATI_remap_index },
+   {  4345, ColorFragmentOp2ATI_remap_index },
+   { 31402, ColorFragmentOp3ATI_remap_index },
+   {  5485, DeleteFragmentShaderATI_remap_index },
+   { 33077, EndFragmentShaderATI_remap_index },
+   { 32323, GenFragmentShadersATI_remap_index },
+   { 25376, PassTexCoordATI_remap_index },
+   {  6943, SampleMapATI_remap_index },
+   { 26950, SetFragmentShaderConstantATI_remap_index },
+   {   363, PointParameteriNV_remap_index },
+   { 14177, PointParameterivNV_remap_index },
+   { 28648, ActiveStencilFaceEXT_remap_index },
+   { 27396, BindVertexArrayAPPLE_remap_index },
+   {  2737, DeleteVertexArraysAPPLE_remap_index },
+   { 17986, GenVertexArraysAPPLE_remap_index },
+   { 23317, IsVertexArrayAPPLE_remap_index },
+   {   819, GetProgramNamedParameterdvNV_remap_index },
+   {  3562, GetProgramNamedParameterfvNV_remap_index },
+   { 26870, ProgramNamedParameter4dNV_remap_index },
+   { 14536, ProgramNamedParameter4dvNV_remap_index },
+   {  8882, ProgramNamedParameter4fNV_remap_index },
+   { 11732, ProgramNamedParameter4fvNV_remap_index },
+   { 16908, PrimitiveRestartIndexNV_remap_index },
+   { 30551, PrimitiveRestartNV_remap_index },
+   { 24247, DepthBoundsEXT_remap_index },
+   {  1159, BlendEquationSeparateEXT_remap_index },
+   { 14737, BindFramebufferEXT_remap_index },
+   { 25596, BindRenderbufferEXT_remap_index },
+   {  9646, CheckFramebufferStatusEXT_remap_index },
+   { 22568, DeleteFramebuffersEXT_remap_index },
+   { 31659, DeleteRenderbuffersEXT_remap_index },
+   { 13453, FramebufferRenderbufferEXT_remap_index },
+   { 13642, FramebufferTexture1DEXT_remap_index },
+   { 11526, FramebufferTexture2DEXT_remap_index },
+   { 11146, FramebufferTexture3DEXT_remap_index },
+   { 23183, GenFramebuffersEXT_remap_index },
+   { 17434, GenRenderbuffersEXT_remap_index },
+   {  6679, GenerateMipmapEXT_remap_index },
+   { 21645, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 32229, GetRenderbufferParameterivEXT_remap_index },
+   { 20384, IsFramebufferEXT_remap_index },
+   { 32976, IsRenderbufferEXT_remap_index },
+   {  8157, RenderbufferStorageEXT_remap_index },
+   {   695, BlitFramebufferEXT_remap_index },
+   { 14322, BufferParameteriAPPLE_remap_index },
+   { 19236, FlushMappedBufferRangeAPPLE_remap_index },
+   {  1815, BindFragDataLocationEXT_remap_index },
+   { 24360, GetFragDataLocationEXT_remap_index },
+   { 10585, GetUniformuivEXT_remap_index },
+   {  2933, GetVertexAttribIivEXT_remap_index },
+   {  4195, GetVertexAttribIuivEXT_remap_index },
+   { 12012, Uniform1uiEXT_remap_index },
+   { 27821, Uniform1uivEXT_remap_index },
+   { 22166, Uniform2uiEXT_remap_index },
+   {  4309, Uniform2uivEXT_remap_index },
+   { 29088, Uniform3uiEXT_remap_index },
+   { 14683, Uniform3uivEXT_remap_index },
+   {  3486, Uniform4uiEXT_remap_index },
+   {  8658, Uniform4uivEXT_remap_index },
+   { 18337, VertexAttribI1iEXT_remap_index },
+   {   965, VertexAttribI1ivEXT_remap_index },
+   {  2516, VertexAttribI1uiEXT_remap_index },
+   { 12723, VertexAttribI1uivEXT_remap_index },
    {    81, VertexAttribI2iEXT_remap_index },
-   { 23709, VertexAttribI2ivEXT_remap_index },
-   {  5302, VertexAttribI2uiEXT_remap_index },
-   {  4715, VertexAttribI2uivEXT_remap_index },
-   { 26397, VertexAttribI3iEXT_remap_index },
-   { 30373, VertexAttribI3ivEXT_remap_index },
-   {  3379, VertexAttribI3uiEXT_remap_index },
-   { 30269, VertexAttribI3uivEXT_remap_index },
-   { 21851, VertexAttribI4bvEXT_remap_index },
-   { 14570, VertexAttribI4iEXT_remap_index },
-   { 31899, VertexAttribI4ivEXT_remap_index },
-   { 13382, VertexAttribI4svEXT_remap_index },
-   { 16448, VertexAttribI4ubvEXT_remap_index },
-   { 16131, VertexAttribI4uiEXT_remap_index },
-   {  5448, VertexAttribI4uivEXT_remap_index },
-   { 11296, VertexAttribI4usvEXT_remap_index },
-   { 18389, VertexAttribIPointerEXT_remap_index },
-   {  3066, FramebufferTextureLayerEXT_remap_index },
-   {  5172, ColorMaskIndexedEXT_remap_index },
-   { 18806, DisableIndexedEXT_remap_index },
-   { 26442, EnableIndexedEXT_remap_index },
-   { 21555, GetBooleanIndexedvEXT_remap_index },
-   { 10907, GetIntegerIndexedvEXT_remap_index },
-   { 22599, IsEnabledIndexedEXT_remap_index },
-   { 22499, ClearColorIiEXT_remap_index },
-   {  3475, ClearColorIuiEXT_remap_index },
-   {  9822, GetTexParameterIivEXT_remap_index },
-   {  5895, GetTexParameterIuivEXT_remap_index },
-   {  3022, TexParameterIivEXT_remap_index },
-   { 26264, TexParameterIuivEXT_remap_index },
-   {  4583, BeginConditionalRenderNV_remap_index },
-   { 25252, EndConditionalRenderNV_remap_index },
-   {  9280, BeginTransformFeedbackEXT_remap_index },
-   { 18841, BindBufferBaseEXT_remap_index },
-   { 18700, BindBufferOffsetEXT_remap_index },
-   { 12226, BindBufferRangeEXT_remap_index },
-   { 14192, EndTransformFeedbackEXT_remap_index },
-   { 10770, GetTransformFeedbackVaryingEXT_remap_index },
-   { 20644, TransformFeedbackVaryingsEXT_remap_index },
-   { 29425, ProvokingVertexEXT_remap_index },
-   { 10718, GetTexParameterPointervAPPLE_remap_index },
-   {  5034, TextureRangeAPPLE_remap_index },
-   { 11585, GetObjectParameterivAPPLE_remap_index },
-   { 19766, ObjectPurgeableAPPLE_remap_index },
-   {  5689, ObjectUnpurgeableAPPLE_remap_index },
-   { 17211, ActiveProgramEXT_remap_index },
-   { 17182, CreateShaderProgramEXT_remap_index },
-   { 28443, UseShaderProgramEXT_remap_index },
-   { 28684, StencilFuncSeparateATI_remap_index },
-   { 18030, ProgramEnvParameters4fvEXT_remap_index },
-   { 17076, ProgramLocalParameters4fvEXT_remap_index },
-   { 14060, GetQueryObjecti64vEXT_remap_index },
-   { 10320, GetQueryObjectui64vEXT_remap_index },
-   { 23666, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 12105, EGLImageTargetTexture2DOES_remap_index },
+   { 23783, VertexAttribI2ivEXT_remap_index },
+   {  5273, VertexAttribI2uiEXT_remap_index },
+   {  4728, VertexAttribI2uivEXT_remap_index },
+   { 26471, VertexAttribI3iEXT_remap_index },
+   { 30363, VertexAttribI3ivEXT_remap_index },
+   {  3340, VertexAttribI3uiEXT_remap_index },
+   { 30259, VertexAttribI3uivEXT_remap_index },
+   { 21896, VertexAttribI4bvEXT_remap_index },
+   { 14615, VertexAttribI4iEXT_remap_index },
+   { 31928, VertexAttribI4ivEXT_remap_index },
+   { 13356, VertexAttribI4svEXT_remap_index },
+   { 16493, VertexAttribI4ubvEXT_remap_index },
+   { 16176, VertexAttribI4uiEXT_remap_index },
+   {  5419, VertexAttribI4uivEXT_remap_index },
+   { 11309, VertexAttribI4usvEXT_remap_index },
+   { 18434, VertexAttribIPointerEXT_remap_index },
+   {  3027, FramebufferTextureLayerEXT_remap_index },
+   {  5660, ColorMaskIndexedEXT_remap_index },
+   { 18851, DisableIndexedEXT_remap_index },
+   { 26516, EnableIndexedEXT_remap_index },
+   { 21600, GetBooleanIndexedvEXT_remap_index },
+   { 10920, GetIntegerIndexedvEXT_remap_index },
+   { 22644, IsEnabledIndexedEXT_remap_index },
+   { 22544, ClearColorIiEXT_remap_index },
+   {  3436, ClearColorIuiEXT_remap_index },
+   {  9835, GetTexParameterIivEXT_remap_index },
+   {  5908, GetTexParameterIuivEXT_remap_index },
+   {  2983, TexParameterIivEXT_remap_index },
+   { 26338, TexParameterIuivEXT_remap_index },
+   {  4596, BeginConditionalRenderNV_remap_index },
+   { 25326, EndConditionalRenderNV_remap_index },
+   {  9293, BeginTransformFeedbackEXT_remap_index },
+   { 18886, BindBufferBaseEXT_remap_index },
+   { 18745, BindBufferOffsetEXT_remap_index },
+   { 12200, BindBufferRangeEXT_remap_index },
+   { 14237, EndTransformFeedbackEXT_remap_index },
+   { 10783, GetTransformFeedbackVaryingEXT_remap_index },
+   { 20689, TransformFeedbackVaryingsEXT_remap_index },
+   { 29415, ProvokingVertexEXT_remap_index },
+   { 10731, GetTexParameterPointervAPPLE_remap_index },
+   {  5047, TextureRangeAPPLE_remap_index },
+   { 11598, GetObjectParameterivAPPLE_remap_index },
+   { 19811, ObjectPurgeableAPPLE_remap_index },
+   {  5702, ObjectUnpurgeableAPPLE_remap_index },
+   { 17256, ActiveProgramEXT_remap_index },
+   { 17227, CreateShaderProgramEXT_remap_index },
+   { 28433, UseShaderProgramEXT_remap_index },
+   { 28674, StencilFuncSeparateATI_remap_index },
+   { 18075, ProgramEnvParameters4fvEXT_remap_index },
+   { 17121, ProgramLocalParameters4fvEXT_remap_index },
+   { 14105, GetQueryObjecti64vEXT_remap_index },
+   { 10333, GetQueryObjectui64vEXT_remap_index },
+   { 23740, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 12118, 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 */
-   {  2694, _gloffset_BlendColor },
+   {  2655, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 11190, _gloffset_BlendEquation },
+   { 11203, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 16974, _gloffset_ColorSubTable },
-   { 31562, _gloffset_CopyColorSubTable },
+   { 17019, _gloffset_ColorSubTable },
+   { 31591, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
-   {   296, _gloffset_ConvolutionFilter1D },
-   {  2493, _gloffset_CopyConvolutionFilter1D },
-   {  4097, _gloffset_GetConvolutionParameteriv },
-   {  8493, _gloffset_ConvolutionFilter2D },
-   {  8695, _gloffset_ConvolutionParameteriv },
-   {  9155, _gloffset_ConvolutionParameterfv },
-   { 20487, _gloffset_GetSeparableFilter },
-   { 23941, _gloffset_SeparableFilter2D },
-   { 24804, _gloffset_ConvolutionParameteri },
-   { 24927, _gloffset_ConvolutionParameterf },
-   { 26631, _gloffset_GetConvolutionParameterfv },
-   { 27520, _gloffset_GetConvolutionFilter },
-   { 29965, _gloffset_CopyConvolutionFilter2D },
+   {   257, _gloffset_ConvolutionFilter1D },
+   {  2454, _gloffset_CopyConvolutionFilter1D },
+   {  4058, _gloffset_GetConvolutionParameteriv },
+   {  8506, _gloffset_ConvolutionFilter2D },
+   {  8708, _gloffset_ConvolutionParameteriv },
+   {  9168, _gloffset_ConvolutionParameterfv },
+   { 20532, _gloffset_GetSeparableFilter },
+   { 24015, _gloffset_SeparableFilter2D },
+   { 24878, _gloffset_ConvolutionParameteri },
+   { 25001, _gloffset_ConvolutionParameterf },
+   { 26705, _gloffset_GetConvolutionParameterfv },
+   { 27562, _gloffset_GetConvolutionFilter },
+   { 29955, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 15051, _gloffset_CopyTexSubImage3D },
-   { 16661, _gloffset_CopyTexImage2D },
-   { 24412, _gloffset_CopyTexImage1D },
-   { 27201, _gloffset_CopyTexSubImage2D },
-   { 29603, _gloffset_CopyTexSubImage1D },
+   { 15096, _gloffset_CopyTexSubImage3D },
+   { 16706, _gloffset_CopyTexImage2D },
+   { 24486, _gloffset_CopyTexImage1D },
+   { 27243, _gloffset_CopyTexSubImage2D },
+   { 29593, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
-   {  9492, _gloffset_DrawRangeElements },
+   {  9505, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
-   {   895, _gloffset_Histogram },
-   {  3561, _gloffset_ResetHistogram },
-   {  9968, _gloffset_GetMinmax },
-   { 15385, _gloffset_GetHistogramParameterfv },
-   { 24337, _gloffset_GetMinmaxParameteriv },
-   { 26521, _gloffset_ResetMinmax },
-   { 27417, _gloffset_GetHistogramParameteriv },
-   { 28618, _gloffset_GetHistogram },
-   { 31187, _gloffset_Minmax },
-   { 32694, _gloffset_GetMinmaxParameterfv },
+   {   856, _gloffset_Histogram },
+   {  3522, _gloffset_ResetHistogram },
+   {  9981, _gloffset_GetMinmax },
+   { 15430, _gloffset_GetHistogramParameterfv },
+   { 24411, _gloffset_GetMinmaxParameteriv },
+   { 26595, _gloffset_ResetMinmax },
+   { 27459, _gloffset_GetHistogramParameteriv },
+   { 28608, _gloffset_GetHistogram },
+   { 31177, _gloffset_Minmax },
+   { 32723, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
-   {  8355, _gloffset_ColorTable },
-   { 15231, _gloffset_GetColorTable },
-   { 22885, _gloffset_GetColorTableParameterfv },
-   { 24983, _gloffset_GetColorTableParameteriv },
+   {  8368, _gloffset_ColorTable },
+   { 15276, _gloffset_GetColorTable },
+   { 22930, _gloffset_GetColorTableParameterfv },
+   { 25057, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
-   {  7076, _gloffset_TexSubImage1D },
-   { 10645, _gloffset_TexSubImage2D },
+   {  7089, _gloffset_TexSubImage1D },
+   { 10658, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
-   {  1813, _gloffset_TexImage3D },
-   { 22654, _gloffset_TexSubImage3D },
+   {  1774, _gloffset_TexImage3D },
+   { 22699, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
-   {  3329, _gloffset_PrioritizeTextures },
-   {  7525, _gloffset_AreTexturesResident },
-   { 13586, _gloffset_GenTextures },
-   { 15717, _gloffset_DeleteTextures },
-   { 19472, _gloffset_IsTexture },
-   { 29668, _gloffset_BindTexture },
+   {  3290, _gloffset_PrioritizeTextures },
+   {  7538, _gloffset_AreTexturesResident },
+   { 13560, _gloffset_GenTextures },
+   { 15762, _gloffset_DeleteTextures },
+   { 19517, _gloffset_IsTexture },
+   { 29658, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 24113, _gloffset_ArrayElement },
-   { 30775, _gloffset_GetPointerv },
-   { 32321, _gloffset_DrawArrays },
+   { 24187, _gloffset_ArrayElement },
+   { 30765, _gloffset_GetPointerv },
+   { 32350, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
-   {  7643, _gloffset_ColorTableParameteriv },
-   {  8355, _gloffset_ColorTable },
-   { 15231, _gloffset_GetColorTable },
-   { 15341, _gloffset_CopyColorTable },
-   { 19333, _gloffset_ColorTableParameterfv },
-   { 22885, _gloffset_GetColorTableParameterfv },
-   { 24983, _gloffset_GetColorTableParameteriv },
+   {  7656, _gloffset_ColorTableParameteriv },
+   {  8368, _gloffset_ColorTable },
+   { 15276, _gloffset_GetColorTable },
+   { 15386, _gloffset_CopyColorTable },
+   { 19378, _gloffset_ColorTableParameterfv },
+   { 22930, _gloffset_GetColorTableParameterfv },
+   { 25057, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
-   {   464, _gloffset_MultiTexCoord3sARB },
-   {   696, _gloffset_ActiveTextureARB },
-   {  4234, _gloffset_MultiTexCoord1fvARB },
-   {  6142, _gloffset_MultiTexCoord3dARB },
-   {  6187, _gloffset_MultiTexCoord2iARB },
-   {  6311, _gloffset_MultiTexCoord2svARB },
-   {  8311, _gloffset_MultiTexCoord2fARB },
-   { 10350, _gloffset_MultiTexCoord3fvARB },
-   { 10952, _gloffset_MultiTexCoord4sARB },
-   { 11633, _gloffset_MultiTexCoord2dvARB },
-   { 12048, _gloffset_MultiTexCoord1svARB },
-   { 12459, _gloffset_MultiTexCoord3svARB },
-   { 12520, _gloffset_MultiTexCoord4iARB },
-   { 13290, _gloffset_MultiTexCoord3iARB },
-   { 14089, _gloffset_MultiTexCoord1dARB },
-   { 14306, _gloffset_MultiTexCoord3dvARB },
-   { 15585, _gloffset_MultiTexCoord3ivARB },
-   { 15630, _gloffset_MultiTexCoord2sARB },
-   { 17031, _gloffset_MultiTexCoord4ivARB },
-   { 18983, _gloffset_ClientActiveTextureARB },
-   { 21283, _gloffset_MultiTexCoord2dARB },
-   { 21720, _gloffset_MultiTexCoord4dvARB },
-   { 22076, _gloffset_MultiTexCoord4fvARB },
-   { 23026, _gloffset_MultiTexCoord3fARB },
-   { 25567, _gloffset_MultiTexCoord4dARB },
-   { 25833, _gloffset_MultiTexCoord1sARB },
-   { 26037, _gloffset_MultiTexCoord1dvARB },
-   { 27045, _gloffset_MultiTexCoord1ivARB },
-   { 27138, _gloffset_MultiTexCoord2ivARB },
-   { 27477, _gloffset_MultiTexCoord1iARB },
-   { 28893, _gloffset_MultiTexCoord4svARB },
-   { 29467, _gloffset_MultiTexCoord1fARB },
-   { 29730, _gloffset_MultiTexCoord4fARB },
-   { 32155, _gloffset_MultiTexCoord2fvARB },
+   {   425, _gloffset_MultiTexCoord3sARB },
+   {   657, _gloffset_ActiveTextureARB },
+   {  4247, _gloffset_MultiTexCoord1fvARB },
+   {  6155, _gloffset_MultiTexCoord3dARB },
+   {  6200, _gloffset_MultiTexCoord2iARB },
+   {  6324, _gloffset_MultiTexCoord2svARB },
+   {  8324, _gloffset_MultiTexCoord2fARB },
+   { 10363, _gloffset_MultiTexCoord3fvARB },
+   { 10965, _gloffset_MultiTexCoord4sARB },
+   { 11646, _gloffset_MultiTexCoord2dvARB },
+   { 12061, _gloffset_MultiTexCoord1svARB },
+   { 12433, _gloffset_MultiTexCoord3svARB },
+   { 12494, _gloffset_MultiTexCoord4iARB },
+   { 13264, _gloffset_MultiTexCoord3iARB },
+   { 14134, _gloffset_MultiTexCoord1dARB },
+   { 14351, _gloffset_MultiTexCoord3dvARB },
+   { 15630, _gloffset_MultiTexCoord3ivARB },
+   { 15675, _gloffset_MultiTexCoord2sARB },
+   { 17076, _gloffset_MultiTexCoord4ivARB },
+   { 19028, _gloffset_ClientActiveTextureARB },
+   { 21328, _gloffset_MultiTexCoord2dARB },
+   { 21765, _gloffset_MultiTexCoord4dvARB },
+   { 22121, _gloffset_MultiTexCoord4fvARB },
+   { 23071, _gloffset_MultiTexCoord3fARB },
+   { 25641, _gloffset_MultiTexCoord4dARB },
+   { 25907, _gloffset_MultiTexCoord1sARB },
+   { 26111, _gloffset_MultiTexCoord1dvARB },
+   { 27087, _gloffset_MultiTexCoord1ivARB },
+   { 27180, _gloffset_MultiTexCoord2ivARB },
+   { 27519, _gloffset_MultiTexCoord1iARB },
+   { 28883, _gloffset_MultiTexCoord4svARB },
+   { 29457, _gloffset_MultiTexCoord1fARB },
+   { 29720, _gloffset_MultiTexCoord4fARB },
+   { 32184, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 
@@ -5354,7 +5359,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[] = {
-   {  9213, -1 }, /* TbufferMask3DFX */
+   {  9226, -1 }, /* TbufferMask3DFX */
    {    -1, -1 }
 };
 #endif
@@ -5432,7 +5437,14 @@ 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[] = {
-   { 12423, -1 }, /* FramebufferTextureLayer */
+   { 12397, -1 }, /* FramebufferTextureLayer */
+   {    -1, -1 }
+};
+#endif
+
+#if defined(need_GL_ARB_instanced_arrays)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_ARB_instanced_arrays_functions[] = {
    {    -1, -1 }
 };
 #endif
@@ -5446,11 +5458,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[] = {
-   {  3812, -1 }, /* MatrixIndexusvARB */
-   { 13111, -1 }, /* MatrixIndexuivARB */
-   { 14461, -1 }, /* MatrixIndexPointerARB */
-   { 19721, -1 }, /* CurrentPaletteMatrixARB */
-   { 22770, -1 }, /* MatrixIndexubvARB */
+   {  3773, -1 }, /* MatrixIndexusvARB */
+   { 13085, -1 }, /* MatrixIndexuivARB */
+   { 14506, -1 }, /* MatrixIndexPointerARB */
+   { 19766, -1 }, /* CurrentPaletteMatrixARB */
+   { 22815, -1 }, /* MatrixIndexubvARB */
    {    -1, -1 }
 };
 #endif
@@ -5527,16 +5539,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[] = {
-   {  2435, -1 }, /* WeightubvARB */
-   {  6554, -1 }, /* WeightivARB */
-   { 11055, -1 }, /* WeightPointerARB */
-   { 13846, -1 }, /* WeightfvARB */
-   { 17550, -1 }, /* WeightbvARB */
-   { 20951, -1 }, /* WeightusvARB */
-   { 23867, -1 }, /* VertexBlendARB */
-   { 29551, -1 }, /* WeightsvARB */
-   { 31612, -1 }, /* WeightdvARB */
-   { 32355, -1 }, /* WeightuivARB */
+   {  2396, -1 }, /* WeightubvARB */
+   {  6567, -1 }, /* WeightivARB */
+   { 11068, -1 }, /* WeightPointerARB */
+   { 13852, -1 }, /* WeightfvARB */
+   { 17595, -1 }, /* WeightbvARB */
+   { 20996, -1 }, /* WeightusvARB */
+   { 23941, -1 }, /* VertexBlendARB */
+   { 29541, -1 }, /* WeightsvARB */
+   { 31641, -1 }, /* WeightdvARB */
+   { 32384, -1 }, /* WeightuivARB */
    {    -1, -1 }
 };
 #endif
@@ -5606,7 +5618,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[] = {
-   {  2694, _gloffset_BlendColor },
+   {  2655, _gloffset_BlendColor },
    {    -1, -1 }
 };
 #endif
@@ -5627,15 +5639,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[] = {
-   { 11190, _gloffset_BlendEquation },
+   { 11203, _gloffset_BlendEquation },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_color_subtable)
 static const struct gl_function_remap GL_EXT_color_subtable_functions[] = {
-   { 16974, _gloffset_ColorSubTable },
-   { 31562, _gloffset_CopyColorSubTable },
+   { 17019, _gloffset_ColorSubTable },
+   { 31591, _gloffset_CopyColorSubTable },
    {    -1, -1 }
 };
 #endif
@@ -5649,66 +5661,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 },
-   {  2493, _gloffset_CopyConvolutionFilter1D },
-   {  4097, _gloffset_GetConvolutionParameteriv },
-   {  8493, _gloffset_ConvolutionFilter2D },
-   {  8695, _gloffset_ConvolutionParameteriv },
-   {  9155, _gloffset_ConvolutionParameterfv },
-   { 20487, _gloffset_GetSeparableFilter },
-   { 23941, _gloffset_SeparableFilter2D },
-   { 24804, _gloffset_ConvolutionParameteri },
-   { 24927, _gloffset_ConvolutionParameterf },
-   { 26631, _gloffset_GetConvolutionParameterfv },
-   { 27520, _gloffset_GetConvolutionFilter },
-   { 29965, _gloffset_CopyConvolutionFilter2D },
+   {   257, _gloffset_ConvolutionFilter1D },
+   {  2454, _gloffset_CopyConvolutionFilter1D },
+   {  4058, _gloffset_GetConvolutionParameteriv },
+   {  8506, _gloffset_ConvolutionFilter2D },
+   {  8708, _gloffset_ConvolutionParameteriv },
+   {  9168, _gloffset_ConvolutionParameterfv },
+   { 20532, _gloffset_GetSeparableFilter },
+   { 24015, _gloffset_SeparableFilter2D },
+   { 24878, _gloffset_ConvolutionParameteri },
+   { 25001, _gloffset_ConvolutionParameterf },
+   { 26705, _gloffset_GetConvolutionParameterfv },
+   { 27562, _gloffset_GetConvolutionFilter },
+   { 29955, _gloffset_CopyConvolutionFilter2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_coordinate_frame)
 static const struct gl_function_remap GL_EXT_coordinate_frame_functions[] = {
-   { 10489, -1 }, /* TangentPointerEXT */
-   { 12578, -1 }, /* Binormal3ivEXT */
-   { 13243, -1 }, /* Tangent3sEXT */
-   { 14526, -1 }, /* Tangent3fvEXT */
-   { 18681, -1 }, /* Tangent3dvEXT */
-   { 19419, -1 }, /* Binormal3bvEXT */
-   { 20540, -1 }, /* Binormal3dEXT */
-   { 22702, -1 }, /* Tangent3fEXT */
-   { 24876, -1 }, /* Binormal3sEXT */
-   { 25344, -1 }, /* Tangent3ivEXT */
-   { 25363, -1 }, /* Tangent3dEXT */
-   { 26310, -1 }, /* Binormal3svEXT */
-   { 26943, -1 }, /* Binormal3fEXT */
-   { 27831, -1 }, /* Binormal3dvEXT */
-   { 29150, -1 }, /* Tangent3iEXT */
-   { 30250, -1 }, /* Tangent3bvEXT */
-   { 30810, -1 }, /* Tangent3bEXT */
-   { 31335, -1 }, /* Binormal3fvEXT */
-   { 32054, -1 }, /* BinormalPointerEXT */
-   { 32459, -1 }, /* Tangent3svEXT */
-   { 32896, -1 }, /* Binormal3bEXT */
-   { 33073, -1 }, /* Binormal3iEXT */
+   { 10502, -1 }, /* TangentPointerEXT */
+   { 12552, -1 }, /* Binormal3ivEXT */
+   { 13217, -1 }, /* Tangent3sEXT */
+   { 14571, -1 }, /* Tangent3fvEXT */
+   { 18726, -1 }, /* Tangent3dvEXT */
+   { 19464, -1 }, /* Binormal3bvEXT */
+   { 20585, -1 }, /* Binormal3dEXT */
+   { 22747, -1 }, /* Tangent3fEXT */
+   { 24950, -1 }, /* Binormal3sEXT */
+   { 25418, -1 }, /* Tangent3ivEXT */
+   { 25437, -1 }, /* Tangent3dEXT */
+   { 26384, -1 }, /* Binormal3svEXT */
+   { 26985, -1 }, /* Binormal3fEXT */
+   { 27873, -1 }, /* Binormal3dvEXT */
+   { 29140, -1 }, /* Tangent3iEXT */
+   { 30240, -1 }, /* Tangent3bvEXT */
+   { 30800, -1 }, /* Tangent3bEXT */
+   { 31364, -1 }, /* Binormal3fvEXT */
+   { 32083, -1 }, /* BinormalPointerEXT */
+   { 32488, -1 }, /* Tangent3svEXT */
+   { 32925, -1 }, /* Binormal3bEXT */
+   { 33102, -1 }, /* Binormal3iEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_copy_texture)
 static const struct gl_function_remap GL_EXT_copy_texture_functions[] = {
-   { 15051, _gloffset_CopyTexSubImage3D },
-   { 16661, _gloffset_CopyTexImage2D },
-   { 24412, _gloffset_CopyTexImage1D },
-   { 27201, _gloffset_CopyTexSubImage2D },
-   { 29603, _gloffset_CopyTexSubImage1D },
+   { 15096, _gloffset_CopyTexSubImage3D },
+   { 16706, _gloffset_CopyTexImage2D },
+   { 24486, _gloffset_CopyTexImage1D },
+   { 27243, _gloffset_CopyTexSubImage2D },
+   { 29593, _gloffset_CopyTexSubImage1D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_cull_vertex)
 static const struct gl_function_remap GL_EXT_cull_vertex_functions[] = {
-   {  8844, -1 }, /* CullParameterdvEXT */
-   { 11678, -1 }, /* CullParameterfvEXT */
+   {  8857, -1 }, /* CullParameterdvEXT */
+   { 11691, -1 }, /* CullParameterfvEXT */
    {    -1, -1 }
 };
 #endif
@@ -5736,7 +5748,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[] = {
-   {  9492, _gloffset_DrawRangeElements },
+   {  9505, _gloffset_DrawRangeElements },
    {    -1, -1 }
 };
 #endif
@@ -5785,39 +5797,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 },
-   {  3561, _gloffset_ResetHistogram },
-   {  9968, _gloffset_GetMinmax },
-   { 15385, _gloffset_GetHistogramParameterfv },
-   { 24337, _gloffset_GetMinmaxParameteriv },
-   { 26521, _gloffset_ResetMinmax },
-   { 27417, _gloffset_GetHistogramParameteriv },
-   { 28618, _gloffset_GetHistogram },
-   { 31187, _gloffset_Minmax },
-   { 32694, _gloffset_GetMinmaxParameterfv },
+   {   856, _gloffset_Histogram },
+   {  3522, _gloffset_ResetHistogram },
+   {  9981, _gloffset_GetMinmax },
+   { 15430, _gloffset_GetHistogramParameterfv },
+   { 24411, _gloffset_GetMinmaxParameteriv },
+   { 26595, _gloffset_ResetMinmax },
+   { 27459, _gloffset_GetHistogramParameteriv },
+   { 28608, _gloffset_GetHistogram },
+   { 31177, _gloffset_Minmax },
+   { 32723, _gloffset_GetMinmaxParameterfv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_func)
 static const struct gl_function_remap GL_EXT_index_func_functions[] = {
-   { 11464, -1 }, /* IndexFuncEXT */
+   { 11477, -1 }, /* IndexFuncEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_material)
 static const struct gl_function_remap GL_EXT_index_material_functions[] = {
-   { 21038, -1 }, /* IndexMaterialEXT */
+   { 21083, -1 }, /* IndexMaterialEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_light_texture)
 static const struct gl_function_remap GL_EXT_light_texture_functions[] = {
-   { 26330, -1 }, /* ApplyTextureEXT */
-   { 26475, -1 }, /* TextureMaterialEXT */
-   { 26500, -1 }, /* TextureLightEXT */
+   { 26404, -1 }, /* ApplyTextureEXT */
+   { 26549, -1 }, /* TextureMaterialEXT */
+   { 26574, -1 }, /* TextureLightEXT */
    {    -1, -1 }
 };
 #endif
@@ -5838,20 +5850,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[] = {
-   {  8355, _gloffset_ColorTable },
-   { 15231, _gloffset_GetColorTable },
-   { 22885, _gloffset_GetColorTableParameterfv },
-   { 24983, _gloffset_GetColorTableParameteriv },
+   {  8368, _gloffset_ColorTable },
+   { 15276, _gloffset_GetColorTable },
+   { 22930, _gloffset_GetColorTableParameterfv },
+   { 25057, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_pixel_transform)
 static const struct gl_function_remap GL_EXT_pixel_transform_functions[] = {
-   { 21685, -1 }, /* PixelTransformParameterfEXT */
-   { 21765, -1 }, /* PixelTransformParameteriEXT */
-   { 30525, -1 }, /* PixelTransformParameterfvEXT */
-   { 32018, -1 }, /* PixelTransformParameterivEXT */
+   { 21730, -1 }, /* PixelTransformParameterfEXT */
+   { 21810, -1 }, /* PixelTransformParameteriEXT */
+   { 30515, -1 }, /* PixelTransformParameterfvEXT */
+   { 32047, -1 }, /* PixelTransformParameterivEXT */
    {    -1, -1 }
 };
 #endif
@@ -5900,16 +5912,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[] = {
-   {  7076, _gloffset_TexSubImage1D },
-   { 10645, _gloffset_TexSubImage2D },
+   {  7089, _gloffset_TexSubImage1D },
+   { 10658, _gloffset_TexSubImage2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_texture3D)
 static const struct gl_function_remap GL_EXT_texture3D_functions[] = {
-   {  1813, _gloffset_TexImage3D },
-   { 22654, _gloffset_TexSubImage3D },
+   {  1774, _gloffset_TexImage3D },
+   { 22699, _gloffset_TexSubImage3D },
    {    -1, -1 }
 };
 #endif
@@ -5930,19 +5942,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[] = {
-   {  3329, _gloffset_PrioritizeTextures },
-   {  7525, _gloffset_AreTexturesResident },
-   { 13586, _gloffset_GenTextures },
-   { 15717, _gloffset_DeleteTextures },
-   { 19472, _gloffset_IsTexture },
-   { 29668, _gloffset_BindTexture },
+   {  3290, _gloffset_PrioritizeTextures },
+   {  7538, _gloffset_AreTexturesResident },
+   { 13560, _gloffset_GenTextures },
+   { 15762, _gloffset_DeleteTextures },
+   { 19517, _gloffset_IsTexture },
+   { 29658, _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[] = {
-   { 13796, -1 }, /* TextureNormalEXT */
+   { 13802, -1 }, /* TextureNormalEXT */
    {    -1, -1 }
 };
 #endif
@@ -5964,30 +5976,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[] = {
-   { 24113, _gloffset_ArrayElement },
-   { 30775, _gloffset_GetPointerv },
-   { 32321, _gloffset_DrawArrays },
+   { 24187, _gloffset_ArrayElement },
+   { 30765, _gloffset_GetPointerv },
+   { 32350, _gloffset_DrawArrays },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_vertex_weighting)
 static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
-   { 19502, -1 }, /* VertexWeightfvEXT */
-   { 26886, -1 }, /* VertexWeightfEXT */
-   { 28587, -1 }, /* VertexWeightPointerEXT */
+   { 19547, -1 }, /* VertexWeightfvEXT */
+   { 26928, -1 }, /* VertexWeightfEXT */
+   { 28577, -1 }, /* VertexWeightPointerEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_HP_image_transform)
 static const struct gl_function_remap GL_HP_image_transform_functions[] = {
-   {  2366, -1 }, /* GetImageTransformParameterfvHP */
-   {  3778, -1 }, /* ImageTransformParameterfHP */
-   { 10183, -1 }, /* ImageTransformParameterfvHP */
-   { 11933, -1 }, /* ImageTransformParameteriHP */
-   { 12313, -1 }, /* GetImageTransformParameterivHP */
-   { 19566, -1 }, /* ImageTransformParameterivHP */
+   {  2327, -1 }, /* GetImageTransformParameterfvHP */
+   {  3739, -1 }, /* ImageTransformParameterfHP */
+   { 10196, -1 }, /* ImageTransformParameterfvHP */
+   { 11946, -1 }, /* ImageTransformParameteriHP */
+   { 12287, -1 }, /* GetImageTransformParameterivHP */
+   { 19611, -1 }, /* ImageTransformParameterivHP */
    {    -1, -1 }
 };
 #endif
@@ -6001,14 +6013,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[] = {
-   {  4366, -1 }, /* SecondaryColorPointerListIBM */
-   {  6008, -1 }, /* NormalPointerListIBM */
-   {  7699, -1 }, /* FogCoordPointerListIBM */
-   {  8006, -1 }, /* VertexPointerListIBM */
-   { 11854, -1 }, /* ColorPointerListIBM */
-   { 13350, -1 }, /* TexCoordPointerListIBM */
-   { 13818, -1 }, /* IndexPointerListIBM */
-   { 32637, -1 }, /* EdgeFlagPointerListIBM */
+   {  4379, -1 }, /* SecondaryColorPointerListIBM */
+   {  6021, -1 }, /* NormalPointerListIBM */
+   {  7712, -1 }, /* FogCoordPointerListIBM */
+   {  8019, -1 }, /* VertexPointerListIBM */
+   { 11867, -1 }, /* ColorPointerListIBM */
+   { 13324, -1 }, /* TexCoordPointerListIBM */
+   { 13824, -1 }, /* IndexPointerListIBM */
+   { 32666, -1 }, /* EdgeFlagPointerListIBM */
    {    -1, -1 }
 };
 #endif
@@ -6022,10 +6034,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[] = {
-   { 12690, -1 }, /* VertexPointervINTEL */
-   { 15478, -1 }, /* ColorPointervINTEL */
-   { 29939, -1 }, /* NormalPointervINTEL */
-   { 30457, -1 }, /* TexCoordPointervINTEL */
+   { 12664, -1 }, /* VertexPointervINTEL */
+   { 15523, -1 }, /* ColorPointervINTEL */
+   { 29929, -1 }, /* NormalPointervINTEL */
+   { 30447, -1 }, /* TexCoordPointervINTEL */
    {    -1, -1 }
 };
 #endif
@@ -6039,10 +6051,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[] = {
-   {  1677, -1 }, /* GetDebugLogLengthMESA */
-   {  3500, -1 }, /* ClearDebugLogMESA */
-   {  4527, -1 }, /* GetDebugLogMESA */
-   { 30968, -1 }, /* CreateDebugObjectMESA */
+   {  1638, -1 }, /* GetDebugLogLengthMESA */
+   {  3461, -1 }, /* ClearDebugLogMESA */
+   {  4540, -1 }, /* GetDebugLogMESA */
+   { 30958, -1 }, /* CreateDebugObjectMESA */
    {    -1, -1 }
 };
 #endif
@@ -6063,15 +6075,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[] = {
-   {  6738, -1 }, /* GetMapAttribParameterivNV */
-   {  8461, -1 }, /* MapControlPointsNV */
-   {  8560, -1 }, /* MapParameterfvNV */
-   { 10628, -1 }, /* EvalMapsNV */
-   { 17148, -1 }, /* GetMapAttribParameterfvNV */
-   { 17365, -1 }, /* MapParameterivNV */
-   { 24727, -1 }, /* GetMapParameterivNV */
-   { 25225, -1 }, /* GetMapParameterfvNV */
-   { 29254, -1 }, /* GetMapControlPointsNV */
+   {  6751, -1 }, /* GetMapAttribParameterivNV */
+   {  8474, -1 }, /* MapControlPointsNV */
+   {  8573, -1 }, /* MapParameterfvNV */
+   { 10641, -1 }, /* EvalMapsNV */
+   { 17193, -1 }, /* GetMapAttribParameterfvNV */
+   { 17410, -1 }, /* MapParameterivNV */
+   { 24801, -1 }, /* GetMapParameterivNV */
+   { 25299, -1 }, /* GetMapParameterfvNV */
+   { 29244, -1 }, /* GetMapControlPointsNV */
    {    -1, -1 }
 };
 #endif
@@ -6113,8 +6125,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[] = {
-   { 15870, -1 }, /* CombinerStageParameterfvNV */
-   { 16266, -1 }, /* GetCombinerStageParameterfvNV */
+   { 15915, -1 }, /* CombinerStageParameterfvNV */
+   { 16311, -1 }, /* GetCombinerStageParameterfvNV */
    {    -1, -1 }
 };
 #endif
@@ -6142,23 +6154,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[] = {
-   {  8681, -1 }, /* HintPGI */
+   {  8694, -1 }, /* HintPGI */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_detail_texture)
 static const struct gl_function_remap GL_SGIS_detail_texture_functions[] = {
-   { 16239, -1 }, /* GetDetailTexFuncSGIS */
-   { 16606, -1 }, /* DetailTexFuncSGIS */
+   { 16284, -1 }, /* GetDetailTexFuncSGIS */
+   { 16651, -1 }, /* DetailTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_fog_function)
 static const struct gl_function_remap GL_SGIS_fog_function_functions[] = {
-   { 27183, -1 }, /* FogFuncSGIS */
-   { 27936, -1 }, /* GetFogFuncSGIS */
+   { 27225, -1 }, /* FogFuncSGIS */
+   { 27926, -1 }, /* GetFogFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -6186,112 +6198,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[] = {
-   {  6799, -1 }, /* GetSharpenTexFuncSGIS */
-   { 22050, -1 }, /* SharpenTexFuncSGIS */
+   {  6812, -1 }, /* GetSharpenTexFuncSGIS */
+   { 22095, -1 }, /* SharpenTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture4D)
 static const struct gl_function_remap GL_SGIS_texture4D_functions[] = {
-   {  1049, -1 }, /* TexImage4DSGIS */
-   { 15786, -1 }, /* TexSubImage4DSGIS */
+   {  1010, -1 }, /* TexImage4DSGIS */
+   { 15831, -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[] = {
-   { 15184, -1 }, /* TextureColorMaskSGIS */
+   { 15229, -1 }, /* TextureColorMaskSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_filter4)
 static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {
-   {  6976, -1 }, /* GetTexFilterFuncSGIS */
-   { 16385, -1 }, /* TexFilterFuncSGIS */
+   {  6989, -1 }, /* GetTexFilterFuncSGIS */
+   { 16430, -1 }, /* TexFilterFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_async)
 static const struct gl_function_remap GL_SGIX_async_functions[] = {
-   {  3426, -1 }, /* AsyncMarkerSGIX */
-   {  4506, -1 }, /* FinishAsyncSGIX */
-   {  5495, -1 }, /* PollAsyncSGIX */
-   { 22231, -1 }, /* DeleteAsyncMarkersSGIX */
-   { 22286, -1 }, /* IsAsyncMarkerSGIX */
-   { 32434, -1 }, /* GenAsyncMarkersSGIX */
+   {  3387, -1 }, /* AsyncMarkerSGIX */
+   {  4519, -1 }, /* FinishAsyncSGIX */
+   {  5466, -1 }, /* PollAsyncSGIX */
+   { 22276, -1 }, /* DeleteAsyncMarkersSGIX */
+   { 22331, -1 }, /* IsAsyncMarkerSGIX */
+   { 32463, -1 }, /* GenAsyncMarkersSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_flush_raster)
 static const struct gl_function_remap GL_SGIX_flush_raster_functions[] = {
-   {  7353, -1 }, /* FlushRasterSGIX */
+   {  7366, -1 }, /* FlushRasterSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_fragment_lighting)
 static const struct gl_function_remap GL_SGIX_fragment_lighting_functions[] = {
-   {  2664, -1 }, /* FragmentMaterialfvSGIX */
-   {  5399, -1 }, /* FragmentLightiSGIX */
-   {  8073, -1 }, /* FragmentMaterialfSGIX */
-   {  8234, -1 }, /* GetFragmentLightivSGIX */
-   {  9107, -1 }, /* FragmentLightModeliSGIX */
-   { 10691, -1 }, /* FragmentLightivSGIX */
-   { 10998, -1 }, /* GetFragmentMaterialivSGIX */
-   { 16179, -1 }, /* GetFragmentMaterialfvSGIX */
-   { 19389, -1 }, /* FragmentLightModelfSGIX */
-   { 19689, -1 }, /* FragmentColorMaterialSGIX */
-   { 20106, -1 }, /* FragmentMaterialiSGIX */
-   { 21366, -1 }, /* LightEnviSGIX */
-   { 22977, -1 }, /* FragmentLightModelfvSGIX */
-   { 23312, -1 }, /* FragmentLightfvSGIX */
-   { 28320, -1 }, /* FragmentLightModelivSGIX */
-   { 28469, -1 }, /* FragmentLightfSGIX */
-   { 31305, -1 }, /* GetFragmentLightfvSGIX */
-   { 32917, -1 }, /* FragmentMaterialivSGIX */
+   {  2625, -1 }, /* FragmentMaterialfvSGIX */
+   {  5370, -1 }, /* FragmentLightiSGIX */
+   {  8086, -1 }, /* FragmentMaterialfSGIX */
+   {  8247, -1 }, /* GetFragmentLightivSGIX */
+   {  9120, -1 }, /* FragmentLightModeliSGIX */
+   { 10704, -1 }, /* FragmentLightivSGIX */
+   { 11011, -1 }, /* GetFragmentMaterialivSGIX */
+   { 16224, -1 }, /* GetFragmentMaterialfvSGIX */
+   { 19434, -1 }, /* FragmentLightModelfSGIX */
+   { 19734, -1 }, /* FragmentColorMaterialSGIX */
+   { 20151, -1 }, /* FragmentMaterialiSGIX */
+   { 21411, -1 }, /* LightEnviSGIX */
+   { 23022, -1 }, /* FragmentLightModelfvSGIX */
+   { 23357, -1 }, /* FragmentLightfvSGIX */
+   { 28310, -1 }, /* FragmentLightModelivSGIX */
+   { 28459, -1 }, /* FragmentLightfSGIX */
+   { 31334, -1 }, /* GetFragmentLightfvSGIX */
+   { 32946, -1 }, /* FragmentMaterialivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_framezoom)
 static const struct gl_function_remap GL_SGIX_framezoom_functions[] = {
-   { 22309, -1 }, /* FrameZoomSGIX */
+   { 22354, -1 }, /* FrameZoomSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_igloo_interface)
 static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
-   { 28777, -1 }, /* IglooInterfaceSGIX */
+   { 28767, -1 }, /* IglooInterfaceSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_instruments)
 static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
-   {  2844, -1 }, /* ReadInstrumentsSGIX */
-   {  6572, -1 }, /* PollInstrumentsSGIX */
-   { 10549, -1 }, /* GetInstrumentsSGIX */
-   { 12948, -1 }, /* StartInstrumentsSGIX */
-   { 15904, -1 }, /* StopInstrumentsSGIX */
-   { 17763, -1 }, /* InstrumentsBufferSGIX */
+   {  2805, -1 }, /* ReadInstrumentsSGIX */
+   {  6585, -1 }, /* PollInstrumentsSGIX */
+   { 10562, -1 }, /* GetInstrumentsSGIX */
+   { 12922, -1 }, /* StartInstrumentsSGIX */
+   { 15949, -1 }, /* StopInstrumentsSGIX */
+   { 17808, -1 }, /* InstrumentsBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_list_priority)
 static const struct gl_function_remap GL_SGIX_list_priority_functions[] = {
-   {  1280, -1 }, /* ListParameterfSGIX */
-   {  3128, -1 }, /* GetListParameterfvSGIX */
-   { 17678, -1 }, /* ListParameteriSGIX */
-   { 18631, -1 }, /* ListParameterfvSGIX */
-   { 20772, -1 }, /* ListParameterivSGIX */
-   { 32478, -1 }, /* GetListParameterivSGIX */
+   {  1241, -1 }, /* ListParameterfSGIX */
+   {  3089, -1 }, /* GetListParameterfvSGIX */
+   { 17723, -1 }, /* ListParameteriSGIX */
+   { 18676, -1 }, /* ListParameterfvSGIX */
+   { 20817, -1 }, /* ListParameterivSGIX */
+   { 32507, -1 }, /* GetListParameterivSGIX */
    {    -1, -1 }
 };
 #endif
@@ -6305,134 +6317,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[] = {
-   {  3724, -1 }, /* LoadIdentityDeformationMapSGIX */
-   { 12187, -1 }, /* DeformationMap3dSGIX */
-   { 16004, -1 }, /* DeformSGIX */
-   { 24225, -1 }, /* DeformationMap3fSGIX */
+   {  3685, -1 }, /* LoadIdentityDeformationMapSGIX */
+   { 16049, -1 }, /* DeformSGIX */
+   { 24299, -1 }, /* DeformationMap3fSGIX */
+   { 31222, -1 }, /* DeformationMap3dSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_reference_plane)
 static const struct gl_function_remap GL_SGIX_reference_plane_functions[] = {
-   { 14735, -1 }, /* ReferencePlaneSGIX */
+   { 14780, -1 }, /* ReferencePlaneSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_sprite)
 static const struct gl_function_remap GL_SGIX_sprite_functions[] = {
-   {  9605, -1 }, /* SpriteParameterfvSGIX */
-   { 20561, -1 }, /* SpriteParameteriSGIX */
-   { 26555, -1 }, /* SpriteParameterfSGIX */
-   { 29397, -1 }, /* SpriteParameterivSGIX */
+   {  9618, -1 }, /* SpriteParameterfvSGIX */
+   { 20606, -1 }, /* SpriteParameteriSGIX */
+   { 26629, -1 }, /* SpriteParameterfSGIX */
+   { 29387, -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[] = {
-   { 20620, -1 }, /* TagSampleBufferSGIX */
+   { 20665, -1 }, /* TagSampleBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGI_color_table)
 static const struct gl_function_remap GL_SGI_color_table_functions[] = {
-   {  7643, _gloffset_ColorTableParameteriv },
-   {  8355, _gloffset_ColorTable },
-   { 15231, _gloffset_GetColorTable },
-   { 15341, _gloffset_CopyColorTable },
-   { 19333, _gloffset_ColorTableParameterfv },
-   { 22885, _gloffset_GetColorTableParameterfv },
-   { 24983, _gloffset_GetColorTableParameteriv },
+   {  7656, _gloffset_ColorTableParameteriv },
+   {  8368, _gloffset_ColorTable },
+   { 15276, _gloffset_GetColorTable },
+   { 15386, _gloffset_CopyColorTable },
+   { 19378, _gloffset_ColorTableParameterfv },
+   { 22930, _gloffset_GetColorTableParameterfv },
+   { 25057, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUNX_constant_data)
 static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
-   { 31283, -1 }, /* FinishTextureSUNX */
+   { 31312, -1 }, /* FinishTextureSUNX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_global_alpha)
 static const struct gl_function_remap GL_SUN_global_alpha_functions[] = {
-   {  3447, -1 }, /* GlobalAlphaFactorubSUN */
-   {  4805, -1 }, /* GlobalAlphaFactoriSUN */
-   {  6597, -1 }, /* GlobalAlphaFactordSUN */
-   {  9689, -1 }, /* GlobalAlphaFactoruiSUN */
-   { 10140, -1 }, /* GlobalAlphaFactorbSUN */
-   { 13263, -1 }, /* GlobalAlphaFactorfSUN */
-   { 13427, -1 }, /* GlobalAlphaFactorusSUN */
-   { 22572, -1 }, /* GlobalAlphaFactorsSUN */
+   {  3408, -1 }, /* GlobalAlphaFactorubSUN */
+   {  4818, -1 }, /* GlobalAlphaFactoriSUN */
+   {  6610, -1 }, /* GlobalAlphaFactordSUN */
+   {  9702, -1 }, /* GlobalAlphaFactoruiSUN */
+   { 10153, -1 }, /* GlobalAlphaFactorbSUN */
+   { 13237, -1 }, /* GlobalAlphaFactorfSUN */
+   { 13401, -1 }, /* GlobalAlphaFactorusSUN */
+   { 22617, -1 }, /* GlobalAlphaFactorsSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_mesh_array)
 static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
-   { 29188, -1 }, /* DrawMeshArraysSUN */
+   { 29178, -1 }, /* DrawMeshArraysSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_triangle_list)
 static const struct gl_function_remap GL_SUN_triangle_list_functions[] = {
-   {  4480, -1 }, /* ReplacementCodeubSUN */
-   {  6356, -1 }, /* ReplacementCodeubvSUN */
-   { 19054, -1 }, /* ReplacementCodeusvSUN */
-   { 19242, -1 }, /* ReplacementCodePointerSUN */
-   { 21430, -1 }, /* ReplacementCodeuiSUN */
-   { 22260, -1 }, /* ReplacementCodeusSUN */
-   { 29854, -1 }, /* ReplacementCodeuivSUN */
+   {  4493, -1 }, /* ReplacementCodeubSUN */
+   {  6369, -1 }, /* ReplacementCodeubvSUN */
+   { 19099, -1 }, /* ReplacementCodeusvSUN */
+   { 19287, -1 }, /* ReplacementCodePointerSUN */
+   { 21475, -1 }, /* ReplacementCodeuiSUN */
+   { 22305, -1 }, /* ReplacementCodeusSUN */
+   { 29844, -1 }, /* ReplacementCodeuivSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_vertex)
 static const struct gl_function_remap GL_SUN_vertex_functions[] = {
-   {  1154, -1 }, /* ReplacementCodeuiColor3fVertex3fvSUN */
-   {  1352, -1 }, /* TexCoord4fColor4fNormal3fVertex4fvSUN */
-   {  1578, -1 }, /* TexCoord2fColor4ubVertex3fvSUN */
-   {  1908, -1 }, /* ReplacementCodeuiVertex3fvSUN */
-   {  2042, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fvSUN */
-   {  2600, -1 }, /* ReplacementCodeuiNormal3fVertex3fSUN */
-   {  2913, -1 }, /* Color4ubVertex3fvSUN */
-   {  4639, -1 }, /* Color4ubVertex3fSUN */
-   {  4762, -1 }, /* TexCoord2fVertex3fSUN */
-   {  5106, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
-   {  5599, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
-   {  6251, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
-   {  7031, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
-   {  7390, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
-   {  8102, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
-   {  8906, -1 }, /* Color3fVertex3fSUN */
-   { 10076, -1 }, /* Color3fVertex3fvSUN */
-   { 10514, -1 }, /* Color4fNormal3fVertex3fvSUN */
-   { 11343, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 12811, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
-   { 14351, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
-   { 14877, -1 }, /* TexCoord2fColor3fVertex3fSUN */
-   { 15929, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
-   { 16344, -1 }, /* Color4ubVertex2fvSUN */
-   { 16631, -1 }, /* Normal3fVertex3fSUN */
-   { 17704, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
-   { 18065, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 18883, -1 }, /* TexCoord2fVertex3fvSUN */
-   { 19659, -1 }, /* Color4ubVertex2fSUN */
-   { 19897, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
-   { 21896, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
-   { 22328, -1 }, /* Normal3fVertex3fvSUN */
-   { 22794, -1 }, /* Color4fNormal3fVertex3fSUN */
-   { 23774, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
-   { 25876, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
-   { 27299, -1 }, /* TexCoord4fVertex4fSUN */
-   { 27725, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
-   { 28164, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
-   { 28291, -1 }, /* TexCoord4fVertex4fvSUN */
-   { 29025, -1 }, /* ReplacementCodeuiVertex3fSUN */
+   {  1115, -1 }, /* ReplacementCodeuiColor3fVertex3fvSUN */
+   {  1313, -1 }, /* TexCoord4fColor4fNormal3fVertex4fvSUN */
+   {  1539, -1 }, /* TexCoord2fColor4ubVertex3fvSUN */
+   {  1869, -1 }, /* ReplacementCodeuiVertex3fvSUN */
+   {  2003, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fvSUN */
+   {  2561, -1 }, /* ReplacementCodeuiNormal3fVertex3fSUN */
+   {  2874, -1 }, /* Color4ubVertex3fvSUN */
+   {  4652, -1 }, /* Color4ubVertex3fSUN */
+   {  4775, -1 }, /* TexCoord2fVertex3fSUN */
+   {  5119, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
+   {  5570, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
+   {  6264, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
+   {  7044, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
+   {  7403, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
+   {  8115, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
+   {  8919, -1 }, /* Color3fVertex3fSUN */
+   { 10089, -1 }, /* Color3fVertex3fvSUN */
+   { 10527, -1 }, /* Color4fNormal3fVertex3fvSUN */
+   { 11356, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 12785, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
+   { 14396, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
+   { 14922, -1 }, /* TexCoord2fColor3fVertex3fSUN */
+   { 15974, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
+   { 16389, -1 }, /* Color4ubVertex2fvSUN */
+   { 16676, -1 }, /* Normal3fVertex3fSUN */
+   { 17749, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
+   { 18110, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 18928, -1 }, /* TexCoord2fVertex3fvSUN */
+   { 19704, -1 }, /* Color4ubVertex2fSUN */
+   { 19942, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
+   { 21941, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
+   { 22373, -1 }, /* Normal3fVertex3fvSUN */
+   { 22839, -1 }, /* Color4fNormal3fVertex3fSUN */
+   { 23848, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
+   { 25950, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
+   { 27341, -1 }, /* TexCoord4fVertex4fSUN */
+   { 27767, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
+   { 28154, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
+   { 28281, -1 }, /* TexCoord4fVertex4fvSUN */
+   { 29015, -1 }, /* ReplacementCodeuiVertex3fSUN */
    {    -1, -1 }
 };
 #endif
@@ -6440,40 +6452,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 },
-   {  4234, _gloffset_MultiTexCoord1fvARB },
-   {  6142, _gloffset_MultiTexCoord3dARB },
-   {  6187, _gloffset_MultiTexCoord2iARB },
-   {  6311, _gloffset_MultiTexCoord2svARB },
-   {  8311, _gloffset_MultiTexCoord2fARB },
-   { 10350, _gloffset_MultiTexCoord3fvARB },
-   { 10952, _gloffset_MultiTexCoord4sARB },
-   { 11633, _gloffset_MultiTexCoord2dvARB },
-   { 12048, _gloffset_MultiTexCoord1svARB },
-   { 12459, _gloffset_MultiTexCoord3svARB },
-   { 12520, _gloffset_MultiTexCoord4iARB },
-   { 13290, _gloffset_MultiTexCoord3iARB },
-   { 14089, _gloffset_MultiTexCoord1dARB },
-   { 14306, _gloffset_MultiTexCoord3dvARB },
-   { 15585, _gloffset_MultiTexCoord3ivARB },
-   { 15630, _gloffset_MultiTexCoord2sARB },
-   { 17031, _gloffset_MultiTexCoord4ivARB },
-   { 18983, _gloffset_ClientActiveTextureARB },
-   { 21283, _gloffset_MultiTexCoord2dARB },
-   { 21720, _gloffset_MultiTexCoord4dvARB },
-   { 22076, _gloffset_MultiTexCoord4fvARB },
-   { 23026, _gloffset_MultiTexCoord3fARB },
-   { 25567, _gloffset_MultiTexCoord4dARB },
-   { 25833, _gloffset_MultiTexCoord1sARB },
-   { 26037, _gloffset_MultiTexCoord1dvARB },
-   { 27045, _gloffset_MultiTexCoord1ivARB },
-   { 27138, _gloffset_MultiTexCoord2ivARB },
-   { 27477, _gloffset_MultiTexCoord1iARB },
-   { 28893, _gloffset_MultiTexCoord4svARB },
-   { 29467, _gloffset_MultiTexCoord1fARB },
-   { 29730, _gloffset_MultiTexCoord4fARB },
-   { 32155, _gloffset_MultiTexCoord2fvARB },
+   {   425, _gloffset_MultiTexCoord3sARB },
+   {   657, _gloffset_ActiveTextureARB },
+   {  4247, _gloffset_MultiTexCoord1fvARB },
+   {  6155, _gloffset_MultiTexCoord3dARB },
+   {  6200, _gloffset_MultiTexCoord2iARB },
+   {  6324, _gloffset_MultiTexCoord2svARB },
+   {  8324, _gloffset_MultiTexCoord2fARB },
+   { 10363, _gloffset_MultiTexCoord3fvARB },
+   { 10965, _gloffset_MultiTexCoord4sARB },
+   { 11646, _gloffset_MultiTexCoord2dvARB },
+   { 12061, _gloffset_MultiTexCoord1svARB },
+   { 12433, _gloffset_MultiTexCoord3svARB },
+   { 12494, _gloffset_MultiTexCoord4iARB },
+   { 13264, _gloffset_MultiTexCoord3iARB },
+   { 14134, _gloffset_MultiTexCoord1dARB },
+   { 14351, _gloffset_MultiTexCoord3dvARB },
+   { 15630, _gloffset_MultiTexCoord3ivARB },
+   { 15675, _gloffset_MultiTexCoord2sARB },
+   { 17076, _gloffset_MultiTexCoord4ivARB },
+   { 19028, _gloffset_ClientActiveTextureARB },
+   { 21328, _gloffset_MultiTexCoord2dARB },
+   { 21765, _gloffset_MultiTexCoord4dvARB },
+   { 22121, _gloffset_MultiTexCoord4fvARB },
+   { 23071, _gloffset_MultiTexCoord3fARB },
+   { 25641, _gloffset_MultiTexCoord4dARB },
+   { 25907, _gloffset_MultiTexCoord1sARB },
+   { 26111, _gloffset_MultiTexCoord1dvARB },
+   { 27087, _gloffset_MultiTexCoord1ivARB },
+   { 27180, _gloffset_MultiTexCoord2ivARB },
+   { 27519, _gloffset_MultiTexCoord1iARB },
+   { 28883, _gloffset_MultiTexCoord4svARB },
+   { 29457, _gloffset_MultiTexCoord1fARB },
+   { 29720, _gloffset_MultiTexCoord4fARB },
+   { 32184, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 #endif