mesa: hook up GL 3.x entrypoints

Fix up some details in the xml files and regenerate dispatch files.
author: Brian Paul <[email protected]> 2010-11-21 09:19:23 -0700
committer: Brian Paul <[email protected]> 2010-11-21 09:20:44 -0700
commit: 5ed51e950f8b5850cada5aa6289215dbf254c1c7 (patch)
tree: 0fe2e8dfe748ac01bb72e1ff1173b286fb55a17a /src/mesa/main/remap_helper.h
parent: 81c347ef79bc495eb45ae3e257bc534a6ebbf83d (diff)
1 files changed, 2048 insertions, 1932 deletions
diff --git a/src/mesa/main/remap_helper.h b/src/mesa/main/remap_helper.h
index 1aa2cdea38f..7368c76e7e7 100644
--- a/src/mesa/main/remap_helper.h
+++ b/src/mesa/main/remap_helper.h
@@ -48,4597 +48,4688 @@ static const char _mesa_function_pool[] =
    /* _mesa_function_pool[81]: VertexAttribI2iEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2iEXT\0"
+   "glVertexAttribI2i\0"
    "\0"
-   /* _mesa_function_pool[107]: RasterPos4i (offset 82) */
+   /* _mesa_function_pool[125]: RasterPos4i (offset 82) */
    "iiii\0"
    "glRasterPos4i\0"
    "\0"
-   /* _mesa_function_pool[127]: RasterPos4d (offset 78) */
+   /* _mesa_function_pool[145]: RasterPos4d (offset 78) */
    "dddd\0"
    "glRasterPos4d\0"
    "\0"
-   /* _mesa_function_pool[147]: NewList (dynamic) */
+   /* _mesa_function_pool[165]: NewList (dynamic) */
    "ii\0"
    "glNewList\0"
    "\0"
-   /* _mesa_function_pool[161]: RasterPos4f (offset 80) */
+   /* _mesa_function_pool[179]: RasterPos4f (offset 80) */
    "ffff\0"
    "glRasterPos4f\0"
    "\0"
-   /* _mesa_function_pool[181]: LoadIdentity (offset 290) */
+   /* _mesa_function_pool[199]: LoadIdentity (offset 290) */
    "\0"
    "glLoadIdentity\0"
    "\0"
-   /* _mesa_function_pool[198]: SampleCoverageARB (will be remapped) */
+   /* _mesa_function_pool[216]: SampleCoverageARB (will be remapped) */
    "fi\0"
    "glSampleCoverage\0"
    "glSampleCoverageARB\0"
    "\0"
-   /* _mesa_function_pool[239]: ConvolutionFilter1D (offset 348) */
+   /* _mesa_function_pool[257]: ConvolutionFilter1D (offset 348) */
    "iiiiip\0"
    "glConvolutionFilter1D\0"
    "glConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[294]: BeginQueryARB (will be remapped) */
+   /* _mesa_function_pool[312]: BeginQueryARB (will be remapped) */
    "ii\0"
    "glBeginQuery\0"
    "glBeginQueryARB\0"
    "\0"
-   /* _mesa_function_pool[327]: RasterPos3dv (offset 71) */
+   /* _mesa_function_pool[345]: RasterPos3dv (offset 71) */
    "p\0"
    "glRasterPos3dv\0"
    "\0"
-   /* _mesa_function_pool[345]: PointParameteriNV (will be remapped) */
+   /* _mesa_function_pool[363]: PointParameteriNV (will be remapped) */
    "ii\0"
    "glPointParameteri\0"
    "glPointParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[387]: GetProgramiv (will be remapped) */
+   /* _mesa_function_pool[405]: GetProgramiv (will be remapped) */
    "iip\0"
    "glGetProgramiv\0"
    "\0"
-   /* _mesa_function_pool[407]: MultiTexCoord3sARB (offset 398) */
+   /* _mesa_function_pool[425]: MultiTexCoord3sARB (offset 398) */
    "iiii\0"
    "glMultiTexCoord3s\0"
    "glMultiTexCoord3sARB\0"
    "\0"
-   /* _mesa_function_pool[452]: SecondaryColor3iEXT (will be remapped) */
+   /* _mesa_function_pool[470]: SecondaryColor3iEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3i\0"
    "glSecondaryColor3iEXT\0"
    "\0"
-   /* _mesa_function_pool[498]: WindowPos3fMESA (will be remapped) */
+   /* _mesa_function_pool[516]: WindowPos3fMESA (will be remapped) */
    "fff\0"
    "glWindowPos3f\0"
    "glWindowPos3fARB\0"
    "glWindowPos3fMESA\0"
    "\0"
-   /* _mesa_function_pool[552]: TexCoord1iv (offset 99) */
+   /* _mesa_function_pool[570]: TexCoord1iv (offset 99) */
    "p\0"
    "glTexCoord1iv\0"
    "\0"
-   /* _mesa_function_pool[569]: TexCoord4sv (offset 125) */
+   /* _mesa_function_pool[587]: TexCoord4sv (offset 125) */
    "p\0"
    "glTexCoord4sv\0"
    "\0"
-   /* _mesa_function_pool[586]: RasterPos4s (offset 84) */
+   /* _mesa_function_pool[604]: RasterPos4s (offset 84) */
    "iiii\0"
    "glRasterPos4s\0"
    "\0"
-   /* _mesa_function_pool[606]: PixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[624]: PixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[639]: ActiveTextureARB (offset 374) */
+   /* _mesa_function_pool[657]: ActiveTextureARB (offset 374) */
    "i\0"
    "glActiveTexture\0"
    "glActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[677]: BlitFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[695]: BlitFramebufferEXT (will be remapped) */
    "iiiiiiiiii\0"
    "glBlitFramebuffer\0"
    "glBlitFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[728]: TexCoord1f (offset 96) */
+   /* _mesa_function_pool[746]: TexCoord1f (offset 96) */
    "f\0"
    "glTexCoord1f\0"
    "\0"
-   /* _mesa_function_pool[744]: TexCoord1d (offset 94) */
+   /* _mesa_function_pool[762]: TexCoord1d (offset 94) */
    "d\0"
    "glTexCoord1d\0"
    "\0"
-   /* _mesa_function_pool[760]: VertexAttrib4ubvNV (will be remapped) */
+   /* _mesa_function_pool[778]: VertexAttrib4ubvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[785]: TexCoord1i (offset 98) */
+   /* _mesa_function_pool[803]: TexCoord1i (offset 98) */
    "i\0"
    "glTexCoord1i\0"
    "\0"
-   /* _mesa_function_pool[801]: GetProgramNamedParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[819]: GetProgramNamedParameterdvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[838]: Histogram (offset 367) */
+   /* _mesa_function_pool[856]: Histogram (offset 367) */
    "iiii\0"
    "glHistogram\0"
    "glHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[871]: TexCoord1s (offset 100) */
+   /* _mesa_function_pool[889]: TexCoord1s (offset 100) */
    "i\0"
    "glTexCoord1s\0"
    "\0"
-   /* _mesa_function_pool[887]: GetMapfv (offset 267) */
+   /* _mesa_function_pool[905]: GetMapfv (offset 267) */
    "iip\0"
    "glGetMapfv\0"
    "\0"
-   /* _mesa_function_pool[903]: EvalCoord1f (offset 230) */
+   /* _mesa_function_pool[921]: EvalCoord1f (offset 230) */
    "f\0"
    "glEvalCoord1f\0"
    "\0"
-   /* _mesa_function_pool[920]: VertexAttribI1ivEXT (will be remapped) */
+   /* _mesa_function_pool[938]: FramebufferTexture (will be remapped) */
+   "iiii\0"
+   "glFramebufferTexture\0"
+   "\0"
+   /* _mesa_function_pool[965]: VertexAttribI1ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1ivEXT\0"
+   "glVertexAttribI1iv\0"
    "\0"
-   /* _mesa_function_pool[946]: TexImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[1010]: TexImage4DSGIS (dynamic) */
    "iiiiiiiiiip\0"
    "glTexImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[976]: PolygonStipple (offset 175) */
+   /* _mesa_function_pool[1040]: PolygonStipple (offset 175) */
    "p\0"
    "glPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[996]: WindowPos2dvMESA (will be remapped) */
+   /* _mesa_function_pool[1060]: WindowPos2dvMESA (will be remapped) */
    "p\0"
    "glWindowPos2dv\0"
    "glWindowPos2dvARB\0"
    "glWindowPos2dvMESA\0"
    "\0"
-   /* _mesa_function_pool[1051]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1115]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1095]: BlendEquationSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[1159]: BlendEquationSeparateEXT (will be remapped) */
    "ii\0"
    "glBlendEquationSeparate\0"
    "glBlendEquationSeparateEXT\0"
    "glBlendEquationSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[1177]: ListParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[1241]: ListParameterfSGIX (dynamic) */
    "iif\0"
    "glListParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[1203]: SecondaryColor3bEXT (will be remapped) */
+   /* _mesa_function_pool[1267]: SecondaryColor3bEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3b\0"
    "glSecondaryColor3bEXT\0"
    "\0"
-   /* _mesa_function_pool[1249]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[1313]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1295]: GetPixelMapfv (offset 271) */
+   /* _mesa_function_pool[1359]: GetPixelMapfv (offset 271) */
    "ip\0"
    "glGetPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[1315]: Color3uiv (offset 22) */
+   /* _mesa_function_pool[1379]: Color3uiv (offset 22) */
    "p\0"
    "glColor3uiv\0"
    "\0"
-   /* _mesa_function_pool[1330]: IsEnabled (offset 286) */
+   /* _mesa_function_pool[1394]: IsEnabled (offset 286) */
    "i\0"
    "glIsEnabled\0"
    "\0"
-   /* _mesa_function_pool[1345]: VertexAttrib4svNV (will be remapped) */
+   /* _mesa_function_pool[1409]: VertexAttrib4svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4svNV\0"
    "\0"
-   /* _mesa_function_pool[1369]: EvalCoord2fv (offset 235) */
+   /* _mesa_function_pool[1433]: EvalCoord2fv (offset 235) */
    "p\0"
    "glEvalCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[1387]: GetBufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1451]: GetBufferSubDataARB (will be remapped) */
    "iiip\0"
    "glGetBufferSubData\0"
    "glGetBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1434]: BufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1498]: BufferSubDataARB (will be remapped) */
    "iiip\0"
    "glBufferSubData\0"
    "glBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1475]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1539]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1513]: AttachShader (will be remapped) */
+   /* _mesa_function_pool[1577]: AttachShader (will be remapped) */
    "ii\0"
    "glAttachShader\0"
    "\0"
-   /* _mesa_function_pool[1532]: VertexAttrib2fARB (will be remapped) */
+   /* _mesa_function_pool[1596]: VertexAttrib2fARB (will be remapped) */
    "iff\0"
    "glVertexAttrib2f\0"
    "glVertexAttrib2fARB\0"
    "\0"
-   /* _mesa_function_pool[1574]: GetDebugLogLengthMESA (dynamic) */
+   /* _mesa_function_pool[1638]: GetDebugLogLengthMESA (dynamic) */
    "iii\0"
    "glGetDebugLogLengthMESA\0"
    "\0"
-   /* _mesa_function_pool[1603]: GetMapiv (offset 268) */
+   /* _mesa_function_pool[1667]: GetMapiv (offset 268) */
    "iip\0"
    "glGetMapiv\0"
    "\0"
-   /* _mesa_function_pool[1619]: VertexAttrib3fARB (will be remapped) */
+   /* _mesa_function_pool[1683]: VertexAttrib3fARB (will be remapped) */
    "ifff\0"
    "glVertexAttrib3f\0"
    "glVertexAttrib3fARB\0"
    "\0"
-   /* _mesa_function_pool[1662]: Indexubv (offset 316) */
+   /* _mesa_function_pool[1726]: Indexubv (offset 316) */
    "p\0"
    "glIndexubv\0"
    "\0"
-   /* _mesa_function_pool[1676]: GetQueryivARB (will be remapped) */
+   /* _mesa_function_pool[1740]: GetQueryivARB (will be remapped) */
    "iip\0"
    "glGetQueryiv\0"
    "glGetQueryivARB\0"
    "\0"
-   /* _mesa_function_pool[1710]: TexImage3D (offset 371) */
+   /* _mesa_function_pool[1774]: TexImage3D (offset 371) */
    "iiiiiiiiip\0"
    "glTexImage3D\0"
    "glTexImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[1751]: BindFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[1815]: BindFragDataLocationEXT (will be remapped) */
    "iip\0"
    "glBindFragDataLocationEXT\0"
+   "glBindFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[1782]: ReplacementCodeuiVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1869]: ReplacementCodeuiVertex3fvSUN (dynamic) */
    "pp\0"
    "glReplacementCodeuiVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1818]: EdgeFlagPointer (offset 312) */
+   /* _mesa_function_pool[1905]: EdgeFlagPointer (offset 312) */
    "ip\0"
    "glEdgeFlagPointer\0"
    "\0"
-   /* _mesa_function_pool[1840]: Color3ubv (offset 20) */
+   /* _mesa_function_pool[1927]: Color3ubv (offset 20) */
    "p\0"
    "glColor3ubv\0"
    "\0"
-   /* _mesa_function_pool[1855]: GetQueryObjectivARB (will be remapped) */
+   /* _mesa_function_pool[1942]: GetQueryObjectivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectiv\0"
    "glGetQueryObjectivARB\0"
    "\0"
-   /* _mesa_function_pool[1901]: Vertex3dv (offset 135) */
+   /* _mesa_function_pool[1988]: Vertex3dv (offset 135) */
    "p\0"
    "glVertex3dv\0"
    "\0"
-   /* _mesa_function_pool[1916]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2003]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1963]: CompressedTexSubImage2DARB (will be remapped) */
+   /* _mesa_function_pool[2050]: CompressedTexSubImage2DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexSubImage2D\0"
    "glCompressedTexSubImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[2029]: CombinerOutputNV (will be remapped) */
+   /* _mesa_function_pool[2116]: CombinerOutputNV (will be remapped) */
    "iiiiiiiiii\0"
    "glCombinerOutputNV\0"
    "\0"
-   /* _mesa_function_pool[2060]: VertexAttribs3fvNV (will be remapped) */
+   /* _mesa_function_pool[2147]: VertexAttribs3fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3fvNV\0"
    "\0"
-   /* _mesa_function_pool[2086]: Uniform2fARB (will be remapped) */
+   /* _mesa_function_pool[2173]: Uniform2fARB (will be remapped) */
    "iff\0"
    "glUniform2f\0"
    "glUniform2fARB\0"
    "\0"
-   /* _mesa_function_pool[2118]: LightModeliv (offset 166) */
+   /* _mesa_function_pool[2205]: LightModeliv (offset 166) */
    "ip\0"
    "glLightModeliv\0"
    "\0"
-   /* _mesa_function_pool[2137]: VertexAttrib1svARB (will be remapped) */
+   /* _mesa_function_pool[2224]: VertexAttrib1svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1sv\0"
    "glVertexAttrib1svARB\0"
    "\0"
-   /* _mesa_function_pool[2180]: VertexAttribs1dvNV (will be remapped) */
+   /* _mesa_function_pool[2267]: VertexAttribs1dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1dvNV\0"
    "\0"
-   /* _mesa_function_pool[2206]: Uniform2ivARB (will be remapped) */
+   /* _mesa_function_pool[2293]: Uniform2ivARB (will be remapped) */
    "iip\0"
    "glUniform2iv\0"
    "glUniform2ivARB\0"
    "\0"
-   /* _mesa_function_pool[2240]: GetImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[2327]: GetImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[2278]: Normal3bv (offset 53) */
+   /* _mesa_function_pool[2365]: Normal3bv (offset 53) */
    "p\0"
    "glNormal3bv\0"
    "\0"
-   /* _mesa_function_pool[2293]: TexGeniv (offset 193) */
+   /* _mesa_function_pool[2380]: TexGeniv (offset 193) */
    "iip\0"
    "glTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[2309]: WeightubvARB (dynamic) */
+   /* _mesa_function_pool[2396]: WeightubvARB (dynamic) */
    "ip\0"
    "glWeightubvARB\0"
    "\0"
-   /* _mesa_function_pool[2328]: VertexAttrib1fvNV (will be remapped) */
+   /* _mesa_function_pool[2415]: VertexAttrib1fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1fvNV\0"
    "\0"
-   /* _mesa_function_pool[2352]: Vertex3iv (offset 139) */
+   /* _mesa_function_pool[2439]: Vertex3iv (offset 139) */
    "p\0"
    "glVertex3iv\0"
    "\0"
-   /* _mesa_function_pool[2367]: CopyConvolutionFilter1D (offset 354) */
+   /* _mesa_function_pool[2454]: CopyConvolutionFilter1D (offset 354) */
    "iiiii\0"
    "glCopyConvolutionFilter1D\0"
    "glCopyConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[2429]: VertexAttribI1uiEXT (will be remapped) */
+   /* _mesa_function_pool[2516]: VertexAttribI1uiEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1uiEXT\0"
+   "glVertexAttribI1ui\0"
    "\0"
-   /* _mesa_function_pool[2455]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[2561]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[2503]: DeleteSync (will be remapped) */
+   /* _mesa_function_pool[2609]: DeleteSync (will be remapped) */
    "i\0"
    "glDeleteSync\0"
    "\0"
-   /* _mesa_function_pool[2519]: FragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[2625]: FragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[2549]: BlendColor (offset 336) */
+   /* _mesa_function_pool[2655]: BlendColor (offset 336) */
    "ffff\0"
    "glBlendColor\0"
    "glBlendColorEXT\0"
    "\0"
-   /* _mesa_function_pool[2584]: UniformMatrix4fvARB (will be remapped) */
+   /* _mesa_function_pool[2690]: UniformMatrix4fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix4fv\0"
    "glUniformMatrix4fvARB\0"
    "\0"
-   /* _mesa_function_pool[2631]: DeleteVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[2737]: DeleteVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glDeleteVertexArrays\0"
    "glDeleteVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[2682]: ReadInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[2788]: TexBuffer (will be remapped) */
+   "iii\0"
+   "glTexBuffer\0"
+   "\0"
+   /* _mesa_function_pool[2805]: ReadInstrumentsSGIX (dynamic) */
    "i\0"
    "glReadInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[2707]: CallLists (offset 3) */
+   /* _mesa_function_pool[2830]: CallLists (offset 3) */
    "iip\0"
    "glCallLists\0"
    "\0"
-   /* _mesa_function_pool[2724]: UniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[2847]: UniformMatrix2x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x4fv\0"
    "\0"
-   /* _mesa_function_pool[2751]: Color4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2874]: Color4ubVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2778]: Normal3iv (offset 59) */
+   /* _mesa_function_pool[2901]: Normal3iv (offset 59) */
    "p\0"
    "glNormal3iv\0"
    "\0"
-   /* _mesa_function_pool[2793]: PassThrough (offset 199) */
+   /* _mesa_function_pool[2916]: PassThrough (offset 199) */
    "f\0"
    "glPassThrough\0"
    "\0"
-   /* _mesa_function_pool[2810]: GetVertexAttribIivEXT (will be remapped) */
+   /* _mesa_function_pool[2933]: GetVertexAttribIivEXT (will be remapped) */
    "iip\0"
    "glGetVertexAttribIivEXT\0"
+   "glGetVertexAttribIiv\0"
    "\0"
-   /* _mesa_function_pool[2839]: TexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[2983]: TexParameterIivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIivEXT\0"
+   "glTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[2865]: FramebufferTextureLayerEXT (will be remapped) */
+   /* _mesa_function_pool[3027]: FramebufferTextureLayerEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[2927]: GetListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[3089]: GetListParameterfvSGIX (dynamic) */
    "iip\0"
    "glGetListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[2957]: Viewport (offset 305) */
+   /* _mesa_function_pool[3119]: Viewport (offset 305) */
    "iiii\0"
    "glViewport\0"
    "\0"
-   /* _mesa_function_pool[2974]: VertexAttrib4NusvARB (will be remapped) */
+   /* _mesa_function_pool[3136]: VertexAttrib4NusvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nusv\0"
    "glVertexAttrib4NusvARB\0"
    "\0"
-   /* _mesa_function_pool[3021]: WindowPos4svMESA (will be remapped) */
+   /* _mesa_function_pool[3183]: WindowPos4svMESA (will be remapped) */
    "p\0"
    "glWindowPos4svMESA\0"
    "\0"
-   /* _mesa_function_pool[3043]: CreateProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[3205]: CreateProgramObjectARB (will be remapped) */
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[3070]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[3232]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
    "glDeleteTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[3101]: UniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[3263]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[3128]: PrioritizeTextures (offset 331) */
+   /* _mesa_function_pool[3290]: PrioritizeTextures (offset 331) */
    "ipp\0"
    "glPrioritizeTextures\0"
    "glPrioritizeTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[3178]: VertexAttribI3uiEXT (will be remapped) */
+   /* _mesa_function_pool[3340]: VertexAttribI3uiEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3uiEXT\0"
+   "glVertexAttribI3ui\0"
    "\0"
-   /* _mesa_function_pool[3206]: AsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[3387]: AsyncMarkerSGIX (dynamic) */
    "i\0"
    "glAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[3227]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[3408]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[3255]: ClearColorIuiEXT (will be remapped) */
+   /* _mesa_function_pool[3436]: ClearColorIuiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIuiEXT\0"
    "\0"
-   /* _mesa_function_pool[3280]: ClearDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[3461]: ClearDebugLogMESA (dynamic) */
    "iii\0"
    "glClearDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[3305]: Uniform4uiEXT (will be remapped) */
+   /* _mesa_function_pool[3486]: Uniform4uiEXT (will be remapped) */
    "iiiii\0"
    "glUniform4uiEXT\0"
+   "glUniform4ui\0"
    "\0"
-   /* _mesa_function_pool[3328]: ResetHistogram (offset 369) */
+   /* _mesa_function_pool[3522]: ResetHistogram (offset 369) */
    "i\0"
    "glResetHistogram\0"
    "glResetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[3368]: GetProgramNamedParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[3562]: GetProgramNamedParameterfvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[3405]: 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[3491]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[3685]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[3527]: GenFencesNV (will be remapped) */
+   /* _mesa_function_pool[3721]: GenFencesNV (will be remapped) */
    "ip\0"
    "glGenFencesNV\0"
    "\0"
-   /* _mesa_function_pool[3545]: ImageTransformParameterfHP (dynamic) */
+   /* _mesa_function_pool[3739]: ImageTransformParameterfHP (dynamic) */
    "iif\0"
    "glImageTransformParameterfHP\0"
    "\0"
-   /* _mesa_function_pool[3579]: MatrixIndexusvARB (dynamic) */
+   /* _mesa_function_pool[3773]: MatrixIndexusvARB (dynamic) */
    "ip\0"
    "glMatrixIndexusvARB\0"
    "\0"
-   /* _mesa_function_pool[3603]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[3797]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[3635]: DisableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[3829]: DisableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[3695]: TexCoord2sv (offset 109) */
+   /* _mesa_function_pool[3889]: TexCoord2sv (offset 109) */
    "p\0"
    "glTexCoord2sv\0"
    "\0"
-   /* _mesa_function_pool[3712]: Vertex4dv (offset 143) */
+   /* _mesa_function_pool[3906]: Vertex4dv (offset 143) */
    "p\0"
    "glVertex4dv\0"
    "\0"
-   /* _mesa_function_pool[3727]: StencilMaskSeparate (will be remapped) */
+   /* _mesa_function_pool[3921]: StencilMaskSeparate (will be remapped) */
    "ii\0"
    "glStencilMaskSeparate\0"
    "\0"
-   /* _mesa_function_pool[3753]: ProgramLocalParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[3947]: ProgramLocalParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramLocalParameter4dARB\0"
    "\0"
-   /* _mesa_function_pool[3790]: CompressedTexImage3DARB (will be remapped) */
+   /* _mesa_function_pool[3984]: CompressedTexImage3DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexImage3D\0"
    "glCompressedTexImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[3850]: Color3sv (offset 18) */
+   /* _mesa_function_pool[4044]: Color3sv (offset 18) */
    "p\0"
    "glColor3sv\0"
    "\0"
-   /* _mesa_function_pool[3864]: GetConvolutionParameteriv (offset 358) */
+   /* _mesa_function_pool[4058]: GetConvolutionParameteriv (offset 358) */
    "iip\0"
    "glGetConvolutionParameteriv\0"
    "glGetConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[3928]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[4122]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[3969]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[4163]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[3984]: TestFenceNV (will be remapped) */
+   /* _mesa_function_pool[4178]: TestFenceNV (will be remapped) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[4001]: GetVertexAttribIuivEXT (will be remapped) */
+   /* _mesa_function_pool[4195]: GetVertexAttribIuivEXT (will be remapped) */
    "iip\0"
    "glGetVertexAttribIuivEXT\0"
+   "glGetVertexAttribIuiv\0"
    "\0"
-   /* _mesa_function_pool[4031]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[4247]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[4076]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[4292]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[4093]: Uniform2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4309]: Uniform2uivEXT (will be remapped) */
    "iip\0"
    "glUniform2uivEXT\0"
+   "glUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[4115]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[4345]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[4149]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[4379]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4187]: GetPixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[4417]: GetPixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[4223]: Color3fv (offset 14) */
+   /* _mesa_function_pool[4453]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[4237]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[4467]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[4263]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[4493]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[4289]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[4519]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[4310]: GetDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[4540]: GetDebugLogMESA (dynamic) */
    "iiiipp\0"
    "glGetDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[4336]: FogCoorddEXT (will be remapped) */
+   /* _mesa_function_pool[4566]: FogCoorddEXT (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[4366]: BeginConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[4596]: BeginConditionalRenderNV (will be remapped) */
    "ii\0"
    "glBeginConditionalRenderNV\0"
+   "glBeginConditionalRender\0"
    "\0"
-   /* _mesa_function_pool[4397]: Color4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4652]: Color4ubVertex3fSUN (dynamic) */
    "iiiifff\0"
    "glColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4428]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[4683]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[4458]: PointSize (offset 173) */
+   /* _mesa_function_pool[4713]: PointSize (offset 173) */
    "f\0"
    "glPointSize\0"
    "\0"
-   /* _mesa_function_pool[4473]: VertexAttribI2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4728]: VertexAttribI2uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2uivEXT\0"
+   "glVertexAttribI2uiv\0"
    "\0"
-   /* _mesa_function_pool[4500]: TexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4775]: TexCoord2fVertex3fSUN (dynamic) */
    "fffff\0"
    "glTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4531]: PopName (offset 200) */
+   /* _mesa_function_pool[4806]: PopName (offset 200) */
    "\0"
    "glPopName\0"
    "\0"
-   /* _mesa_function_pool[4543]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[4818]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[4570]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[4845]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[4594]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[4869]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[4620]: VertexAttrib4NbvARB (will be remapped) */
+   /* _mesa_function_pool[4895]: VertexAttrib4NbvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[4665]: GetActiveAttribARB (will be remapped) */
+   /* _mesa_function_pool[4940]: GetActiveAttribARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[4713]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[4988]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[4728]: VertexAttrib4ubNV (will be remapped) */
+   /* _mesa_function_pool[5003]: VertexAttrib4ubNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4ubNV\0"
    "\0"
-   /* _mesa_function_pool[4755]: TextureRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[5030]: ClampColor (will be remapped) */
+   "ii\0"
+   "glClampColor\0"
+   "\0"
+   /* _mesa_function_pool[5047]: TextureRangeAPPLE (will be remapped) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[4780]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[5072]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[4799]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5091]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[4827]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5119]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4880]: Indexub (offset 315) */
+   /* _mesa_function_pool[5172]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[4893]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[5185]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[4908]: GetClipPlane (offset 259) */
+   /* _mesa_function_pool[5200]: GetClipPlane (offset 259) */
    "ip\0"
    "glGetClipPlane\0"
    "\0"
-   /* _mesa_function_pool[4927]: CombinerParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[5219]: CombinerParameterfvNV (will be remapped) */
    "ip\0"
    "glCombinerParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[4955]: VertexAttribs3dvNV (will be remapped) */
+   /* _mesa_function_pool[5247]: VertexAttribs3dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3dvNV\0"
    "\0"
-   /* _mesa_function_pool[4981]: VertexAttribI2uiEXT (will be remapped) */
+   /* _mesa_function_pool[5273]: VertexAttribI2uiEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2uiEXT\0"
+   "glVertexAttribI2ui\0"
    "\0"
-   /* _mesa_function_pool[5008]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[5319]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[5034]: VertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[5345]: VertexArrayRangeNV (will be remapped) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[5059]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[5370]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[5085]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[5396]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[5108]: VertexAttribI4uivEXT (will be remapped) */
+   /* _mesa_function_pool[5419]: VertexAttribI4uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4uivEXT\0"
+   "glVertexAttribI4uiv\0"
    "\0"
-   /* _mesa_function_pool[5135]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[5466]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[5154]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[5485]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[5183]: Scaled (offset 301) */
+   /* _mesa_function_pool[5514]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[5197]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5528]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5225]: Scalef (offset 302) */
+   /* _mesa_function_pool[5556]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[5239]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[5570]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[5277]: MultTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[5608]: MultTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[5329]: ColorMaskIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[5660]: ColorMaskIndexedEXT (will be remapped) */
    "iiiii\0"
    "glColorMaskIndexedEXT\0"
+   "glColorMaski\0"
    "\0"
-   /* _mesa_function_pool[5358]: ObjectUnpurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[5702]: ObjectUnpurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectUnpurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[5388]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[5732]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[5404]: WindowPos2svMESA (will be remapped) */
+   /* _mesa_function_pool[5748]: WindowPos2svMESA (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[5459]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[5803]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[5473]: TexCoord2iv (offset 107) */
+   /* _mesa_function_pool[5817]: TexCoord2iv (offset 107) */
    "p\0"
    "glTexCoord2iv\0"
    "\0"
-   /* _mesa_function_pool[5490]: CompressedTexImage1DARB (will be remapped) */
+   /* _mesa_function_pool[5834]: CompressedTexImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[5548]: Rotated (offset 299) */
+   /* _mesa_function_pool[5892]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[5564]: GetTexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[5908]: GetTexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIuivEXT\0"
+   "glGetTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[5594]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[5960]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[5618]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[5984]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[5640]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[6006]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[5655]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[6021]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[5684]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6050]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[5708]: Color4iv (offset 32) */
+   /* _mesa_function_pool[6074]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[5722]: TexParameterf (offset 178) */
+   /* _mesa_function_pool[6088]: TexParameterf (offset 178) */
    "iif\0"
    "glTexParameterf\0"
    "\0"
-   /* _mesa_function_pool[5743]: TexParameteri (offset 180) */
+   /* _mesa_function_pool[6109]: TexParameteri (offset 180) */
    "iii\0"
    "glTexParameteri\0"
    "\0"
-   /* _mesa_function_pool[5764]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6130]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[5789]: MultiTexCoord3dARB (offset 392) */
+   /* _mesa_function_pool[6155]: MultiTexCoord3dARB (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[5834]: MultiTexCoord2iARB (offset 388) */
+   /* _mesa_function_pool[6200]: MultiTexCoord2iARB (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[5878]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[6244]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[5898]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[6264]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5958]: MultiTexCoord2svARB (offset 391) */
+   /* _mesa_function_pool[6324]: MultiTexCoord2svARB (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[6003]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[6369]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[6030]: Uniform3iARB (will be remapped) */
+   /* _mesa_function_pool[6396]: Uniform3iARB (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[6063]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[6429]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[6091]: GetFragmentMaterialfvSGIX (dynamic) */
-   "iip\0"
-   "glGetFragmentMaterialfvSGIX\0"
+   /* _mesa_function_pool[6457]: DrawElementsInstancedARB (will be remapped) */
+   "iiipi\0"
+   "glDrawElementsInstancedARB\0"
+   "glDrawElementsInstancedEXT\0"
+   "glDrawElementsInstanced\0"
    "\0"
-   /* _mesa_function_pool[6124]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[6542]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[6149]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[6567]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[6167]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[6585]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[6192]: GlobalAlphaFactordSUN (dynamic) */
+   /* _mesa_function_pool[6610]: GlobalAlphaFactordSUN (dynamic) */
    "d\0"
    "glGlobalAlphaFactordSUN\0"
    "\0"
-   /* _mesa_function_pool[6219]: GetFinalCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[6637]: GetFinalCombinerInputParameterfvNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[6261]: GenerateMipmapEXT (will be remapped) */
+   /* _mesa_function_pool[6679]: GenerateMipmapEXT (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "\0"
-   /* _mesa_function_pool[6301]: GenLists (offset 5) */
+   /* _mesa_function_pool[6719]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[6315]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[6733]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[6350]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[6768]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[6384]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[6802]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[6411]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[6829]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[6439]: BufferDataARB (will be remapped) */
+   /* _mesa_function_pool[6857]: BufferDataARB (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[6474]: FlushVertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[6892]: FlushVertexArrayRangeNV (will be remapped) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[6502]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[6920]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[6522]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[6940]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[6542]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[6960]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[6562]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6980]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6588]: GetTexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[7006]: GetTexFilterFuncSGIS (dynamic) */
    "iip\0"
    "glGetTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[6616]: Scissor (offset 176) */
+   /* _mesa_function_pool[7034]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[6632]: Fogf (offset 153) */
+   /* _mesa_function_pool[7050]: Fogf (offset 153) */
    "if\0"
    "glFogf\0"
    "\0"
-   /* _mesa_function_pool[6643]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[7061]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6688]: TexSubImage1D (offset 332) */
+   /* _mesa_function_pool[7106]: TexSubImage1D (offset 332) */
    "iiiiiip\0"
    "glTexSubImage1D\0"
    "glTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[6732]: VertexAttrib1sARB (will be remapped) */
+   /* _mesa_function_pool[7150]: VertexAttrib1sARB (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[6773]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[7191]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[6789]: Color4usv (offset 40) */
+   /* _mesa_function_pool[7207]: Color4usv (offset 40) */
    "p\0"
    "glColor4usv\0"
    "\0"
-   /* _mesa_function_pool[6804]: Fogi (offset 155) */
+   /* _mesa_function_pool[7222]: Fogi (offset 155) */
    "ii\0"
    "glFogi\0"
    "\0"
-   /* _mesa_function_pool[6815]: DepthRange (offset 288) */
+   /* _mesa_function_pool[7233]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[6832]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[7250]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[6850]: FinalCombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[7268]: FinalCombinerInputNV (will be remapped) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[6879]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[7297]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[6896]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[7314]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[6914]: Color4ui (offset 37) */
+   /* _mesa_function_pool[7332]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[6931]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[7349]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[6950]: Color3usv (offset 24) */
+   /* _mesa_function_pool[7368]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[6965]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[7383]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[6985]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[7403]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[7002]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[7420]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7051]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[7469]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[7068]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[7486]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[7087]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[7505]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[7106]: Uniform1fARB (will be remapped) */
+   /* _mesa_function_pool[7524]: Uniform1fARB (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[7137]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[7555]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[7189]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[7607]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[7206]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[7624]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[7255]: ColorTableParameteriv (offset 341) */
+   /* _mesa_function_pool[7673]: ColorTableParameteriv (offset 341) */
    "iip\0"
    "glColorTableParameteriv\0"
    "glColorTableParameterivSGI\0"
    "\0"
-   /* _mesa_function_pool[7311]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[7729]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[7342]: WindowPos3dMESA (will be remapped) */
+   /* _mesa_function_pool[7760]: WindowPos3dMESA (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[7396]: Color4us (offset 39) */
+   /* _mesa_function_pool[7814]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[7413]: PointParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[7831]: PointParameterfvEXT (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[7503]: Color3bv (offset 10) */
+   /* _mesa_function_pool[7921]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[7517]: WindowPos2fvMESA (will be remapped) */
+   /* _mesa_function_pool[7935]: WindowPos2fvMESA (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[7572]: SecondaryColor3bvEXT (will be remapped) */
+   /* _mesa_function_pool[7990]: SecondaryColor3bvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[7618]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[8036]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[7648]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[8066]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[7685]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[8103]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[7714]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[8132]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7756]: RenderbufferStorageEXT (will be remapped) */
+   /* _mesa_function_pool[8174]: RenderbufferStorageEXT (will be remapped) */
    "iiii\0"
    "glRenderbufferStorage\0"
    "glRenderbufferStorageEXT\0"
    "\0"
-   /* _mesa_function_pool[7809]: IsFenceNV (will be remapped) */
+   /* _mesa_function_pool[8227]: IsFenceNV (will be remapped) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[7824]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[8242]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[7846]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[8264]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[7876]: UniformMatrix2fvARB (will be remapped) */
+   /* _mesa_function_pool[8294]: UniformMatrix2fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[7923]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[8341]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[7967]: ColorTable (offset 339) */
+   /* _mesa_function_pool[8385]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[8020]: IndexPointer (offset 314) */
+   /* _mesa_function_pool[8438]: IndexPointer (offset 314) */
    "iip\0"
    "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[8040]: Accum (offset 213) */
+   /* _mesa_function_pool[8458]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[8052]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[8470]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[8073]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[8491]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[8105]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[8523]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[8161]: Finish (offset 216) */
+   /* _mesa_function_pool[8579]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[8172]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[8590]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[8196]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[8614]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[8214]: VertexAttrib3dvARB (will be remapped) */
+   /* _mesa_function_pool[8632]: VertexAttrib3dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[8257]: Uniform4uivEXT (will be remapped) */
+   /* _mesa_function_pool[8675]: Uniform4uivEXT (will be remapped) */
    "iip\0"
    "glUniform4uivEXT\0"
+   "glUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[8279]: HintPGI (dynamic) */
+   /* _mesa_function_pool[8711]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[8293]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[8725]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[8351]: Color4s (offset 33) */
+   /* _mesa_function_pool[8783]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[8367]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[8799]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[8392]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[8824]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[8410]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[8842]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[8427]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[8859]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[8442]: CullParameterdvEXT (dynamic) */
+   /* _mesa_function_pool[8874]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[8467]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[8899]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[8504]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[8936]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[8533]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[8965]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[8590]: Color4i (offset 31) */
+   /* _mesa_function_pool[9022]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[8606]: Color4f (offset 29) */
+   /* _mesa_function_pool[9038]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[8622]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[9054]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[8640]: Color4d (offset 27) */
+   /* _mesa_function_pool[9072]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[8656]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[9088]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[8672]: Color4b (offset 25) */
+   /* _mesa_function_pool[9104]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[8688]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[9120]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[8705]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[9137]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[8735]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[9167]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[8753]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[9185]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[8811]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[9243]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[8832]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[9264]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[8851]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[9283]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[8878]: BeginTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[9310]: BeginTransformFeedbackEXT (will be remapped) */
    "i\0"
    "glBeginTransformFeedbackEXT\0"
    "glBeginTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[8934]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[9366]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[8956]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[9388]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[8972]: EndList (offset 1) */
+   /* _mesa_function_pool[9404]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[8984]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[9416]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[9008]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[9440]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[9038]: Uniform3fvARB (will be remapped) */
+   /* _mesa_function_pool[9470]: Uniform3fvARB (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[9072]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[9504]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[9090]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[9522]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[9141]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[9573]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[9160]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[9592]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[9175]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[9607]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[9203]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[9635]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[9231]: CheckFramebufferStatusEXT (will be remapped) */
+   /* _mesa_function_pool[9663]: CheckFramebufferStatusEXT (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "\0"
-   /* _mesa_function_pool[9287]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[9719]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[9315]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[9747]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[9333]: GetVertexAttribivARB (will be remapped) */
+   /* _mesa_function_pool[9765]: GetVertexAttribivARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[9381]: GetCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[9813]: GetCombinerInputParameterfvNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9420]: GetTexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[9852]: GetTexParameterIivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIivEXT\0"
+   "glGetTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[9449]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[9902]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[9467]: LoadTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[9920]: LoadTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[9519]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[9972]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[9553]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[10006]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[9581]: SecondaryColor3sEXT (will be remapped) */
+   /* _mesa_function_pool[10034]: SecondaryColor3sEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[9627]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10080]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[9653]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[10106]: GetInteger64i_v (will be remapped) */
+   "iip\0"
+   "glGetInteger64i_v\0"
+   "\0"
+   /* _mesa_function_pool[10129]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[9668]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[10144]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[9695]: Color3us (offset 23) */
+   /* _mesa_function_pool[10171]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[9711]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[10187]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[9746]: VertexAttrib4ivARB (will be remapped) */
+   /* _mesa_function_pool[10222]: VertexAttrib4ivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[9789]: End (offset 43) */
+   /* _mesa_function_pool[10265]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[9797]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[10273]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[9822]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[10298]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[9848]: GetQueryObjectui64vEXT (will be remapped) */
+   /* _mesa_function_pool[10324]: GetQueryObjectui64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[9878]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[10354]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[9923]: SecondaryColor3dEXT (will be remapped) */
+   /* _mesa_function_pool[10399]: SecondaryColor3dEXT (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[9969]: Color3ub (offset 19) */
+   /* _mesa_function_pool[10445]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[9985]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[10461]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[10017]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[10493]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[10042]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10518]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10077]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[10553]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[10100]: GetUniformuivEXT (will be remapped) */
+   /* _mesa_function_pool[10576]: GetUniformuivEXT (will be remapped) */
    "iip\0"
    "glGetUniformuivEXT\0"
+   "glGetUniformuiv\0"
    "\0"
-   /* _mesa_function_pool[10124]: Color3ui (offset 21) */
+   /* _mesa_function_pool[10616]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[10140]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[10632]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[10157]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[10649]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[10203]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[10695]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[10230]: GetTexParameterPointervAPPLE (will be remapped) */
+   /* _mesa_function_pool[10722]: GetTexParameterPointervAPPLE (will be remapped) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[10266]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[10758]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[10282]: GetTransformFeedbackVaryingEXT (will be remapped) */
+   /* _mesa_function_pool[10774]: GetTransformFeedbackVaryingEXT (will be remapped) */
    "iiipppp\0"
    "glGetTransformFeedbackVaryingEXT\0"
    "glGetTransformFeedbackVarying\0"
    "\0"
-   /* _mesa_function_pool[10354]: VertexAttrib4bvARB (will be remapped) */
+   /* _mesa_function_pool[10846]: VertexAttrib4bvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[10397]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[10889]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[10430]: GetIntegerIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[10922]: GetIntegerIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
+   "glGetIntegeri_v\0"
    "\0"
-   /* _mesa_function_pool[10459]: MultiTexCoord4sARB (offset 406) */
+   /* _mesa_function_pool[10967]: MultiTexCoord4sARB (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[10505]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[11013]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[10538]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[11046]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[10562]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[11070]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "\0"
-   /* _mesa_function_pool[10587]: WindowPos2dMESA (will be remapped) */
+   /* _mesa_function_pool[11095]: WindowPos2dMESA (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[10640]: FramebufferTexture3DEXT (will be remapped) */
+   /* _mesa_function_pool[11148]: FramebufferTexture3DEXT (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "\0"
-   /* _mesa_function_pool[10697]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[11205]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "\0"
-   /* _mesa_function_pool[10735]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[11243]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[10760]: VertexAttrib3dARB (will be remapped) */
+   /* _mesa_function_pool[11268]: VertexAttrib3dARB (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[10803]: VertexAttribI4usvEXT (will be remapped) */
+   /* _mesa_function_pool[11311]: VertexAttribI4usvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4usvEXT\0"
+   "glVertexAttribI4usv\0"
    "\0"
-   /* _mesa_function_pool[10830]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11358]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10894]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[11422]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[10938]: GetError (offset 261) */
+   /* _mesa_function_pool[11466]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[10951]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[11479]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[10970]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[11498]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[10987]: Indexdv (offset 45) */
+   /* _mesa_function_pool[11515]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[11000]: FramebufferTexture2DEXT (will be remapped) */
+   /* _mesa_function_pool[11528]: FramebufferTexture2DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "\0"
-   /* _mesa_function_pool[11056]: Normal3s (offset 60) */
+   /* _mesa_function_pool[11584]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[11072]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[11600]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[11106]: PushName (offset 201) */
+   /* _mesa_function_pool[11634]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[11120]: MultiTexCoord2dvARB (offset 385) */
+   /* _mesa_function_pool[11648]: MultiTexCoord2dvARB (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[11165]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[11693]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[11190]: Normal3i (offset 58) */
+   /* _mesa_function_pool[11718]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[11206]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[11734]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[11241]: SecondaryColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[11769]: SecondaryColorPointerEXT (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[11298]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[11826]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[11341]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[11869]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[11370]: GetActiveUniformARB (will be remapped) */
+   /* _mesa_function_pool[11898]: GetActiveUniformARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[11420]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[11948]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[11454]: Normal3b (offset 52) */
+   /* _mesa_function_pool[11982]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[11470]: Normal3d (offset 54) */
+   /* _mesa_function_pool[11998]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[11486]: Uniform1uiEXT (will be remapped) */
+   /* _mesa_function_pool[12014]: Uniform1uiEXT (will be remapped) */
    "ii\0"
    "glUniform1uiEXT\0"
+   "glUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[11506]: Normal3f (offset 56) */
+   /* _mesa_function_pool[12047]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[11522]: MultiTexCoord1svARB (offset 383) */
+   /* _mesa_function_pool[12063]: MultiTexCoord1svARB (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[11567]: Indexi (offset 48) */
+   /* _mesa_function_pool[12108]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[11579]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[12120]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[11612]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[12153]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[11640]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[12181]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[11661]: BindBufferRangeEXT (will be remapped) */
+   /* _mesa_function_pool[12202]: BindBufferRangeEXT (will be remapped) */
    "iiiii\0"
    "glBindBufferRangeEXT\0"
    "glBindBufferRange\0"
    "\0"
-   /* _mesa_function_pool[11707]: DepthMask (offset 211) */
+   /* _mesa_function_pool[12248]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[11722]: IsShader (will be remapped) */
+   /* _mesa_function_pool[12263]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[11736]: Indexf (offset 46) */
+   /* _mesa_function_pool[12277]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[11748]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[12289]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[11786]: Indexd (offset 44) */
+   /* _mesa_function_pool[12327]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[11798]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[12339]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[11819]: StencilOp (offset 244) */
+   /* _mesa_function_pool[12360]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[11836]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[12377]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[11858]: FramebufferTextureLayer (dynamic) */
+   /* _mesa_function_pool[12399]: FramebufferTextureLayer (dynamic) */
    "iiiii\0"
    "glFramebufferTextureLayerARB\0"
    "\0"
-   /* _mesa_function_pool[11894]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[12435]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[11939]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[12480]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[11955]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[12496]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[12001]: Indexs (offset 50) */
+   /* _mesa_function_pool[12542]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[12013]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[12554]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[12033]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[12574]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[12055]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[12596]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[12093]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[12634]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[12125]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[12666]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[12152]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[12693]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[12167]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[12708]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[12184]: VertexAttribI1uivEXT (will be remapped) */
+   /* _mesa_function_pool[12725]: VertexAttribI1uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1uivEXT\0"
+   "glVertexAttribI1uiv\0"
    "\0"
-   /* _mesa_function_pool[12211]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[12772]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[12226]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[12787]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[12279]: Color4bv (offset 26) */
+   /* _mesa_function_pool[12840]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[12293]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[12854]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[12315]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[12876]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[12363]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[12924]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[12388]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[12949]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[12436]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[12997]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[12460]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[13021]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[12495]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[13056]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[12513]: LogicOp (offset 242) */
+   /* _mesa_function_pool[13074]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[12526]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[13087]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[12550]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[13111]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[12565]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[13126]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[12641]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[13202]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[12658]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[13219]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[12678]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[13239]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[12705]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[13266]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[12750]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[13311]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[12765]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13326]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12797]: VertexAttribI4svEXT (will be remapped) */
+   /* _mesa_function_pool[13358]: VertexAttribI4svEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4svEXT\0"
+   "glVertexAttribI4sv\0"
    "\0"
-   /* _mesa_function_pool[12823]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[13403]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[12851]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[13431]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[12875]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[13455]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[12936]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[13516]: ClearBufferuiv (will be remapped) */
+   "iip\0"
+   "glClearBufferuiv\0"
+   "\0"
+   /* _mesa_function_pool[13538]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[12960]: GenTextures (offset 328) */
+   /* _mesa_function_pool[13562]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[12995]: FramebufferTextureARB (will be remapped) */
+   /* _mesa_function_pool[13597]: FramebufferTextureARB (will be remapped) */
    "iiii\0"
    "glFramebufferTextureARB\0"
    "\0"
-   /* _mesa_function_pool[13025]: SetFenceNV (will be remapped) */
+   /* _mesa_function_pool[13627]: SetFenceNV (will be remapped) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[13042]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[13644]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[13098]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[13700]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[13137]: MultiModeDrawArraysIBM (will be remapped) */
+   /* _mesa_function_pool[13739]: MultiModeDrawArraysIBM (will be remapped) */
    "pppii\0"
    "glMultiModeDrawArraysIBM\0"
    "\0"
-   /* _mesa_function_pool[13169]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[13771]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[13202]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[13804]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[13224]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13826]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13252]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[13854]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[13270]: GetCombinerOutputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[13872]: GetCombinerOutputParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[13309]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[13911]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[13327]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[13929]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[13342]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[13944]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[13358]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[13960]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[13375]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[13977]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[13399]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[14001]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[13416]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[14018]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[13471]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[14073]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[13486]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[14088]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[13505]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[14107]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[13534]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[14136]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[13577]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[14179]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[13621]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[14223]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[13637]: EndTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[14239]: EndTransformFeedbackEXT (will be remapped) */
    "\0"
    "glEndTransformFeedbackEXT\0"
    "glEndTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[13688]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[14290]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[13722]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[14324]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[13751]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[14353]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[13796]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[14398]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[13852]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[14454]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[13873]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[14475]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[13903]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[14505]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[13938]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[14540]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[13957]: Flush (offset 217) */
+   /* _mesa_function_pool[14559]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[13967]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[14569]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[13982]: VertexAttribI4iEXT (will be remapped) */
+   /* _mesa_function_pool[14584]: VertexAttribI4iEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4iEXT\0"
+   "glVertexAttribI4i\0"
    "\0"
-   /* _mesa_function_pool[14010]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[14630]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[14032]: Uniform3uivEXT (will be remapped) */
+   /* _mesa_function_pool[14652]: Uniform3uivEXT (will be remapped) */
    "iip\0"
    "glUniform3uivEXT\0"
+   "glUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[14054]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[14688]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[14072]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[14706]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[14115]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[14749]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[14139]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[14773]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[14155]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[14789]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[14173]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[14807]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[14215]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[14849]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[14237]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[14871]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[14257]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[14891]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[14298]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[14932]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[14353]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[14987]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[14371]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[15005]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[14395]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[15029]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[14413]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[15047]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[14431]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[15065]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[14485]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[15119]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[14527]: Color4ub (offset 35) */
+   /* _mesa_function_pool[15161]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[14544]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[15178]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[14564]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[15198]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[14593]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[15227]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[14611]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[15245]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[14671]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[15305]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[14690]: Indexiv (offset 49) */
+   /* _mesa_function_pool[15324]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[14703]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[15337]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[14721]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[15355]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[14765]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[15399]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[14825]: Frustum (offset 289) */
+   /* _mesa_function_pool[15459]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[14843]: GetString (offset 275) */
+   /* _mesa_function_pool[15477]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[14858]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[15492]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[14884]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[15518]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[14899]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[15533]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[14917]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[15551]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[14947]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[15581]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[14965]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[15599]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[15010]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[15644]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[15054]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[15688]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[15097]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[15731]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[15138]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[15772]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[15166]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[15800]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[15201]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[15835]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[15219]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[15853]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[15250]: DrawArraysInstanced (will be remapped) */
-   "iiii\0"
-   "glDrawArraysInstanced\0"
-   "glDrawArraysInstancedARB\0"
-   "glDrawArraysInstancedEXT\0"
-   "\0"
-   /* _mesa_function_pool[15328]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[15884]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[15362]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[15918]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[15387]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[15943]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[15443]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[15999]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[15462]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[16018]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[15478]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[16034]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[15526]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[16082]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[15572]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[16128]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[15589]: VertexAttribI4uiEXT (will be remapped) */
+   /* _mesa_function_pool[16145]: VertexAttribI4uiEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4uiEXT\0"
+   "glVertexAttribI4ui\0"
    "\0"
-   /* _mesa_function_pool[15618]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[16193]: GetFragmentMaterialfvSGIX (dynamic) */
+   "iip\0"
+   "glGetFragmentMaterialfvSGIX\0"
+   "\0"
+   /* _mesa_function_pool[16226]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[15645]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16253]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[15672]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[16280]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[15709]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[16317]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[15729]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[16337]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[15750]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[16358]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[15777]: Rectd (offset 86) */
+   /* _mesa_function_pool[16385]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[15791]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16399]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[15817]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[16425]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[15854]: VertexAttribI4ubvEXT (will be remapped) */
+   /* _mesa_function_pool[16462]: VertexAttribI4ubvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ubvEXT\0"
+   "glVertexAttribI4ubv\0"
    "\0"
-   /* _mesa_function_pool[15881]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[16509]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[15928]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[16556]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[15947]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[16575]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[15992]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16620]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[16017]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[16645]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[16047]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[16675]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[16094]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[16722]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[16142]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[16770]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[16200]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[16828]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[16234]: Lightfv (offset 160) */
+   /* _mesa_function_pool[16862]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[16249]: PrimitiveRestartIndexNV (will be remapped) */
+   /* _mesa_function_pool[16877]: PrimitiveRestartIndexNV (will be remapped) */
    "i\0"
    "glPrimitiveRestartIndexNV\0"
+   "glPrimitiveRestartIndex\0"
    "\0"
-   /* _mesa_function_pool[16278]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[16930]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[16294]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[16946]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[16314]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[16966]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[16336]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[16988]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[16379]: Color4fv (offset 30) */
+   /* _mesa_function_pool[17031]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[16393]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[17045]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[16438]: DrawElementsInstanced (will be remapped) */
-   "iiipi\0"
-   "glDrawElementsInstanced\0"
-   "glDrawElementsInstancedARB\0"
-   "glDrawElementsInstancedEXT\0"
+   /* _mesa_function_pool[17090]: ProgramLocalParameters4fvEXT (will be remapped) */
+   "iiip\0"
+   "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[16523]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[17127]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[16544]: Rects (offset 92) */
+   /* _mesa_function_pool[17148]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[16558]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17162]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[16592]: CreateShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[17196]: CreateShaderProgramEXT (will be remapped) */
    "ip\0"
    "glCreateShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[16621]: ActiveProgramEXT (will be remapped) */
+   /* _mesa_function_pool[17225]: ActiveProgramEXT (will be remapped) */
    "i\0"
    "glActiveProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[16643]: Lightiv (offset 162) */
+   /* _mesa_function_pool[17247]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[16658]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[17262]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[16702]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[17306]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[16750]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[17354]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[16775]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[17379]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[16799]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[17403]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[16844]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[17448]: ClearBufferfv (will be remapped) */
+   "iip\0"
+   "glClearBufferfv\0"
+   "\0"
+   /* _mesa_function_pool[17469]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[16887]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[17512]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[16913]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[17538]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[16939]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[17564]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[16957]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[17582]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[17000]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[17625]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[17054]: Rectdv (offset 87) */
+   /* _mesa_function_pool[17679]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[17067]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[17692]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[17093]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[17718]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[17152]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[17777]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[17180]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[17805]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[17225]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[17850]: DrawArraysInstancedARB (will be remapped) */
+   "iiii\0"
+   "glDrawArraysInstancedARB\0"
+   "glDrawArraysInstancedEXT\0"
+   "glDrawArraysInstanced\0"
+   "\0"
+   /* _mesa_function_pool[17928]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[17252]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[17955]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[17279]: Materialiv (offset 172) */
+   /* _mesa_function_pool[17982]: ClearBufferfi (will be remapped) */
+   "iifi\0"
+   "glClearBufferfi\0"
+   "\0"
+   /* _mesa_function_pool[18004]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[17297]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[18022]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[17319]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[18044]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[17354]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[18079]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[17400]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[18125]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[17453]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[18178]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[17499]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[18224]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[17517]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[18242]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[17581]: VertexAttribI1iEXT (will be remapped) */
+   /* _mesa_function_pool[18306]: VertexAttribI1iEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1iEXT\0"
+   "glVertexAttribI1i\0"
    "\0"
-   /* _mesa_function_pool[17606]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[18349]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[17633]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[18376]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[17660]: VertexAttribIPointerEXT (will be remapped) */
+   /* _mesa_function_pool[18403]: VertexAttribIPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexAttribIPointerEXT\0"
+   "glVertexAttribIPointer\0"
    "\0"
-   /* _mesa_function_pool[17693]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[18459]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[17721]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[18487]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[17759]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[18525]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[17777]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[18543]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[17801]: TexGeni (offset 192) */
+   /* _mesa_function_pool[18567]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[17816]: TexGenf (offset 190) */
+   /* _mesa_function_pool[18582]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[17831]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[18597]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[17864]: TexGend (offset 188) */
+   /* _mesa_function_pool[18630]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[17879]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[18645]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[17906]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[18672]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[17929]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[18695]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[17948]: BindBufferOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[18714]: BindBufferOffsetEXT (will be remapped) */
    "iiii\0"
    "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[17976]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[18742]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[18030]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[18796]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[18054]: DisableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[18820]: DisableIndexedEXT (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
+   "glDisablei\0"
    "\0"
-   /* _mesa_function_pool[18078]: BindBufferBaseEXT (will be remapped) */
+   /* _mesa_function_pool[18855]: BindBufferBaseEXT (will be remapped) */
    "iii\0"
    "glBindBufferBaseEXT\0"
    "glBindBufferBase\0"
    "\0"
-   /* _mesa_function_pool[18120]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[18897]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[18149]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[18926]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[18173]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[18950]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[18220]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[18997]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[18270]: PixelTexGenSGIX (will be remapped) */
+   /* _mesa_function_pool[19047]: PixelTexGenSGIX (will be remapped) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[18291]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[19068]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[18318]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[19095]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[18352]: Color4sv (offset 34) */
+   /* _mesa_function_pool[19129]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[18366]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[19143]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[18396]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[19173]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[18428]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[19205]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[18463]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[19240]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[18479]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[19256]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[18512]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[19289]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[18570]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[19347]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[18626]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[19403]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[18656]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[19433]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[18676]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[19453]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[18695]: Color3dv (offset 12) */
+   /* _mesa_function_pool[19472]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[18709]: IsTexture (offset 330) */
+   /* _mesa_function_pool[19486]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[18739]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[19516]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[18762]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[19539]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[18803]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[19580]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[18838]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[19615]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[18857]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[19634]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[18896]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[19673]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[18926]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[19703]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[18958]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[19735]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[18987]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[19764]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[19003]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[19780]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[19031]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[19808]: GetStringi (will be remapped) */
+   "ii\0"
+   "glGetStringi\0"
+   "\0"
+   /* _mesa_function_pool[19825]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[19073]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[19867]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[19091]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[19885]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[19117]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19911]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19166]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[19960]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[19184]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[19978]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[19229]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[20023]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[19263]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[20057]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[19287]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[20081]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[19326]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[20120]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[19355]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[20149]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[19373]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[20167]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[19416]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[20210]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[19436]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[20230]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[19504]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[20298]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[19559]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[20353]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[19597]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[20391]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[19631]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[20425]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[19679]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[20473]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[19707]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[20501]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[19760]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[20554]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[19781]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[20575]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[19808]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[20602]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[19840]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[20634]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[19864]: TransformFeedbackVaryingsEXT (will be remapped) */
+   /* _mesa_function_pool[20658]: TransformFeedbackVaryingsEXT (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryingsEXT\0"
    "glTransformFeedbackVaryings\0"
    "\0"
-   /* _mesa_function_pool[19929]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[20723]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[19951]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[20745]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[19969]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[20763]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[19992]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[20786]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[20019]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[20813]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[20069]: Color3s (offset 17) */
+   /* _mesa_function_pool[20863]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[20084]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[20878]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[20118]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[20912]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[20171]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[20965]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[20190]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[20984]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[20214]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[21008]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[20258]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[21052]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[20281]: Color3i (offset 15) */
+   /* _mesa_function_pool[21075]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[20296]: FrontFace (offset 157) */
+   /* _mesa_function_pool[21090]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[20311]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[21105]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[20329]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[21123]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[20377]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[21171]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[20395]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[21189]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[20438]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[21232]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[20488]: Color3b (offset 9) */
+   /* _mesa_function_pool[21282]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[20503]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[21297]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[20547]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[21341]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[20571]: Color3f (offset 13) */
+   /* _mesa_function_pool[21365]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[20586]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[21380]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[20606]: Color3d (offset 11) */
+   /* _mesa_function_pool[21400]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[20621]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[21415]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[20636]: Lightf (offset 159) */
+   /* _mesa_function_pool[21430]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[20650]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[21444]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[20676]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[21470]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[20692]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[21486]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[20713]: Lighti (offset 161) */
+   /* _mesa_function_pool[21507]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[20727]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[21521]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[20758]: ProgramLocalParameters4fvEXT (will be remapped) */
-   "iiip\0"
-   "glProgramLocalParameters4fvEXT\0"
-   "\0"
-   /* _mesa_function_pool[20795]: GetBooleanIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[21552]: GetBooleanIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
+   "glGetBooleani_v\0"
    "\0"
-   /* _mesa_function_pool[20824]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[21597]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[20909]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[21682]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[20944]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[21717]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[20989]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[21762]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[21024]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[21797]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[21041]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[21814]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[21058]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[21831]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[21075]: VertexAttribI4bvEXT (will be remapped) */
+   /* _mesa_function_pool[21848]: VertexAttribI4bvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4bvEXT\0"
+   "glVertexAttribI4bv\0"
    "\0"
-   /* _mesa_function_pool[21101]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[21893]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[21144]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[21936]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[21175]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[21967]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[21230]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[22022]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[21255]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[22047]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[21281]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[22073]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[21326]: Uniform2uiEXT (will be remapped) */
+   /* _mesa_function_pool[22118]: Uniform2uiEXT (will be remapped) */
    "iii\0"
    "glUniform2uiEXT\0"
+   "glUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[21347]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[22152]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[21374]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[22179]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[21396]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[22201]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[21423]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[22228]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[21452]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[22257]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[21478]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[22283]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[21501]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[22306]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[21520]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[22325]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[21547]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[22352]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[21565]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[22370]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[21610]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[22415]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[21653]: ClearColor (offset 206) */
+   /* _mesa_function_pool[22458]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[21672]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[22477]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[21691]: ClearColorIiEXT (will be remapped) */
+   /* _mesa_function_pool[22496]: ClearColorIiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIiEXT\0"
    "\0"
-   /* _mesa_function_pool[21715]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[22520]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[21764]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[22569]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[21791]: IsEnabledIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[22596]: IsEnabledIndexedEXT (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
+   "glIsEnabledi\0"
    "\0"
-   /* _mesa_function_pool[21817]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[22635]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[21833]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[22651]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[21881]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[22699]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[21901]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[22719]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[21949]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[22767]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[21973]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[22791]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[22014]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[22832]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[22046]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[22864]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[22064]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[22882]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[22156]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[22974]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[22187]: Bitmap (offset 8) */
+   /* _mesa_function_pool[23005]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[22205]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[23023]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[22250]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[23068]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[22281]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[23099]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[22317]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[23135]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[22360]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[23178]: VertexAttribDivisor (will be remapped) */
+   "ii\0"
+   "glVertexAttribDivisor\0"
+   "\0"
+   /* _mesa_function_pool[23204]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[22392]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[23236]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[22407]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[23251]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[22425]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[23269]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[22465]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[23309]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[22492]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[23336]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[22511]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[23355]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[22559]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[23403]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[22594]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[23438]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[22621]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[23465]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[22645]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[23489]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[22679]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[23523]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[22731]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[23575]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[22750]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[23594]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[22781]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[23625]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[22819]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[23663]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[22862]: VertexAttribI2ivEXT (will be remapped) */
+   /* _mesa_function_pool[23706]: VertexAttribI2ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2ivEXT\0"
+   "glVertexAttribI2iv\0"
    "\0"
-   /* _mesa_function_pool[22888]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[23751]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[22908]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[23771]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[22979]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[23842]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[23001]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[23864]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[23021]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[23884]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[23075]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[23938]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[23128]: ProgramParameteriARB (will be remapped) */
+   /* _mesa_function_pool[23991]: ProgramParameteriARB (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "\0"
-   /* _mesa_function_pool[23156]: Map1d (offset 220) */
+   /* _mesa_function_pool[24019]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[23172]: Map1f (offset 221) */
+   /* _mesa_function_pool[24035]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[23188]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[24051]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[23247]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[24110]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[23283]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[24146]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[23307]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[24170]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[23328]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[24191]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[23359]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[24222]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[23398]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[24261]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[23420]: GetFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[24283]: GetFragDataLocationEXT (will be remapped) */
    "ip\0"
    "glGetFragDataLocationEXT\0"
+   "glGetFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[23449]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[24334]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[23503]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[24388]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[23524]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[24409]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[23570]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[24455]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[23585]: Fogiv (offset 156) */
+   /* _mesa_function_pool[24470]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[23597]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[24482]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[23614]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[24499]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[23650]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[24535]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[23671]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[24556]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[23698]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[24583]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[23722]: Rotatef (offset 300) */
+   /* _mesa_function_pool[24607]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[23738]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[24623]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[23780]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[24665]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[23796]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[24681]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[23812]: Clear (offset 203) */
+   /* _mesa_function_pool[24697]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[23823]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[24708]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[23839]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[24724]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[23866]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[24751]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[23900]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[24785]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[23916]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[24801]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[23972]: Ortho (offset 296) */
+   /* _mesa_function_pool[24857]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[23988]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[24873]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[24009]: ListBase (offset 6) */
+   /* _mesa_function_pool[24894]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[24023]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[24908]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[24039]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[24924]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[24095]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[24980]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[24187]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[25072]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[24244]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[25129]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[24260]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[25145]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[24286]: Rectiv (offset 91) */
+   /* _mesa_function_pool[25171]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[24299]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[25184]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[24337]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[25222]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[24364]: EndConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[25249]: EndConditionalRenderNV (will be remapped) */
    "\0"
    "glEndConditionalRenderNV\0"
+   "glEndConditionalRender\0"
    "\0"
-   /* _mesa_function_pool[24391]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[25299]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[24414]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[25322]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[24433]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[25341]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[24452]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[25360]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[24472]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[25380]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[24518]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[25426]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[24533]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[25441]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[24578]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[25486]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[24623]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[25531]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[24669]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[25577]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[24704]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[25612]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[24719]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[25627]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[24767]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[25675]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[24802]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[25710]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[24845]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[25753]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[24862]: PauseTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[25770]: PauseTransformFeedback (will be remapped) */
    "\0"
    "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[24889]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[25797]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[24932]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[25840]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[24979]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[25887]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[25067]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[25975]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[25093]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[26001]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[25138]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[26046]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[25170]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[26078]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[25185]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[26093]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[25211]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[26119]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[25236]: LineWidth (offset 168) */
+   /* _mesa_function_pool[26144]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[25251]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[26159]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[25282]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[26190]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[25320]: TexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[26228]: TexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIuivEXT\0"
+   "glTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[25347]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[26274]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[25367]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[26294]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[25388]: TexGendv (offset 189) */
+   /* _mesa_function_pool[26315]: GetBufferParameteri64v (will be remapped) */
+   "iip\0"
+   "glGetBufferParameteri64v\0"
+   "\0"
+   /* _mesa_function_pool[26345]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[25404]: VertexAttribI3iEXT (will be remapped) */
+   /* _mesa_function_pool[26361]: VertexAttribI3iEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3iEXT\0"
+   "glVertexAttribI3i\0"
    "\0"
-   /* _mesa_function_pool[25431]: EnableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[26406]: EnableIndexedEXT (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
+   "glEnablei\0"
    "\0"
-   /* _mesa_function_pool[25454]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[26439]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[25479]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[26464]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[25500]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[26485]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[25534]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[26519]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[25561]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[26546]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[25584]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[26569]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[25610]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[26595]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[25674]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[26659]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[25700]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[26685]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[25744]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[26729]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[25775]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[26760]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[25812]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[26797]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[25833]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[26818]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[25855]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[26840]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[25876]: CallList (offset 2) */
+   /* _mesa_function_pool[26861]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[25890]: Materialfv (offset 170) */
+   /* _mesa_function_pool[26875]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[25908]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[26893]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[25925]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[26910]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[25957]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[26942]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[26002]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[26987]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[26050]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[27035]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[26095]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[27080]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[26113]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[27098]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[26166]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[27151]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[26197]: Color3iv (offset 16) */
+   /* _mesa_function_pool[27182]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[26211]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[27196]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[26245]: DrawElements (offset 311) */
+   /* _mesa_function_pool[27230]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[26266]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[27251]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[26292]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[27277]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[26329]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[27314]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[26389]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[27374]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[26432]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[27417]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[26487]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[27472]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[26510]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[27495]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[26583]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[27568]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[26606]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[27591]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[26637]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[27622]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[26674]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[27659]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[26691]: Uniform1uivEXT (will be remapped) */
+   /* _mesa_function_pool[27676]: Uniform1uivEXT (will be remapped) */
    "iip\0"
    "glUniform1uivEXT\0"
+   "glUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[26713]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[27712]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[26729]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[27728]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[26749]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[27748]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[26763]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[27762]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[26782]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[27781]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[26802]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[27801]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[26851]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[27850]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[26897]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[27896]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[26916]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[27915]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[26942]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[27941]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[26985]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[27984]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[27010]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[28009]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[27055]: Map2d (offset 222) */
+   /* _mesa_function_pool[28054]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[27075]: Map2f (offset 223) */
+   /* _mesa_function_pool[28074]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[27095]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[28094]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[27120]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[28119]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[27137]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[28136]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[27166]: FragmentLightModelivSGIX (dynamic) */
+   /* _mesa_function_pool[28165]: FragmentLightModelivSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelivSGIX\0"
    "\0"
-   /* _mesa_function_pool[27197]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[28196]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[27220]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[28219]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[27237]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[28236]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[27254]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[28253]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[27271]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[28270]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[27289]: UseShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[28288]: UseShaderProgramEXT (will be remapped) */
    "ii\0"
    "glUseShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[27315]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[28314]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[27341]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[28340]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[27397]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[28396]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[27416]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[28415]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[27433]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[28432]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[27464]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[28463]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[27504]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[28503]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[27530]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[28529]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[27561]: Materialf (offset 169) */
+   /* _mesa_function_pool[28560]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[27578]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[28577]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[27623]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[28622]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[27648]: Materiali (offset 171) */
+   /* _mesa_function_pool[28647]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[27665]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[28664]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[27691]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[28690]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[27726]: Indexsv (offset 51) */
+   /* _mesa_function_pool[28725]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[27739]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[28738]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[27784]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[28783]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[27803]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[28802]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[27820]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[28819]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[27853]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[28852]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[27871]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[28870]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[27908]: Translated (offset 303) */
+   /* _mesa_function_pool[28907]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[27926]: Translatef (offset 304) */
+   /* _mesa_function_pool[28925]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[27944]: Uniform3uiEXT (will be remapped) */
+   /* _mesa_function_pool[28943]: Uniform3uiEXT (will be remapped) */
    "iiii\0"
    "glUniform3uiEXT\0"
+   "glUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[27966]: StencilMask (offset 209) */
+   /* _mesa_function_pool[28978]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[27983]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[28995]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[28003]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[29015]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[28021]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[29033]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[28047]: IsList (offset 287) */
+   /* _mesa_function_pool[29059]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[28059]: IsSync (will be remapped) */
+   /* _mesa_function_pool[29071]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[28071]: RenderMode (offset 196) */
+   /* _mesa_function_pool[29083]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[28087]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[29099]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[28120]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[29132]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "\0"
-   /* _mesa_function_pool[28172]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[29184]: ClearBufferiv (will be remapped) */
+   "iip\0"
+   "glClearBufferiv\0"
+   "\0"
+   /* _mesa_function_pool[29205]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[28209]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[29242]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[28237]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[29270]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[28279]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[29312]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[28322]: LoadName (offset 198) */
+   /* _mesa_function_pool[29355]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[28336]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[29369]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[28363]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[29396]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[28381]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[29414]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[28415]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[29448]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[28466]: CullFace (offset 152) */
+   /* _mesa_function_pool[29499]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[28480]: BindTexture (offset 307) */
+   /* _mesa_function_pool[29513]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[28515]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[29548]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[28542]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[29575]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[28588]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[29621]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[28614]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[29647]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[28633]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[29666]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[28653]: Rectsv (offset 93) */
+   /* _mesa_function_pool[29686]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[28666]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[29699]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[28693]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[29726]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[28751]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[29784]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[28777]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[29810]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[28840]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[29873]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[28895]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[29928]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[28922]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[29955]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[28943]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[29976]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[28965]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[29998]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[28993]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[30026]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[29017]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[30050]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[29062]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[30095]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[29081]: VertexAttribI3uivEXT (will be remapped) */
+   /* _mesa_function_pool[30114]: VertexAttribI3uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3uivEXT\0"
+   "glVertexAttribI3uiv\0"
    "\0"
-   /* _mesa_function_pool[29108]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[30161]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[29135]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[30188]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[29151]: Recti (offset 90) */
+   /* _mesa_function_pool[30204]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[29165]: VertexAttribI3ivEXT (will be remapped) */
+   /* _mesa_function_pool[30218]: VertexAttribI3ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3ivEXT\0"
+   "glVertexAttribI3iv\0"
    "\0"
-   /* _mesa_function_pool[29191]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[30263]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[29230]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[30302]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[29259]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[30331]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[29298]: PixelTransformParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[30370]: PixelTransformParameterfvEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[29334]: PrimitiveRestartNV (will be remapped) */
+   /* _mesa_function_pool[30406]: PrimitiveRestartNV (will be remapped) */
    "\0"
    "glPrimitiveRestartNV\0"
    "\0"
-   /* _mesa_function_pool[29357]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[30429]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[29379]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[30451]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[29400]: Rectf (offset 88) */
+   /* _mesa_function_pool[30472]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[29414]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[30486]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[29437]: Indexfv (offset 47) */
+   /* _mesa_function_pool[30509]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[29450]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[30522]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[29496]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[30568]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[29548]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[30620]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[29583]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[30655]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[29603]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[30675]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[29630]: IndexMask (offset 212) */
+   /* _mesa_function_pool[30702]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[29645]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[30717]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[29682]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[30754]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[29725]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[30797]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[29741]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[30813]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[29767]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[30839]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[29786]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[30858]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[29808]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[30880]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[29827]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[30899]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[29844]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[30916]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[29871]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[30943]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[29885]: Fogfv (offset 154) */
+   /* _mesa_function_pool[30957]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[29897]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[30969]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[29931]: InitNames (offset 197) */
+   /* _mesa_function_pool[31003]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[29945]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[31017]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[29960]: Minmax (offset 368) */
+   /* _mesa_function_pool[31032]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[29986]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[31058]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[30005]: DeformationMap3dSGIX (dynamic) */
+   /* _mesa_function_pool[31077]: DeformationMap3dSGIX (dynamic) */
    "iddiiddiiddiip\0"
    "glDeformationMap3dSGIX\0"
    "\0"
-   /* _mesa_function_pool[30044]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[31116]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[30063]: FogCoorddvEXT (will be remapped) */
+   /* _mesa_function_pool[31135]: FogCoorddvEXT (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[30095]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[31167]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[30117]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[31189]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[30147]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[31219]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[30167]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[31239]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[30185]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[31257]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[30222]: Hint (offset 158) */
+   /* _mesa_function_pool[31294]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[30233]: Color4dv (offset 28) */
+   /* _mesa_function_pool[31305]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[30247]: VertexAttrib2svARB (will be remapped) */
+   /* _mesa_function_pool[31319]: VertexAttrib2svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[30290]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[31362]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[30319]: WindowPos3svMESA (will be remapped) */
+   /* _mesa_function_pool[31391]: WindowPos3svMESA (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[30374]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[31446]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[30424]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[31496]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[30442]: DeleteRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[31514]: DeleteRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[30493]: VertexAttrib4NubvARB (will be remapped) */
+   /* _mesa_function_pool[31565]: VertexAttrib4NubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[30540]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[31612]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[30564]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[31636]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[30595]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[31667]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[30610]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[31682]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[30645]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[31717]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[30662]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[31734]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[30682]: Begin (offset 7) */
+   /* _mesa_function_pool[31754]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[30693]: LightModeli (offset 165) */
+   /* _mesa_function_pool[31765]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[30711]: VertexAttribI4ivEXT (will be remapped) */
+   /* _mesa_function_pool[31783]: VertexAttribI4ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ivEXT\0"
+   "glVertexAttribI4iv\0"
    "\0"
-   /* _mesa_function_pool[30737]: Rectfv (offset 89) */
+   /* _mesa_function_pool[31828]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[30750]: LightModelf (offset 163) */
+   /* _mesa_function_pool[31841]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[30768]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[31859]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[30793]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[31884]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[30811]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[31902]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[30847]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[31938]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[30873]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[31964]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[30896]: GetCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[31987]: GetCombinerInputParameterivNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[30935]: Disable (offset 214) */
+   /* _mesa_function_pool[32026]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[30948]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[32039]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[30993]: GetRenderbufferParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[32084]: GetRenderbufferParameterivEXT (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[31059]: CombinerParameterivNV (will be remapped) */
+   /* _mesa_function_pool[32150]: CombinerParameterivNV (will be remapped) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[31087]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[32178]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[31114]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[32205]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[31148]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[32239]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[31167]: VertexAttrib2sARB (will be remapped) */
+   /* _mesa_function_pool[32258]: VertexAttrib2sARB (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[31209]: ColorMask (offset 210) */
+   /* _mesa_function_pool[32300]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[31227]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[32318]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[31252]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[32343]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[31271]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[32362]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[31301]: BindBufferARB (will be remapped) */
+   /* _mesa_function_pool[32392]: BindBufferARB (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[31334]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[32425]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[31356]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[32447]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[31374]: Enable (offset 215) */
+   /* _mesa_function_pool[32465]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[31386]: LineStipple (offset 167) */
+   /* _mesa_function_pool[32477]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[31404]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[32495]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[31430]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[32521]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[31460]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[32551]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[31487]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[32578]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[31541]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[32632]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[31584]: GenBuffersARB (will be remapped) */
+   /* _mesa_function_pool[32675]: GenBuffersARB (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[31617]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[32708]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[31643]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[32734]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[31658]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[32749]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[31689]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[32780]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[31710]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[32801]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[31740]: IsRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[32831]: IsRenderbufferEXT (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[31780]: GenProgramsNV (will be remapped) */
+   /* _mesa_function_pool[32871]: GenProgramsNV (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[31817]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[32908]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[31841]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[32932]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[31866]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[32957]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[31887]: WindowPos2fMESA (will be remapped) */
+   /* _mesa_function_pool[32978]: WindowPos2fMESA (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
@@ -4648,578 +4739,589 @@ static const char _mesa_function_pool[] =
 
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   {  1513, AttachShader_remap_index },
-   {  9449, CreateProgram_remap_index },
-   { 22046, CreateShader_remap_index },
-   { 24414, DeleteProgram_remap_index },
-   { 17759, DeleteShader_remap_index },
-   { 22492, DetachShader_remap_index },
-   { 17225, GetAttachedShaders_remap_index },
-   {  4594, GetProgramInfoLog_remap_index },
-   {   387, GetProgramiv_remap_index },
-   {  6124, GetShaderInfoLog_remap_index },
-   { 29767, GetShaderiv_remap_index },
-   { 12750, IsProgram_remap_index },
-   { 11722, IsShader_remap_index },
-   {  9553, StencilFuncSeparate_remap_index },
-   {  3727, StencilMaskSeparate_remap_index },
-   {  7206, StencilOpSeparate_remap_index },
-   { 21347, UniformMatrix2x3fv_remap_index },
-   {  2724, UniformMatrix2x4fv_remap_index },
-   { 31460, UniformMatrix3x2fv_remap_index },
-   { 29108, UniformMatrix3x4fv_remap_index },
-   { 15618, UniformMatrix4x2fv_remap_index },
-   {  3101, UniformMatrix4x3fv_remap_index },
-   { 15250, DrawArraysInstanced_remap_index },
-   { 16438, DrawElementsInstanced_remap_index },
-   {  9467, LoadTransposeMatrixdARB_remap_index },
-   { 29496, LoadTransposeMatrixfARB_remap_index },
-   {  5277, MultTransposeMatrixdARB_remap_index },
-   { 22679, MultTransposeMatrixfARB_remap_index },
-   {   198, SampleCoverageARB_remap_index },
-   {  5490, CompressedTexImage1DARB_remap_index },
-   { 23188, CompressedTexImage2DARB_remap_index },
-   {  3790, CompressedTexImage3DARB_remap_index },
-   { 17517, CompressedTexSubImage1DARB_remap_index },
-   {  1963, CompressedTexSubImage2DARB_remap_index },
-   { 19436, CompressedTexSubImage3DARB_remap_index },
-   { 27341, GetCompressedTexImageARB_remap_index },
-   {  3635, DisableVertexAttribArrayARB_remap_index },
-   { 28693, EnableVertexAttribArrayARB_remap_index },
-   { 30610, GetProgramEnvParameterdvARB_remap_index },
-   { 22559, GetProgramEnvParameterfvARB_remap_index },
-   { 26292, GetProgramLocalParameterdvARB_remap_index },
-   {  7648, GetProgramLocalParameterfvARB_remap_index },
-   { 17633, GetProgramStringARB_remap_index },
-   { 26487, GetProgramivARB_remap_index },
-   { 19631, GetVertexAttribdvARB_remap_index },
-   { 15478, GetVertexAttribfvARB_remap_index },
-   {  9333, GetVertexAttribivARB_remap_index },
-   { 18512, ProgramEnvParameter4dARB_remap_index },
-   { 24187, ProgramEnvParameter4dvARB_remap_index },
-   { 16142, ProgramEnvParameter4fARB_remap_index },
-   {  8533, ProgramEnvParameter4fvARB_remap_index },
-   {  3753, ProgramLocalParameter4dARB_remap_index },
-   { 12460, ProgramLocalParameter4dvARB_remap_index },
-   { 28172, ProgramLocalParameter4fARB_remap_index },
-   { 24767, ProgramLocalParameter4fvARB_remap_index },
-   { 27095, ProgramStringARB_remap_index },
-   { 18762, VertexAttrib1dARB_remap_index },
-   { 15054, VertexAttrib1dvARB_remap_index },
-   {  3928, VertexAttrib1fARB_remap_index },
-   { 31541, VertexAttrib1fvARB_remap_index },
-   {  6732, VertexAttrib1sARB_remap_index },
-   {  2137, VertexAttrib1svARB_remap_index },
-   { 14485, VertexAttrib2dARB_remap_index },
-   { 16844, VertexAttrib2dvARB_remap_index },
-   {  1532, VertexAttrib2fARB_remap_index },
-   { 16957, VertexAttrib2fvARB_remap_index },
-   { 31167, VertexAttrib2sARB_remap_index },
-   { 30247, VertexAttrib2svARB_remap_index },
-   { 10760, VertexAttrib3dARB_remap_index },
-   {  8214, VertexAttrib3dvARB_remap_index },
-   {  1619, VertexAttrib3fARB_remap_index },
-   { 21610, VertexAttrib3fvARB_remap_index },
-   { 26942, VertexAttrib3sARB_remap_index },
-   { 19373, VertexAttrib3svARB_remap_index },
-   {  4620, VertexAttrib4NbvARB_remap_index },
-   { 17180, VertexAttrib4NivARB_remap_index },
-   { 21565, VertexAttrib4NsvARB_remap_index },
-   { 22511, VertexAttrib4NubARB_remap_index },
-   { 30493, VertexAttrib4NubvARB_remap_index },
-   { 18173, VertexAttrib4NuivARB_remap_index },
-   {  2974, VertexAttrib4NusvARB_remap_index },
-   { 10354, VertexAttrib4bvARB_remap_index },
-   { 25700, VertexAttrib4dARB_remap_index },
-   { 20395, VertexAttrib4dvARB_remap_index },
-   { 10894, VertexAttrib4fARB_remap_index },
-   { 11298, VertexAttrib4fvARB_remap_index },
-   {  9746, VertexAttrib4ivARB_remap_index },
-   { 16658, VertexAttrib4sARB_remap_index },
-   { 29682, VertexAttrib4svARB_remap_index },
-   { 15947, VertexAttrib4ubvARB_remap_index },
-   { 29017, VertexAttrib4uivARB_remap_index },
-   { 19184, VertexAttrib4usvARB_remap_index },
-   { 21175, VertexAttribPointerARB_remap_index },
-   { 31301, BindBufferARB_remap_index },
-   {  6439, BufferDataARB_remap_index },
-   {  1434, BufferSubDataARB_remap_index },
-   { 29259, DeleteBuffersARB_remap_index },
-   { 31584, GenBuffersARB_remap_index },
-   { 17000, GetBufferParameterivARB_remap_index },
-   { 16094, GetBufferPointervARB_remap_index },
-   {  1387, GetBufferSubDataARB_remap_index },
-   { 28965, IsBufferARB_remap_index },
-   { 25251, MapBufferARB_remap_index },
-   { 29897, UnmapBufferARB_remap_index },
-   {   294, BeginQueryARB_remap_index },
-   { 18857, DeleteQueriesARB_remap_index },
-   { 11612, EndQueryARB_remap_index },
-   { 27820, GenQueriesARB_remap_index },
-   {  1855, GetQueryObjectivARB_remap_index },
-   { 16702, GetQueryObjectuivARB_remap_index },
-   {  1676, GetQueryivARB_remap_index },
-   { 19091, IsQueryARB_remap_index },
-   {  7824, AttachObjectARB_remap_index },
-   { 17721, CompileShaderARB_remap_index },
-   {  3043, CreateProgramObjectARB_remap_index },
-   {  6384, CreateShaderObjectARB_remap_index },
-   { 13852, DeleteObjectARB_remap_index },
-   { 22979, DetachObjectARB_remap_index },
-   { 11370, GetActiveUniformARB_remap_index },
-   {  9008, GetAttachedObjectsARB_remap_index },
-   {  9315, GetHandleARB_remap_index },
-   { 31334, GetInfoLogARB_remap_index },
-   { 30564, GetObjectParameterfvARB_remap_index },
-   { 26166, GetObjectParameterivARB_remap_index },
-   { 27578, GetShaderSourceARB_remap_index },
-   { 26802, GetUniformLocationARB_remap_index },
-   { 22781, GetUniformfvARB_remap_index },
-   { 12055, GetUniformivARB_remap_index },
-   { 19229, LinkProgramARB_remap_index },
-   { 19287, ShaderSourceARB_remap_index },
-   {  7106, Uniform1fARB_remap_index },
-   { 28381, Uniform1fvARB_remap_index },
-   { 21144, Uniform1iARB_remap_index },
-   { 20084, Uniform1ivARB_remap_index },
-   {  2086, Uniform2fARB_remap_index },
-   { 13688, Uniform2fvARB_remap_index },
-   { 25138, Uniform2iARB_remap_index },
-   {  2206, Uniform2ivARB_remap_index },
-   { 17831, Uniform3fARB_remap_index },
-   {  9038, Uniform3fvARB_remap_index },
-   {  6030, Uniform3iARB_remap_index },
-   { 16200, Uniform3ivARB_remap_index },
-   { 18318, Uniform4fARB_remap_index },
-   { 22645, Uniform4fvARB_remap_index },
-   { 23866, Uniform4iARB_remap_index },
-   { 19597, Uniform4ivARB_remap_index },
-   {  7876, UniformMatrix2fvARB_remap_index },
+   {  1577, AttachShader_remap_index },
+   {  9902, CreateProgram_remap_index },
+   { 22864, CreateShader_remap_index },
+   { 25322, DeleteProgram_remap_index },
+   { 18525, DeleteShader_remap_index },
+   { 23336, DetachShader_remap_index },
+   { 17928, GetAttachedShaders_remap_index },
+   {  4869, GetProgramInfoLog_remap_index },
+   {   405, GetProgramiv_remap_index },
+   {  6542, GetShaderInfoLog_remap_index },
+   { 30839, GetShaderiv_remap_index },
+   { 13311, IsProgram_remap_index },
+   { 12263, IsShader_remap_index },
+   { 10006, StencilFuncSeparate_remap_index },
+   {  3921, StencilMaskSeparate_remap_index },
+   {  7624, StencilOpSeparate_remap_index },
+   { 22152, UniformMatrix2x3fv_remap_index },
+   {  2847, UniformMatrix2x4fv_remap_index },
+   { 32551, UniformMatrix3x2fv_remap_index },
+   { 30161, UniformMatrix3x4fv_remap_index },
+   { 16226, UniformMatrix4x2fv_remap_index },
+   {  3263, UniformMatrix4x3fv_remap_index },
+   {  5030, ClampColor_remap_index },
+   { 17982, ClearBufferfi_remap_index },
+   { 17448, ClearBufferfv_remap_index },
+   { 29184, ClearBufferiv_remap_index },
+   { 13516, ClearBufferuiv_remap_index },
+   { 19808, GetStringi_remap_index },
+   {  2788, TexBuffer_remap_index },
+   {   938, FramebufferTexture_remap_index },
+   { 26315, GetBufferParameteri64v_remap_index },
+   { 10106, GetInteger64i_v_remap_index },
+   { 23178, VertexAttribDivisor_remap_index },
+   {  9920, LoadTransposeMatrixdARB_remap_index },
+   { 30568, LoadTransposeMatrixfARB_remap_index },
+   {  5608, MultTransposeMatrixdARB_remap_index },
+   { 23523, MultTransposeMatrixfARB_remap_index },
+   {   216, SampleCoverageARB_remap_index },
+   {  5834, CompressedTexImage1DARB_remap_index },
+   { 24051, CompressedTexImage2DARB_remap_index },
+   {  3984, CompressedTexImage3DARB_remap_index },
+   { 18242, CompressedTexSubImage1DARB_remap_index },
+   {  2050, CompressedTexSubImage2DARB_remap_index },
+   { 20230, CompressedTexSubImage3DARB_remap_index },
+   { 28340, GetCompressedTexImageARB_remap_index },
+   {  3829, DisableVertexAttribArrayARB_remap_index },
+   { 29726, EnableVertexAttribArrayARB_remap_index },
+   { 31682, GetProgramEnvParameterdvARB_remap_index },
+   { 23403, GetProgramEnvParameterfvARB_remap_index },
+   { 27277, GetProgramLocalParameterdvARB_remap_index },
+   {  8066, GetProgramLocalParameterfvARB_remap_index },
+   { 18376, GetProgramStringARB_remap_index },
+   { 27472, GetProgramivARB_remap_index },
+   { 20425, GetVertexAttribdvARB_remap_index },
+   { 16034, GetVertexAttribfvARB_remap_index },
+   {  9765, GetVertexAttribivARB_remap_index },
+   { 19289, ProgramEnvParameter4dARB_remap_index },
+   { 25072, ProgramEnvParameter4dvARB_remap_index },
+   { 16770, ProgramEnvParameter4fARB_remap_index },
+   {  8965, ProgramEnvParameter4fvARB_remap_index },
+   {  3947, ProgramLocalParameter4dARB_remap_index },
+   { 13021, ProgramLocalParameter4dvARB_remap_index },
+   { 29205, ProgramLocalParameter4fARB_remap_index },
+   { 25675, ProgramLocalParameter4fvARB_remap_index },
+   { 28094, ProgramStringARB_remap_index },
+   { 19539, VertexAttrib1dARB_remap_index },
+   { 15688, VertexAttrib1dvARB_remap_index },
+   {  4122, VertexAttrib1fARB_remap_index },
+   { 32632, VertexAttrib1fvARB_remap_index },
+   {  7150, VertexAttrib1sARB_remap_index },
+   {  2224, VertexAttrib1svARB_remap_index },
+   { 15119, VertexAttrib2dARB_remap_index },
+   { 17469, VertexAttrib2dvARB_remap_index },
+   {  1596, VertexAttrib2fARB_remap_index },
+   { 17582, VertexAttrib2fvARB_remap_index },
+   { 32258, VertexAttrib2sARB_remap_index },
+   { 31319, VertexAttrib2svARB_remap_index },
+   { 11268, VertexAttrib3dARB_remap_index },
+   {  8632, VertexAttrib3dvARB_remap_index },
+   {  1683, VertexAttrib3fARB_remap_index },
+   { 22415, VertexAttrib3fvARB_remap_index },
+   { 27941, VertexAttrib3sARB_remap_index },
+   { 20167, VertexAttrib3svARB_remap_index },
+   {  4895, VertexAttrib4NbvARB_remap_index },
+   { 17805, VertexAttrib4NivARB_remap_index },
+   { 22370, VertexAttrib4NsvARB_remap_index },
+   { 23355, VertexAttrib4NubARB_remap_index },
+   { 31565, VertexAttrib4NubvARB_remap_index },
+   { 18950, VertexAttrib4NuivARB_remap_index },
+   {  3136, VertexAttrib4NusvARB_remap_index },
+   { 10846, VertexAttrib4bvARB_remap_index },
+   { 26685, VertexAttrib4dARB_remap_index },
+   { 21189, VertexAttrib4dvARB_remap_index },
+   { 11422, VertexAttrib4fARB_remap_index },
+   { 11826, VertexAttrib4fvARB_remap_index },
+   { 10222, VertexAttrib4ivARB_remap_index },
+   { 17262, VertexAttrib4sARB_remap_index },
+   { 30754, VertexAttrib4svARB_remap_index },
+   { 16575, VertexAttrib4ubvARB_remap_index },
+   { 30050, VertexAttrib4uivARB_remap_index },
+   { 19978, VertexAttrib4usvARB_remap_index },
+   { 21967, VertexAttribPointerARB_remap_index },
+   { 32392, BindBufferARB_remap_index },
+   {  6857, BufferDataARB_remap_index },
+   {  1498, BufferSubDataARB_remap_index },
+   { 30331, DeleteBuffersARB_remap_index },
+   { 32675, GenBuffersARB_remap_index },
+   { 17625, GetBufferParameterivARB_remap_index },
+   { 16722, GetBufferPointervARB_remap_index },
+   {  1451, GetBufferSubDataARB_remap_index },
+   { 29998, IsBufferARB_remap_index },
+   { 26159, MapBufferARB_remap_index },
+   { 30969, UnmapBufferARB_remap_index },
+   {   312, BeginQueryARB_remap_index },
+   { 19634, DeleteQueriesARB_remap_index },
+   { 12153, EndQueryARB_remap_index },
+   { 28819, GenQueriesARB_remap_index },
+   {  1942, GetQueryObjectivARB_remap_index },
+   { 17306, GetQueryObjectuivARB_remap_index },
+   {  1740, GetQueryivARB_remap_index },
+   { 19885, IsQueryARB_remap_index },
+   {  8242, AttachObjectARB_remap_index },
+   { 18487, CompileShaderARB_remap_index },
+   {  3205, CreateProgramObjectARB_remap_index },
+   {  6802, CreateShaderObjectARB_remap_index },
+   { 14454, DeleteObjectARB_remap_index },
+   { 23842, DetachObjectARB_remap_index },
+   { 11898, GetActiveUniformARB_remap_index },
+   {  9440, GetAttachedObjectsARB_remap_index },
+   {  9747, GetHandleARB_remap_index },
+   { 32425, GetInfoLogARB_remap_index },
+   { 31636, GetObjectParameterfvARB_remap_index },
+   { 27151, GetObjectParameterivARB_remap_index },
+   { 28577, GetShaderSourceARB_remap_index },
+   { 27801, GetUniformLocationARB_remap_index },
+   { 23625, GetUniformfvARB_remap_index },
+   { 12596, GetUniformivARB_remap_index },
+   { 20023, LinkProgramARB_remap_index },
+   { 20081, ShaderSourceARB_remap_index },
+   {  7524, Uniform1fARB_remap_index },
+   { 29414, Uniform1fvARB_remap_index },
+   { 21936, Uniform1iARB_remap_index },
+   { 20878, Uniform1ivARB_remap_index },
+   {  2173, Uniform2fARB_remap_index },
+   { 14290, Uniform2fvARB_remap_index },
+   { 26046, Uniform2iARB_remap_index },
+   {  2293, Uniform2ivARB_remap_index },
+   { 18597, Uniform3fARB_remap_index },
+   {  9470, Uniform3fvARB_remap_index },
+   {  6396, Uniform3iARB_remap_index },
+   { 16828, Uniform3ivARB_remap_index },
+   { 19095, Uniform4fARB_remap_index },
+   { 23489, Uniform4fvARB_remap_index },
+   { 24751, Uniform4iARB_remap_index },
+   { 20391, Uniform4ivARB_remap_index },
+   {  8294, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
-   {  2584, UniformMatrix4fvARB_remap_index },
-   { 24299, UseProgramObjectARB_remap_index },
-   { 14173, ValidateProgramARB_remap_index },
-   { 20438, BindAttribLocationARB_remap_index },
-   {  4665, GetActiveAttribARB_remap_index },
-   { 15881, GetAttribLocationARB_remap_index },
-   { 28120, DrawBuffersARB_remap_index },
-   { 12565, RenderbufferStorageMultisample_remap_index },
-   { 12995, FramebufferTextureARB_remap_index },
-   { 24669, FramebufferTextureFaceARB_remap_index },
-   { 23128, ProgramParameteriARB_remap_index },
-   { 18366, FlushMappedBufferRange_remap_index },
-   { 26583, MapBufferRange_remap_index },
-   { 15729, BindVertexArray_remap_index },
-   { 14010, GenVertexArrays_remap_index },
-   { 28895, CopyBufferSubData_remap_index },
-   { 29786, ClientWaitSync_remap_index },
-   {  2503, DeleteSync_remap_index },
-   {  6773, FenceSync_remap_index },
-   { 14544, GetInteger64v_remap_index },
-   { 21672, GetSynciv_remap_index },
-   { 28059, IsSync_remap_index },
-   {  8956, WaitSync_remap_index },
-   {  3603, DrawElementsBaseVertex_remap_index },
-   { 29191, DrawRangeElementsBaseVertex_remap_index },
-   { 25282, MultiDrawElementsBaseVertex_remap_index },
-   {  4799, BindTransformFeedback_remap_index },
-   {  3070, DeleteTransformFeedbacks_remap_index },
-   {  6063, DrawTransformFeedback_remap_index },
-   {  9175, GenTransformFeedbacks_remap_index },
-   { 26985, IsTransformFeedback_remap_index },
-   { 24862, PauseTransformFeedback_remap_index },
-   {  5197, ResumeTransformFeedback_remap_index },
-   {  5085, PolygonOffsetEXT_remap_index },
-   { 22281, GetPixelTexGenParameterfvSGIS_remap_index },
-   {  4187, GetPixelTexGenParameterivSGIS_remap_index },
-   { 22014, PixelTexGenParameterfSGIS_remap_index },
-   {   606, PixelTexGenParameterfvSGIS_remap_index },
-   { 12093, PixelTexGenParameteriSGIS_remap_index },
-   { 13169, PixelTexGenParameterivSGIS_remap_index },
-   { 15817, SampleMaskSGIS_remap_index },
-   { 19031, SamplePatternSGIS_remap_index },
-   { 25211, ColorPointerEXT_remap_index },
-   { 16887, EdgeFlagPointerEXT_remap_index },
-   {  5684, IndexPointerEXT_remap_index },
-   {  5764, NormalPointerEXT_remap_index },
-   { 15138, TexCoordPointerEXT_remap_index },
-   {  6562, VertexPointerEXT_remap_index },
-   {  3405, PointParameterfEXT_remap_index },
-   {  7413, PointParameterfvEXT_remap_index },
-   { 30662, LockArraysEXT_remap_index },
-   { 14237, UnlockArraysEXT_remap_index },
-   {  1203, SecondaryColor3bEXT_remap_index },
-   {  7572, SecondaryColor3bvEXT_remap_index },
-   {  9923, SecondaryColor3dEXT_remap_index },
-   { 24472, SecondaryColor3dvEXT_remap_index },
-   { 26851, SecondaryColor3fEXT_remap_index },
-   { 17453, SecondaryColor3fvEXT_remap_index },
-   {   452, SecondaryColor3iEXT_remap_index },
-   { 15526, SecondaryColor3ivEXT_remap_index },
-   {  9581, SecondaryColor3sEXT_remap_index },
-   { 29450, SecondaryColor3svEXT_remap_index },
-   { 26002, SecondaryColor3ubEXT_remap_index },
-   { 20329, SecondaryColor3ubvEXT_remap_index },
-   { 12315, SecondaryColor3uiEXT_remap_index },
-   { 21901, SecondaryColor3uivEXT_remap_index },
-   { 24719, SecondaryColor3usEXT_remap_index },
-   { 12388, SecondaryColor3usvEXT_remap_index },
-   { 11241, SecondaryColorPointerEXT_remap_index },
-   { 24533, MultiDrawArraysEXT_remap_index },
-   { 20019, MultiDrawElementsEXT_remap_index },
-   { 20214, FogCoordPointerEXT_remap_index },
-   {  4336, FogCoorddEXT_remap_index },
-   { 30063, FogCoorddvEXT_remap_index },
-   {  4428, FogCoordfEXT_remap_index },
-   { 25925, FogCoordfvEXT_remap_index },
-   { 18270, PixelTexGenSGIX_remap_index },
-   { 26510, BlendFuncSeparateEXT_remap_index },
-   {  6474, FlushVertexArrayRangeNV_remap_index },
-   {  5034, VertexArrayRangeNV_remap_index },
-   { 26916, CombinerInputNV_remap_index },
-   {  2029, CombinerOutputNV_remap_index },
-   { 29603, CombinerParameterfNV_remap_index },
-   {  4927, CombinerParameterfvNV_remap_index },
-   { 21396, CombinerParameteriNV_remap_index },
-   { 31059, CombinerParameterivNV_remap_index },
-   {  6850, FinalCombinerInputNV_remap_index },
-   {  9381, GetCombinerInputParameterfvNV_remap_index },
-   { 30896, GetCombinerInputParameterivNV_remap_index },
-   { 13270, GetCombinerOutputParameterfvNV_remap_index },
-   { 13098, GetCombinerOutputParameterivNV_remap_index },
-   {  6219, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 23738, GetFinalCombinerInputParameterivNV_remap_index },
-   { 12033, ResizeBuffersMESA_remap_index },
-   { 10587, WindowPos2dMESA_remap_index },
-   {   996, WindowPos2dvMESA_remap_index },
-   { 31887, WindowPos2fMESA_remap_index },
-   {  7517, WindowPos2fvMESA_remap_index },
-   { 17400, WindowPos2iMESA_remap_index },
-   { 19504, WindowPos2ivMESA_remap_index },
-   { 20118, WindowPos2sMESA_remap_index },
-   {  5404, WindowPos2svMESA_remap_index },
-   {  7342, WindowPos3dMESA_remap_index },
-   { 13416, WindowPos3dvMESA_remap_index },
-   {   498, WindowPos3fMESA_remap_index },
-   { 14298, WindowPos3fvMESA_remap_index },
-   { 23021, WindowPos3iMESA_remap_index },
-   { 28840, WindowPos3ivMESA_remap_index },
-   { 17976, WindowPos3sMESA_remap_index },
-   { 30319, WindowPos3svMESA_remap_index },
-   { 10538, WindowPos4dMESA_remap_index },
-   { 16314, WindowPos4dvMESA_remap_index },
-   { 13375, WindowPos4fMESA_remap_index },
-   { 29357, WindowPos4fvMESA_remap_index },
-   { 28993, WindowPos4iMESA_remap_index },
-   { 11836, WindowPos4ivMESA_remap_index },
-   { 18149, WindowPos4sMESA_remap_index },
-   {  3021, WindowPos4svMESA_remap_index },
-   { 13137, MultiModeDrawArraysIBM_remap_index },
-   { 27691, MultiModeDrawElementsIBM_remap_index },
-   { 11640, DeleteFencesNV_remap_index },
-   { 26763, FinishFenceNV_remap_index },
-   {  3527, GenFencesNV_remap_index },
-   { 16294, GetFenceivNV_remap_index },
-   {  7809, IsFenceNV_remap_index },
-   { 13025, SetFenceNV_remap_index },
-   {  3984, TestFenceNV_remap_index },
-   { 30290, AreProgramsResidentNV_remap_index },
-   { 29645, BindProgramNV_remap_index },
-   { 24802, DeleteProgramsNV_remap_index },
-   { 20547, ExecuteProgramNV_remap_index },
-   { 31780, GenProgramsNV_remap_index },
-   { 22360, GetProgramParameterdvNV_remap_index },
-   {  9985, GetProgramParameterfvNV_remap_index },
-   { 25185, GetProgramStringNV_remap_index },
-   { 23398, GetProgramivNV_remap_index },
-   { 22594, GetTrackMatrixivNV_remap_index },
-   { 24979, GetVertexAttribPointervNV_remap_index },
-   { 23671, GetVertexAttribdvNV_remap_index },
-   {  8851, GetVertexAttribfvNV_remap_index },
-   { 17606, GetVertexAttribivNV_remap_index },
-   { 18396, IsProgramNV_remap_index },
-   {  8934, LoadProgramNV_remap_index },
-   { 26606, ProgramParameters4dvNV_remap_index },
-   { 23328, ProgramParameters4fvNV_remap_index },
-   { 19808, RequestResidentProgramsNV_remap_index },
-   { 21374, TrackMatrixNV_remap_index },
-   { 30873, VertexAttrib1dNV_remap_index },
-   { 12936, VertexAttrib1dvNV_remap_index },
-   { 27197, VertexAttrib1fNV_remap_index },
-   {  2328, VertexAttrib1fvNV_remap_index },
-   { 29414, VertexAttrib1sNV_remap_index },
-   { 14371, VertexAttrib1svNV_remap_index },
-   {  4570, VertexAttrib2dNV_remap_index },
-   { 12851, VertexAttrib2dvNV_remap_index },
-   { 19263, VertexAttrib2fNV_remap_index },
-   { 12436, VertexAttrib2fvNV_remap_index },
-   {  5594, VertexAttrib2sNV_remap_index },
-   { 18030, VertexAttrib2svNV_remap_index },
-   { 10735, VertexAttrib3dNV_remap_index },
-   { 30540, VertexAttrib3dvNV_remap_index },
-   {  9797, VertexAttrib3fNV_remap_index },
-   { 23698, VertexAttrib3fvNV_remap_index },
-   { 21230, VertexAttrib3sNV_remap_index },
-   { 22621, VertexAttrib3svNV_remap_index },
-   { 27665, VertexAttrib4dNV_remap_index },
-   { 31817, VertexAttrib4dvNV_remap_index },
-   {  4237, VertexAttrib4fNV_remap_index },
-   {  8984, VertexAttrib4fvNV_remap_index },
-   { 25584, VertexAttrib4sNV_remap_index },
-   {  1345, VertexAttrib4svNV_remap_index },
-   {  4728, VertexAttrib4ubNV_remap_index },
-   {   760, VertexAttrib4ubvNV_remap_index },
-   { 20727, VertexAttribPointerNV_remap_index },
-   {  2180, VertexAttribs1dvNV_remap_index },
-   { 25067, VertexAttribs1fvNV_remap_index },
-   { 31617, VertexAttribs1svNV_remap_index },
-   {  9822, VertexAttribs2dvNV_remap_index },
-   { 24260, VertexAttribs2fvNV_remap_index },
-   { 16913, VertexAttribs2svNV_remap_index },
-   {  4955, VertexAttribs3dvNV_remap_index },
-   {  2060, VertexAttribs3fvNV_remap_index },
-   { 28588, VertexAttribs3svNV_remap_index },
-   { 25674, VertexAttribs4dvNV_remap_index },
-   {  5008, VertexAttribs4fvNV_remap_index },
-   { 31404, VertexAttribs4svNV_remap_index },
-   { 28336, VertexAttribs4ubvNV_remap_index },
-   { 25744, GetTexBumpParameterfvATI_remap_index },
-   { 31658, GetTexBumpParameterivATI_remap_index },
-   { 17693, TexBumpParameterfvATI_remap_index },
-   { 19679, TexBumpParameterivATI_remap_index },
-   { 14917, AlphaFragmentOp1ATI_remap_index },
-   { 10397, AlphaFragmentOp2ATI_remap_index },
-   { 23614, AlphaFragmentOp3ATI_remap_index },
-   { 28515, BeginFragmentShaderATI_remap_index },
-   { 29844, BindFragmentShaderATI_remap_index },
-   { 22750, ColorFragmentOp1ATI_remap_index },
-   {  4115, ColorFragmentOp2ATI_remap_index },
-   { 30185, ColorFragmentOp3ATI_remap_index },
-   {  5154, DeleteFragmentShaderATI_remap_index },
-   { 31841, EndFragmentShaderATI_remap_index },
-   { 31087, GenFragmentShadersATI_remap_index },
-   { 24391, PassTexCoordATI_remap_index },
-   {  6542, SampleMapATI_remap_index },
-   {  6315, SetFragmentShaderConstantATI_remap_index },
-   {   345, PointParameteriNV_remap_index },
-   { 13577, PointParameterivNV_remap_index },
-   { 27504, ActiveStencilFaceEXT_remap_index },
-   { 26266, BindVertexArrayAPPLE_remap_index },
-   {  2631, DeleteVertexArraysAPPLE_remap_index },
-   { 17252, GenVertexArraysAPPLE_remap_index },
-   { 22425, IsVertexArrayAPPLE_remap_index },
-   {   801, GetProgramNamedParameterdvNV_remap_index },
-   {  3368, GetProgramNamedParameterfvNV_remap_index },
-   { 25775, ProgramNamedParameter4dNV_remap_index },
-   { 13903, ProgramNamedParameter4dvNV_remap_index },
-   {  8467, ProgramNamedParameter4fNV_remap_index },
-   { 11206, ProgramNamedParameter4fvNV_remap_index },
-   { 16249, PrimitiveRestartIndexNV_remap_index },
-   { 29334, PrimitiveRestartNV_remap_index },
-   { 23307, DepthBoundsEXT_remap_index },
-   {  1095, BlendEquationSeparateEXT_remap_index },
-   { 14072, BindFramebufferEXT_remap_index },
-   { 24578, BindRenderbufferEXT_remap_index },
-   {  9231, CheckFramebufferStatusEXT_remap_index },
-   { 21715, DeleteFramebuffersEXT_remap_index },
-   { 30442, DeleteRenderbuffersEXT_remap_index },
-   { 12875, FramebufferRenderbufferEXT_remap_index },
-   { 13042, FramebufferTexture1DEXT_remap_index },
-   { 11000, FramebufferTexture2DEXT_remap_index },
-   { 10640, FramebufferTexture3DEXT_remap_index },
-   { 22317, GenFramebuffersEXT_remap_index },
-   { 16799, GenRenderbuffersEXT_remap_index },
-   {  6261, GenerateMipmapEXT_remap_index },
-   { 20824, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 30993, GetRenderbufferParameterivEXT_remap_index },
-   { 19559, IsFramebufferEXT_remap_index },
-   { 31740, IsRenderbufferEXT_remap_index },
-   {  7756, RenderbufferStorageEXT_remap_index },
-   {   677, BlitFramebufferEXT_remap_index },
-   { 13722, BufferParameteriAPPLE_remap_index },
-   { 18428, FlushMappedBufferRangeAPPLE_remap_index },
-   {  1751, BindFragDataLocationEXT_remap_index },
-   { 23420, GetFragDataLocationEXT_remap_index },
-   { 10100, GetUniformuivEXT_remap_index },
-   {  2810, GetVertexAttribIivEXT_remap_index },
-   {  4001, GetVertexAttribIuivEXT_remap_index },
-   { 11486, Uniform1uiEXT_remap_index },
-   { 26691, Uniform1uivEXT_remap_index },
-   { 21326, Uniform2uiEXT_remap_index },
-   {  4093, Uniform2uivEXT_remap_index },
-   { 27944, Uniform3uiEXT_remap_index },
-   { 14032, Uniform3uivEXT_remap_index },
-   {  3305, Uniform4uiEXT_remap_index },
-   {  8257, Uniform4uivEXT_remap_index },
-   { 17581, VertexAttribI1iEXT_remap_index },
-   {   920, VertexAttribI1ivEXT_remap_index },
-   {  2429, VertexAttribI1uiEXT_remap_index },
-   { 12184, VertexAttribI1uivEXT_remap_index },
+   {  2690, UniformMatrix4fvARB_remap_index },
+   { 25184, UseProgramObjectARB_remap_index },
+   { 14807, ValidateProgramARB_remap_index },
+   { 21232, BindAttribLocationARB_remap_index },
+   {  4940, GetActiveAttribARB_remap_index },
+   { 16509, GetAttribLocationARB_remap_index },
+   { 29132, DrawBuffersARB_remap_index },
+   { 17850, DrawArraysInstancedARB_remap_index },
+   {  6457, DrawElementsInstancedARB_remap_index },
+   { 13126, RenderbufferStorageMultisample_remap_index },
+   { 13597, FramebufferTextureARB_remap_index },
+   { 25577, FramebufferTextureFaceARB_remap_index },
+   { 23991, ProgramParameteriARB_remap_index },
+   { 19143, FlushMappedBufferRange_remap_index },
+   { 27568, MapBufferRange_remap_index },
+   { 16337, BindVertexArray_remap_index },
+   { 14630, GenVertexArrays_remap_index },
+   { 29928, CopyBufferSubData_remap_index },
+   { 30858, ClientWaitSync_remap_index },
+   {  2609, DeleteSync_remap_index },
+   {  7191, FenceSync_remap_index },
+   { 15178, GetInteger64v_remap_index },
+   { 22477, GetSynciv_remap_index },
+   { 29071, IsSync_remap_index },
+   {  9388, WaitSync_remap_index },
+   {  3797, DrawElementsBaseVertex_remap_index },
+   { 30263, DrawRangeElementsBaseVertex_remap_index },
+   { 26190, MultiDrawElementsBaseVertex_remap_index },
+   {  5091, BindTransformFeedback_remap_index },
+   {  3232, DeleteTransformFeedbacks_remap_index },
+   {  6429, DrawTransformFeedback_remap_index },
+   {  9607, GenTransformFeedbacks_remap_index },
+   { 27984, IsTransformFeedback_remap_index },
+   { 25770, PauseTransformFeedback_remap_index },
+   {  5528, ResumeTransformFeedback_remap_index },
+   {  5396, PolygonOffsetEXT_remap_index },
+   { 23099, GetPixelTexGenParameterfvSGIS_remap_index },
+   {  4417, GetPixelTexGenParameterivSGIS_remap_index },
+   { 22832, PixelTexGenParameterfSGIS_remap_index },
+   {   624, PixelTexGenParameterfvSGIS_remap_index },
+   { 12634, PixelTexGenParameteriSGIS_remap_index },
+   { 13771, PixelTexGenParameterivSGIS_remap_index },
+   { 16425, SampleMaskSGIS_remap_index },
+   { 19825, SamplePatternSGIS_remap_index },
+   { 26119, ColorPointerEXT_remap_index },
+   { 17512, EdgeFlagPointerEXT_remap_index },
+   {  6050, IndexPointerEXT_remap_index },
+   {  6130, NormalPointerEXT_remap_index },
+   { 15772, TexCoordPointerEXT_remap_index },
+   {  6980, VertexPointerEXT_remap_index },
+   {  3599, PointParameterfEXT_remap_index },
+   {  7831, PointParameterfvEXT_remap_index },
+   { 31734, LockArraysEXT_remap_index },
+   { 14871, UnlockArraysEXT_remap_index },
+   {  1267, SecondaryColor3bEXT_remap_index },
+   {  7990, SecondaryColor3bvEXT_remap_index },
+   { 10399, SecondaryColor3dEXT_remap_index },
+   { 25380, SecondaryColor3dvEXT_remap_index },
+   { 27850, SecondaryColor3fEXT_remap_index },
+   { 18178, SecondaryColor3fvEXT_remap_index },
+   {   470, SecondaryColor3iEXT_remap_index },
+   { 16082, SecondaryColor3ivEXT_remap_index },
+   { 10034, SecondaryColor3sEXT_remap_index },
+   { 30522, SecondaryColor3svEXT_remap_index },
+   { 26987, SecondaryColor3ubEXT_remap_index },
+   { 21123, SecondaryColor3ubvEXT_remap_index },
+   { 12876, SecondaryColor3uiEXT_remap_index },
+   { 22719, SecondaryColor3uivEXT_remap_index },
+   { 25627, SecondaryColor3usEXT_remap_index },
+   { 12949, SecondaryColor3usvEXT_remap_index },
+   { 11769, SecondaryColorPointerEXT_remap_index },
+   { 25441, MultiDrawArraysEXT_remap_index },
+   { 20813, MultiDrawElementsEXT_remap_index },
+   { 21008, FogCoordPointerEXT_remap_index },
+   {  4566, FogCoorddEXT_remap_index },
+   { 31135, FogCoorddvEXT_remap_index },
+   {  4683, FogCoordfEXT_remap_index },
+   { 26910, FogCoordfvEXT_remap_index },
+   { 19047, PixelTexGenSGIX_remap_index },
+   { 27495, BlendFuncSeparateEXT_remap_index },
+   {  6892, FlushVertexArrayRangeNV_remap_index },
+   {  5345, VertexArrayRangeNV_remap_index },
+   { 27915, CombinerInputNV_remap_index },
+   {  2116, CombinerOutputNV_remap_index },
+   { 30675, CombinerParameterfNV_remap_index },
+   {  5219, CombinerParameterfvNV_remap_index },
+   { 22201, CombinerParameteriNV_remap_index },
+   { 32150, CombinerParameterivNV_remap_index },
+   {  7268, FinalCombinerInputNV_remap_index },
+   {  9813, GetCombinerInputParameterfvNV_remap_index },
+   { 31987, GetCombinerInputParameterivNV_remap_index },
+   { 13872, GetCombinerOutputParameterfvNV_remap_index },
+   { 13700, GetCombinerOutputParameterivNV_remap_index },
+   {  6637, GetFinalCombinerInputParameterfvNV_remap_index },
+   { 24623, GetFinalCombinerInputParameterivNV_remap_index },
+   { 12574, ResizeBuffersMESA_remap_index },
+   { 11095, WindowPos2dMESA_remap_index },
+   {  1060, WindowPos2dvMESA_remap_index },
+   { 32978, WindowPos2fMESA_remap_index },
+   {  7935, WindowPos2fvMESA_remap_index },
+   { 18125, WindowPos2iMESA_remap_index },
+   { 20298, WindowPos2ivMESA_remap_index },
+   { 20912, WindowPos2sMESA_remap_index },
+   {  5748, WindowPos2svMESA_remap_index },
+   {  7760, WindowPos3dMESA_remap_index },
+   { 14018, WindowPos3dvMESA_remap_index },
+   {   516, WindowPos3fMESA_remap_index },
+   { 14932, WindowPos3fvMESA_remap_index },
+   { 23884, WindowPos3iMESA_remap_index },
+   { 29873, WindowPos3ivMESA_remap_index },
+   { 18742, WindowPos3sMESA_remap_index },
+   { 31391, WindowPos3svMESA_remap_index },
+   { 11046, WindowPos4dMESA_remap_index },
+   { 16966, WindowPos4dvMESA_remap_index },
+   { 13977, WindowPos4fMESA_remap_index },
+   { 30429, WindowPos4fvMESA_remap_index },
+   { 30026, WindowPos4iMESA_remap_index },
+   { 12377, WindowPos4ivMESA_remap_index },
+   { 18926, WindowPos4sMESA_remap_index },
+   {  3183, WindowPos4svMESA_remap_index },
+   { 13739, MultiModeDrawArraysIBM_remap_index },
+   { 28690, MultiModeDrawElementsIBM_remap_index },
+   { 12181, DeleteFencesNV_remap_index },
+   { 27762, FinishFenceNV_remap_index },
+   {  3721, GenFencesNV_remap_index },
+   { 16946, GetFenceivNV_remap_index },
+   {  8227, IsFenceNV_remap_index },
+   { 13627, SetFenceNV_remap_index },
+   {  4178, TestFenceNV_remap_index },
+   { 31362, AreProgramsResidentNV_remap_index },
+   { 30717, BindProgramNV_remap_index },
+   { 25710, DeleteProgramsNV_remap_index },
+   { 21341, ExecuteProgramNV_remap_index },
+   { 32871, GenProgramsNV_remap_index },
+   { 23204, GetProgramParameterdvNV_remap_index },
+   { 10461, GetProgramParameterfvNV_remap_index },
+   { 26093, GetProgramStringNV_remap_index },
+   { 24261, GetProgramivNV_remap_index },
+   { 23438, GetTrackMatrixivNV_remap_index },
+   { 25887, GetVertexAttribPointervNV_remap_index },
+   { 24556, GetVertexAttribdvNV_remap_index },
+   {  9283, GetVertexAttribfvNV_remap_index },
+   { 18349, GetVertexAttribivNV_remap_index },
+   { 19173, IsProgramNV_remap_index },
+   {  9366, LoadProgramNV_remap_index },
+   { 27591, ProgramParameters4dvNV_remap_index },
+   { 24191, ProgramParameters4fvNV_remap_index },
+   { 20602, RequestResidentProgramsNV_remap_index },
+   { 22179, TrackMatrixNV_remap_index },
+   { 31964, VertexAttrib1dNV_remap_index },
+   { 13538, VertexAttrib1dvNV_remap_index },
+   { 28196, VertexAttrib1fNV_remap_index },
+   {  2415, VertexAttrib1fvNV_remap_index },
+   { 30486, VertexAttrib1sNV_remap_index },
+   { 15005, VertexAttrib1svNV_remap_index },
+   {  4845, VertexAttrib2dNV_remap_index },
+   { 13431, VertexAttrib2dvNV_remap_index },
+   { 20057, VertexAttrib2fNV_remap_index },
+   { 12997, VertexAttrib2fvNV_remap_index },
+   {  5960, VertexAttrib2sNV_remap_index },
+   { 18796, VertexAttrib2svNV_remap_index },
+   { 11243, VertexAttrib3dNV_remap_index },
+   { 31612, VertexAttrib3dvNV_remap_index },
+   { 10273, VertexAttrib3fNV_remap_index },
+   { 24583, VertexAttrib3fvNV_remap_index },
+   { 22022, VertexAttrib3sNV_remap_index },
+   { 23465, VertexAttrib3svNV_remap_index },
+   { 28664, VertexAttrib4dNV_remap_index },
+   { 32908, VertexAttrib4dvNV_remap_index },
+   {  4467, VertexAttrib4fNV_remap_index },
+   {  9416, VertexAttrib4fvNV_remap_index },
+   { 26569, VertexAttrib4sNV_remap_index },
+   {  1409, VertexAttrib4svNV_remap_index },
+   {  5003, VertexAttrib4ubNV_remap_index },
+   {   778, VertexAttrib4ubvNV_remap_index },
+   { 21521, VertexAttribPointerNV_remap_index },
+   {  2267, VertexAttribs1dvNV_remap_index },
+   { 25975, VertexAttribs1fvNV_remap_index },
+   { 32708, VertexAttribs1svNV_remap_index },
+   { 10298, VertexAttribs2dvNV_remap_index },
+   { 25145, VertexAttribs2fvNV_remap_index },
+   { 17538, VertexAttribs2svNV_remap_index },
+   {  5247, VertexAttribs3dvNV_remap_index },
+   {  2147, VertexAttribs3fvNV_remap_index },
+   { 29621, VertexAttribs3svNV_remap_index },
+   { 26659, VertexAttribs4dvNV_remap_index },
+   {  5319, VertexAttribs4fvNV_remap_index },
+   { 32495, VertexAttribs4svNV_remap_index },
+   { 29369, VertexAttribs4ubvNV_remap_index },
+   { 26729, GetTexBumpParameterfvATI_remap_index },
+   { 32749, GetTexBumpParameterivATI_remap_index },
+   { 18459, TexBumpParameterfvATI_remap_index },
+   { 20473, TexBumpParameterivATI_remap_index },
+   { 15551, AlphaFragmentOp1ATI_remap_index },
+   { 10889, AlphaFragmentOp2ATI_remap_index },
+   { 24499, AlphaFragmentOp3ATI_remap_index },
+   { 29548, BeginFragmentShaderATI_remap_index },
+   { 30916, BindFragmentShaderATI_remap_index },
+   { 23594, ColorFragmentOp1ATI_remap_index },
+   {  4345, ColorFragmentOp2ATI_remap_index },
+   { 31257, ColorFragmentOp3ATI_remap_index },
+   {  5485, DeleteFragmentShaderATI_remap_index },
+   { 32932, EndFragmentShaderATI_remap_index },
+   { 32178, GenFragmentShadersATI_remap_index },
+   { 25299, PassTexCoordATI_remap_index },
+   {  6960, SampleMapATI_remap_index },
+   {  6733, SetFragmentShaderConstantATI_remap_index },
+   {   363, PointParameteriNV_remap_index },
+   { 14179, PointParameterivNV_remap_index },
+   { 28503, ActiveStencilFaceEXT_remap_index },
+   { 27251, BindVertexArrayAPPLE_remap_index },
+   {  2737, DeleteVertexArraysAPPLE_remap_index },
+   { 17955, GenVertexArraysAPPLE_remap_index },
+   { 23269, IsVertexArrayAPPLE_remap_index },
+   {   819, GetProgramNamedParameterdvNV_remap_index },
+   {  3562, GetProgramNamedParameterfvNV_remap_index },
+   { 26760, ProgramNamedParameter4dNV_remap_index },
+   { 14505, ProgramNamedParameter4dvNV_remap_index },
+   {  8899, ProgramNamedParameter4fNV_remap_index },
+   { 11734, ProgramNamedParameter4fvNV_remap_index },
+   { 16877, PrimitiveRestartIndexNV_remap_index },
+   { 30406, PrimitiveRestartNV_remap_index },
+   { 24170, DepthBoundsEXT_remap_index },
+   {  1159, BlendEquationSeparateEXT_remap_index },
+   { 14706, BindFramebufferEXT_remap_index },
+   { 25486, BindRenderbufferEXT_remap_index },
+   {  9663, CheckFramebufferStatusEXT_remap_index },
+   { 22520, DeleteFramebuffersEXT_remap_index },
+   { 31514, DeleteRenderbuffersEXT_remap_index },
+   { 13455, FramebufferRenderbufferEXT_remap_index },
+   { 13644, FramebufferTexture1DEXT_remap_index },
+   { 11528, FramebufferTexture2DEXT_remap_index },
+   { 11148, FramebufferTexture3DEXT_remap_index },
+   { 23135, GenFramebuffersEXT_remap_index },
+   { 17403, GenRenderbuffersEXT_remap_index },
+   {  6679, GenerateMipmapEXT_remap_index },
+   { 21597, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 32084, GetRenderbufferParameterivEXT_remap_index },
+   { 20353, IsFramebufferEXT_remap_index },
+   { 32831, IsRenderbufferEXT_remap_index },
+   {  8174, RenderbufferStorageEXT_remap_index },
+   {   695, BlitFramebufferEXT_remap_index },
+   { 14324, BufferParameteriAPPLE_remap_index },
+   { 19205, FlushMappedBufferRangeAPPLE_remap_index },
+   {  1815, BindFragDataLocationEXT_remap_index },
+   { 24283, GetFragDataLocationEXT_remap_index },
+   { 10576, GetUniformuivEXT_remap_index },
+   {  2933, GetVertexAttribIivEXT_remap_index },
+   {  4195, GetVertexAttribIuivEXT_remap_index },
+   { 12014, Uniform1uiEXT_remap_index },
+   { 27676, Uniform1uivEXT_remap_index },
+   { 22118, Uniform2uiEXT_remap_index },
+   {  4309, Uniform2uivEXT_remap_index },
+   { 28943, Uniform3uiEXT_remap_index },
+   { 14652, Uniform3uivEXT_remap_index },
+   {  3486, Uniform4uiEXT_remap_index },
+   {  8675, Uniform4uivEXT_remap_index },
+   { 18306, VertexAttribI1iEXT_remap_index },
+   {   965, VertexAttribI1ivEXT_remap_index },
+   {  2516, VertexAttribI1uiEXT_remap_index },
+   { 12725, VertexAttribI1uivEXT_remap_index },
    {    81, VertexAttribI2iEXT_remap_index },
-   { 22862, VertexAttribI2ivEXT_remap_index },
-   {  4981, VertexAttribI2uiEXT_remap_index },
-   {  4473, VertexAttribI2uivEXT_remap_index },
-   { 25404, VertexAttribI3iEXT_remap_index },
-   { 29165, VertexAttribI3ivEXT_remap_index },
-   {  3178, VertexAttribI3uiEXT_remap_index },
-   { 29081, VertexAttribI3uivEXT_remap_index },
-   { 21075, VertexAttribI4bvEXT_remap_index },
-   { 13982, VertexAttribI4iEXT_remap_index },
-   { 30711, VertexAttribI4ivEXT_remap_index },
-   { 12797, VertexAttribI4svEXT_remap_index },
-   { 15854, VertexAttribI4ubvEXT_remap_index },
-   { 15589, VertexAttribI4uiEXT_remap_index },
-   {  5108, VertexAttribI4uivEXT_remap_index },
-   { 10803, VertexAttribI4usvEXT_remap_index },
-   { 17660, VertexAttribIPointerEXT_remap_index },
-   {  2865, FramebufferTextureLayerEXT_remap_index },
-   {  5329, ColorMaskIndexedEXT_remap_index },
-   { 18054, DisableIndexedEXT_remap_index },
-   { 25431, EnableIndexedEXT_remap_index },
-   { 20795, GetBooleanIndexedvEXT_remap_index },
-   { 10430, GetIntegerIndexedvEXT_remap_index },
-   { 21791, IsEnabledIndexedEXT_remap_index },
-   { 21691, ClearColorIiEXT_remap_index },
-   {  3255, ClearColorIuiEXT_remap_index },
-   {  9420, GetTexParameterIivEXT_remap_index },
-   {  5564, GetTexParameterIuivEXT_remap_index },
-   {  2839, TexParameterIivEXT_remap_index },
-   { 25320, TexParameterIuivEXT_remap_index },
-   {  4366, BeginConditionalRenderNV_remap_index },
-   { 24364, EndConditionalRenderNV_remap_index },
-   {  8878, BeginTransformFeedbackEXT_remap_index },
-   { 18078, BindBufferBaseEXT_remap_index },
-   { 17948, BindBufferOffsetEXT_remap_index },
-   { 11661, BindBufferRangeEXT_remap_index },
-   { 13637, EndTransformFeedbackEXT_remap_index },
-   { 10282, GetTransformFeedbackVaryingEXT_remap_index },
-   { 19864, TransformFeedbackVaryingsEXT_remap_index },
-   { 28237, ProvokingVertexEXT_remap_index },
-   { 10230, GetTexParameterPointervAPPLE_remap_index },
-   {  4755, TextureRangeAPPLE_remap_index },
-   { 11072, GetObjectParameterivAPPLE_remap_index },
-   { 19003, ObjectPurgeableAPPLE_remap_index },
-   {  5358, ObjectUnpurgeableAPPLE_remap_index },
-   { 16621, ActiveProgramEXT_remap_index },
-   { 16592, CreateShaderProgramEXT_remap_index },
-   { 27289, UseShaderProgramEXT_remap_index },
-   { 27530, StencilFuncSeparateATI_remap_index },
-   { 17319, ProgramEnvParameters4fvEXT_remap_index },
-   { 20758, ProgramLocalParameters4fvEXT_remap_index },
-   { 13505, GetQueryObjecti64vEXT_remap_index },
-   {  9848, GetQueryObjectui64vEXT_remap_index },
-   { 22819, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 11579, EGLImageTargetTexture2DOES_remap_index },
+   { 23706, VertexAttribI2ivEXT_remap_index },
+   {  5273, VertexAttribI2uiEXT_remap_index },
+   {  4728, VertexAttribI2uivEXT_remap_index },
+   { 26361, VertexAttribI3iEXT_remap_index },
+   { 30218, VertexAttribI3ivEXT_remap_index },
+   {  3340, VertexAttribI3uiEXT_remap_index },
+   { 30114, VertexAttribI3uivEXT_remap_index },
+   { 21848, VertexAttribI4bvEXT_remap_index },
+   { 14584, VertexAttribI4iEXT_remap_index },
+   { 31783, VertexAttribI4ivEXT_remap_index },
+   { 13358, VertexAttribI4svEXT_remap_index },
+   { 16462, VertexAttribI4ubvEXT_remap_index },
+   { 16145, VertexAttribI4uiEXT_remap_index },
+   {  5419, VertexAttribI4uivEXT_remap_index },
+   { 11311, VertexAttribI4usvEXT_remap_index },
+   { 18403, VertexAttribIPointerEXT_remap_index },
+   {  3027, FramebufferTextureLayerEXT_remap_index },
+   {  5660, ColorMaskIndexedEXT_remap_index },
+   { 18820, DisableIndexedEXT_remap_index },
+   { 26406, EnableIndexedEXT_remap_index },
+   { 21552, GetBooleanIndexedvEXT_remap_index },
+   { 10922, GetIntegerIndexedvEXT_remap_index },
+   { 22596, IsEnabledIndexedEXT_remap_index },
+   { 22496, ClearColorIiEXT_remap_index },
+   {  3436, ClearColorIuiEXT_remap_index },
+   {  9852, GetTexParameterIivEXT_remap_index },
+   {  5908, GetTexParameterIuivEXT_remap_index },
+   {  2983, TexParameterIivEXT_remap_index },
+   { 26228, TexParameterIuivEXT_remap_index },
+   {  4596, BeginConditionalRenderNV_remap_index },
+   { 25249, EndConditionalRenderNV_remap_index },
+   {  9310, BeginTransformFeedbackEXT_remap_index },
+   { 18855, BindBufferBaseEXT_remap_index },
+   { 18714, BindBufferOffsetEXT_remap_index },
+   { 12202, BindBufferRangeEXT_remap_index },
+   { 14239, EndTransformFeedbackEXT_remap_index },
+   { 10774, GetTransformFeedbackVaryingEXT_remap_index },
+   { 20658, TransformFeedbackVaryingsEXT_remap_index },
+   { 29270, ProvokingVertexEXT_remap_index },
+   { 10722, GetTexParameterPointervAPPLE_remap_index },
+   {  5047, TextureRangeAPPLE_remap_index },
+   { 11600, GetObjectParameterivAPPLE_remap_index },
+   { 19780, ObjectPurgeableAPPLE_remap_index },
+   {  5702, ObjectUnpurgeableAPPLE_remap_index },
+   { 17225, ActiveProgramEXT_remap_index },
+   { 17196, CreateShaderProgramEXT_remap_index },
+   { 28288, UseShaderProgramEXT_remap_index },
+   { 28529, StencilFuncSeparateATI_remap_index },
+   { 18044, ProgramEnvParameters4fvEXT_remap_index },
+   { 17090, ProgramLocalParameters4fvEXT_remap_index },
+   { 14107, GetQueryObjecti64vEXT_remap_index },
+   { 10324, GetQueryObjectui64vEXT_remap_index },
+   { 23663, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 12120, 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 */
-   {  2549, _gloffset_BlendColor },
+   {  2655, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 10697, _gloffset_BlendEquation },
+   { 11205, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 16336, _gloffset_ColorSubTable },
-   { 30374, _gloffset_CopyColorSubTable },
+   { 16988, _gloffset_ColorSubTable },
+   { 31446, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
-   {   239, _gloffset_ConvolutionFilter1D },
-   {  2367, _gloffset_CopyConvolutionFilter1D },
-   {  3864, _gloffset_GetConvolutionParameteriv },
-   {  8105, _gloffset_ConvolutionFilter2D },
-   {  8293, _gloffset_ConvolutionParameteriv },
-   {  8753, _gloffset_ConvolutionParameterfv },
-   { 19707, _gloffset_GetSeparableFilter },
-   { 23075, _gloffset_SeparableFilter2D },
-   { 23916, _gloffset_ConvolutionParameteri },
-   { 24039, _gloffset_ConvolutionParameterf },
-   { 25610, _gloffset_GetConvolutionParameterfv },
-   { 26432, _gloffset_GetConvolutionFilter },
-   { 28777, _gloffset_CopyConvolutionFilter2D },
+   {   257, _gloffset_ConvolutionFilter1D },
+   {  2454, _gloffset_CopyConvolutionFilter1D },
+   {  4058, _gloffset_GetConvolutionParameteriv },
+   {  8523, _gloffset_ConvolutionFilter2D },
+   {  8725, _gloffset_ConvolutionParameteriv },
+   {  9185, _gloffset_ConvolutionParameterfv },
+   { 20501, _gloffset_GetSeparableFilter },
+   { 23938, _gloffset_SeparableFilter2D },
+   { 24801, _gloffset_ConvolutionParameteri },
+   { 24924, _gloffset_ConvolutionParameterf },
+   { 26595, _gloffset_GetConvolutionParameterfv },
+   { 27417, _gloffset_GetConvolutionFilter },
+   { 29810, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 14431, _gloffset_CopyTexSubImage3D },
-   { 16047, _gloffset_CopyTexImage2D },
-   { 23524, _gloffset_CopyTexImage1D },
-   { 26113, _gloffset_CopyTexSubImage2D },
-   { 28415, _gloffset_CopyTexSubImage1D },
+   { 15065, _gloffset_CopyTexSubImage3D },
+   { 16675, _gloffset_CopyTexImage2D },
+   { 24409, _gloffset_CopyTexImage1D },
+   { 27098, _gloffset_CopyTexSubImage2D },
+   { 29448, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
-   {  9090, _gloffset_DrawRangeElements },
+   {  9522, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
-   {   838, _gloffset_Histogram },
-   {  3328, _gloffset_ResetHistogram },
-   {  9519, _gloffset_GetMinmax },
-   { 14765, _gloffset_GetHistogramParameterfv },
-   { 23449, _gloffset_GetMinmaxParameteriv },
-   { 25500, _gloffset_ResetMinmax },
-   { 26329, _gloffset_GetHistogramParameteriv },
-   { 27464, _gloffset_GetHistogram },
-   { 29960, _gloffset_Minmax },
-   { 31487, _gloffset_GetMinmaxParameterfv },
+   {   856, _gloffset_Histogram },
+   {  3522, _gloffset_ResetHistogram },
+   {  9972, _gloffset_GetMinmax },
+   { 15399, _gloffset_GetHistogramParameterfv },
+   { 24334, _gloffset_GetMinmaxParameteriv },
+   { 26485, _gloffset_ResetMinmax },
+   { 27314, _gloffset_GetHistogramParameteriv },
+   { 28463, _gloffset_GetHistogram },
+   { 31032, _gloffset_Minmax },
+   { 32578, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
-   {  7967, _gloffset_ColorTable },
-   { 14611, _gloffset_GetColorTable },
-   { 22064, _gloffset_GetColorTableParameterfv },
-   { 24095, _gloffset_GetColorTableParameteriv },
+   {  8385, _gloffset_ColorTable },
+   { 15245, _gloffset_GetColorTable },
+   { 22882, _gloffset_GetColorTableParameterfv },
+   { 24980, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
-   {  6688, _gloffset_TexSubImage1D },
-   { 10157, _gloffset_TexSubImage2D },
+   {  7106, _gloffset_TexSubImage1D },
+   { 10649, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
-   {  1710, _gloffset_TexImage3D },
-   { 21833, _gloffset_TexSubImage3D },
+   {  1774, _gloffset_TexImage3D },
+   { 22651, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
-   {  3128, _gloffset_PrioritizeTextures },
-   {  7137, _gloffset_AreTexturesResident },
-   { 12960, _gloffset_GenTextures },
-   { 15097, _gloffset_DeleteTextures },
-   { 18709, _gloffset_IsTexture },
-   { 28480, _gloffset_BindTexture },
+   {  3290, _gloffset_PrioritizeTextures },
+   {  7555, _gloffset_AreTexturesResident },
+   { 13562, _gloffset_GenTextures },
+   { 15731, _gloffset_DeleteTextures },
+   { 19486, _gloffset_IsTexture },
+   { 29513, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 23247, _gloffset_ArrayElement },
-   { 29548, _gloffset_GetPointerv },
-   { 31114, _gloffset_DrawArrays },
+   { 24110, _gloffset_ArrayElement },
+   { 30620, _gloffset_GetPointerv },
+   { 32205, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
-   {  7255, _gloffset_ColorTableParameteriv },
-   {  7967, _gloffset_ColorTable },
-   { 14611, _gloffset_GetColorTable },
-   { 14721, _gloffset_CopyColorTable },
-   { 18570, _gloffset_ColorTableParameterfv },
-   { 22064, _gloffset_GetColorTableParameterfv },
-   { 24095, _gloffset_GetColorTableParameteriv },
+   {  7673, _gloffset_ColorTableParameteriv },
+   {  8385, _gloffset_ColorTable },
+   { 15245, _gloffset_GetColorTable },
+   { 15355, _gloffset_CopyColorTable },
+   { 19347, _gloffset_ColorTableParameterfv },
+   { 22882, _gloffset_GetColorTableParameterfv },
+   { 24980, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
-   {   407, _gloffset_MultiTexCoord3sARB },
-   {   639, _gloffset_ActiveTextureARB },
-   {  4031, _gloffset_MultiTexCoord1fvARB },
-   {  5789, _gloffset_MultiTexCoord3dARB },
-   {  5834, _gloffset_MultiTexCoord2iARB },
-   {  5958, _gloffset_MultiTexCoord2svARB },
-   {  7923, _gloffset_MultiTexCoord2fARB },
-   {  9878, _gloffset_MultiTexCoord3fvARB },
-   { 10459, _gloffset_MultiTexCoord4sARB },
-   { 11120, _gloffset_MultiTexCoord2dvARB },
-   { 11522, _gloffset_MultiTexCoord1svARB },
-   { 11894, _gloffset_MultiTexCoord3svARB },
-   { 11955, _gloffset_MultiTexCoord4iARB },
-   { 12705, _gloffset_MultiTexCoord3iARB },
-   { 13534, _gloffset_MultiTexCoord1dARB },
-   { 13751, _gloffset_MultiTexCoord3dvARB },
-   { 14965, _gloffset_MultiTexCoord3ivARB },
-   { 15010, _gloffset_MultiTexCoord2sARB },
-   { 16393, _gloffset_MultiTexCoord4ivARB },
-   { 18220, _gloffset_ClientActiveTextureARB },
-   { 20503, _gloffset_MultiTexCoord2dARB },
-   { 20944, _gloffset_MultiTexCoord4dvARB },
-   { 21281, _gloffset_MultiTexCoord4fvARB },
-   { 22205, _gloffset_MultiTexCoord3fARB },
-   { 24623, _gloffset_MultiTexCoord4dARB },
-   { 24889, _gloffset_MultiTexCoord1sARB },
-   { 25093, _gloffset_MultiTexCoord1dvARB },
-   { 25957, _gloffset_MultiTexCoord1ivARB },
-   { 26050, _gloffset_MultiTexCoord2ivARB },
-   { 26389, _gloffset_MultiTexCoord1iARB },
-   { 27739, _gloffset_MultiTexCoord4svARB },
-   { 28279, _gloffset_MultiTexCoord1fARB },
-   { 28542, _gloffset_MultiTexCoord4fARB },
-   { 30948, _gloffset_MultiTexCoord2fvARB },
+   {   425, _gloffset_MultiTexCoord3sARB },
+   {   657, _gloffset_ActiveTextureARB },
+   {  4247, _gloffset_MultiTexCoord1fvARB },
+   {  6155, _gloffset_MultiTexCoord3dARB },
+   {  6200, _gloffset_MultiTexCoord2iARB },
+   {  6324, _gloffset_MultiTexCoord2svARB },
+   {  8341, _gloffset_MultiTexCoord2fARB },
+   { 10354, _gloffset_MultiTexCoord3fvARB },
+   { 10967, _gloffset_MultiTexCoord4sARB },
+   { 11648, _gloffset_MultiTexCoord2dvARB },
+   { 12063, _gloffset_MultiTexCoord1svARB },
+   { 12435, _gloffset_MultiTexCoord3svARB },
+   { 12496, _gloffset_MultiTexCoord4iARB },
+   { 13266, _gloffset_MultiTexCoord3iARB },
+   { 14136, _gloffset_MultiTexCoord1dARB },
+   { 14353, _gloffset_MultiTexCoord3dvARB },
+   { 15599, _gloffset_MultiTexCoord3ivARB },
+   { 15644, _gloffset_MultiTexCoord2sARB },
+   { 17045, _gloffset_MultiTexCoord4ivARB },
+   { 18997, _gloffset_ClientActiveTextureARB },
+   { 21297, _gloffset_MultiTexCoord2dARB },
+   { 21717, _gloffset_MultiTexCoord4dvARB },
+   { 22073, _gloffset_MultiTexCoord4fvARB },
+   { 23023, _gloffset_MultiTexCoord3fARB },
+   { 25531, _gloffset_MultiTexCoord4dARB },
+   { 25797, _gloffset_MultiTexCoord1sARB },
+   { 26001, _gloffset_MultiTexCoord1dvARB },
+   { 26942, _gloffset_MultiTexCoord1ivARB },
+   { 27035, _gloffset_MultiTexCoord2ivARB },
+   { 27374, _gloffset_MultiTexCoord1iARB },
+   { 28738, _gloffset_MultiTexCoord4svARB },
+   { 29312, _gloffset_MultiTexCoord1fARB },
+   { 29575, _gloffset_MultiTexCoord4fARB },
+   { 32039, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 
@@ -5227,7 +5329,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[] = {
-   {  8811, -1 }, /* TbufferMask3DFX */
+   {  9243, -1 }, /* TbufferMask3DFX */
    {    -1, -1 }
 };
 #endif
@@ -5298,7 +5400,7 @@ static const struct gl_function_remap GL_ARB_framebuffer_object_functions[] = {
 #if defined(need_GL_ARB_geometry_shader4)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_ARB_geometry_shader4_functions[] = {
-   { 11858, -1 }, /* FramebufferTextureLayer */
+   { 12399, -1 }, /* FramebufferTextureLayer */
    {    -1, -1 }
 };
 #endif
@@ -5312,11 +5414,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[] = {
-   {  3579, -1 }, /* MatrixIndexusvARB */
-   { 12526, -1 }, /* MatrixIndexuivARB */
-   { 13873, -1 }, /* MatrixIndexPointerARB */
-   { 18958, -1 }, /* CurrentPaletteMatrixARB */
-   { 21949, -1 }, /* MatrixIndexubvARB */
+   {  3773, -1 }, /* MatrixIndexusvARB */
+   { 13087, -1 }, /* MatrixIndexuivARB */
+   { 14475, -1 }, /* MatrixIndexPointerARB */
+   { 19735, -1 }, /* CurrentPaletteMatrixARB */
+   { 22767, -1 }, /* MatrixIndexubvARB */
    {    -1, -1 }
 };
 #endif
@@ -5393,16 +5495,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[] = {
-   {  2309, -1 }, /* WeightubvARB */
-   {  6149, -1 }, /* WeightivARB */
-   { 10562, -1 }, /* WeightPointerARB */
-   { 13252, -1 }, /* WeightfvARB */
-   { 16939, -1 }, /* WeightbvARB */
-   { 20171, -1 }, /* WeightusvARB */
-   { 23001, -1 }, /* VertexBlendARB */
-   { 28363, -1 }, /* WeightsvARB */
-   { 30424, -1 }, /* WeightdvARB */
-   { 31148, -1 }, /* WeightuivARB */
+   {  2396, -1 }, /* WeightubvARB */
+   {  6567, -1 }, /* WeightivARB */
+   { 11070, -1 }, /* WeightPointerARB */
+   { 13854, -1 }, /* WeightfvARB */
+   { 17564, -1 }, /* WeightbvARB */
+   { 20965, -1 }, /* WeightusvARB */
+   { 23864, -1 }, /* VertexBlendARB */
+   { 29396, -1 }, /* WeightsvARB */
+   { 31496, -1 }, /* WeightdvARB */
+   { 32239, -1 }, /* WeightuivARB */
    {    -1, -1 }
 };
 #endif
@@ -5472,7 +5574,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[] = {
-   {  2549, _gloffset_BlendColor },
+   {  2655, _gloffset_BlendColor },
    {    -1, -1 }
 };
 #endif
@@ -5493,15 +5595,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[] = {
-   { 10697, _gloffset_BlendEquation },
+   { 11205, _gloffset_BlendEquation },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_color_subtable)
 static const struct gl_function_remap GL_EXT_color_subtable_functions[] = {
-   { 16336, _gloffset_ColorSubTable },
-   { 30374, _gloffset_CopyColorSubTable },
+   { 16988, _gloffset_ColorSubTable },
+   { 31446, _gloffset_CopyColorSubTable },
    {    -1, -1 }
 };
 #endif
@@ -5515,66 +5617,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[] = {
-   {   239, _gloffset_ConvolutionFilter1D },
-   {  2367, _gloffset_CopyConvolutionFilter1D },
-   {  3864, _gloffset_GetConvolutionParameteriv },
-   {  8105, _gloffset_ConvolutionFilter2D },
-   {  8293, _gloffset_ConvolutionParameteriv },
-   {  8753, _gloffset_ConvolutionParameterfv },
-   { 19707, _gloffset_GetSeparableFilter },
-   { 23075, _gloffset_SeparableFilter2D },
-   { 23916, _gloffset_ConvolutionParameteri },
-   { 24039, _gloffset_ConvolutionParameterf },
-   { 25610, _gloffset_GetConvolutionParameterfv },
-   { 26432, _gloffset_GetConvolutionFilter },
-   { 28777, _gloffset_CopyConvolutionFilter2D },
+   {   257, _gloffset_ConvolutionFilter1D },
+   {  2454, _gloffset_CopyConvolutionFilter1D },
+   {  4058, _gloffset_GetConvolutionParameteriv },
+   {  8523, _gloffset_ConvolutionFilter2D },
+   {  8725, _gloffset_ConvolutionParameteriv },
+   {  9185, _gloffset_ConvolutionParameterfv },
+   { 20501, _gloffset_GetSeparableFilter },
+   { 23938, _gloffset_SeparableFilter2D },
+   { 24801, _gloffset_ConvolutionParameteri },
+   { 24924, _gloffset_ConvolutionParameterf },
+   { 26595, _gloffset_GetConvolutionParameterfv },
+   { 27417, _gloffset_GetConvolutionFilter },
+   { 29810, _gloffset_CopyConvolutionFilter2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_coordinate_frame)
 static const struct gl_function_remap GL_EXT_coordinate_frame_functions[] = {
-   { 10017, -1 }, /* TangentPointerEXT */
-   { 12013, -1 }, /* Binormal3ivEXT */
-   { 12658, -1 }, /* Tangent3sEXT */
-   { 13938, -1 }, /* Tangent3fvEXT */
-   { 17929, -1 }, /* Tangent3dvEXT */
-   { 18656, -1 }, /* Binormal3bvEXT */
-   { 19760, -1 }, /* Binormal3dEXT */
-   { 21881, -1 }, /* Tangent3fEXT */
-   { 23988, -1 }, /* Binormal3sEXT */
-   { 24433, -1 }, /* Tangent3ivEXT */
-   { 24452, -1 }, /* Tangent3dEXT */
-   { 25347, -1 }, /* Binormal3svEXT */
-   { 25855, -1 }, /* Binormal3fEXT */
-   { 26729, -1 }, /* Binormal3dvEXT */
-   { 27983, -1 }, /* Tangent3iEXT */
-   { 29062, -1 }, /* Tangent3bvEXT */
-   { 29583, -1 }, /* Tangent3bEXT */
-   { 30147, -1 }, /* Binormal3fvEXT */
-   { 30847, -1 }, /* BinormalPointerEXT */
-   { 31252, -1 }, /* Tangent3svEXT */
-   { 31689, -1 }, /* Binormal3bEXT */
-   { 31866, -1 }, /* Binormal3iEXT */
+   { 10493, -1 }, /* TangentPointerEXT */
+   { 12554, -1 }, /* Binormal3ivEXT */
+   { 13219, -1 }, /* Tangent3sEXT */
+   { 14540, -1 }, /* Tangent3fvEXT */
+   { 18695, -1 }, /* Tangent3dvEXT */
+   { 19433, -1 }, /* Binormal3bvEXT */
+   { 20554, -1 }, /* Binormal3dEXT */
+   { 22699, -1 }, /* Tangent3fEXT */
+   { 24873, -1 }, /* Binormal3sEXT */
+   { 25341, -1 }, /* Tangent3ivEXT */
+   { 25360, -1 }, /* Tangent3dEXT */
+   { 26274, -1 }, /* Binormal3svEXT */
+   { 26840, -1 }, /* Binormal3fEXT */
+   { 27728, -1 }, /* Binormal3dvEXT */
+   { 28995, -1 }, /* Tangent3iEXT */
+   { 30095, -1 }, /* Tangent3bvEXT */
+   { 30655, -1 }, /* Tangent3bEXT */
+   { 31219, -1 }, /* Binormal3fvEXT */
+   { 31938, -1 }, /* BinormalPointerEXT */
+   { 32343, -1 }, /* Tangent3svEXT */
+   { 32780, -1 }, /* Binormal3bEXT */
+   { 32957, -1 }, /* Binormal3iEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_copy_texture)
 static const struct gl_function_remap GL_EXT_copy_texture_functions[] = {
-   { 14431, _gloffset_CopyTexSubImage3D },
-   { 16047, _gloffset_CopyTexImage2D },
-   { 23524, _gloffset_CopyTexImage1D },
-   { 26113, _gloffset_CopyTexSubImage2D },
-   { 28415, _gloffset_CopyTexSubImage1D },
+   { 15065, _gloffset_CopyTexSubImage3D },
+   { 16675, _gloffset_CopyTexImage2D },
+   { 24409, _gloffset_CopyTexImage1D },
+   { 27098, _gloffset_CopyTexSubImage2D },
+   { 29448, _gloffset_CopyTexSubImage1D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_cull_vertex)
 static const struct gl_function_remap GL_EXT_cull_vertex_functions[] = {
-   {  8442, -1 }, /* CullParameterdvEXT */
-   { 11165, -1 }, /* CullParameterfvEXT */
+   {  8874, -1 }, /* CullParameterdvEXT */
+   { 11693, -1 }, /* CullParameterfvEXT */
    {    -1, -1 }
 };
 #endif
@@ -5602,7 +5704,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[] = {
-   {  9090, _gloffset_DrawRangeElements },
+   {  9522, _gloffset_DrawRangeElements },
    {    -1, -1 }
 };
 #endif
@@ -5651,39 +5753,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[] = {
-   {   838, _gloffset_Histogram },
-   {  3328, _gloffset_ResetHistogram },
-   {  9519, _gloffset_GetMinmax },
-   { 14765, _gloffset_GetHistogramParameterfv },
-   { 23449, _gloffset_GetMinmaxParameteriv },
-   { 25500, _gloffset_ResetMinmax },
-   { 26329, _gloffset_GetHistogramParameteriv },
-   { 27464, _gloffset_GetHistogram },
-   { 29960, _gloffset_Minmax },
-   { 31487, _gloffset_GetMinmaxParameterfv },
+   {   856, _gloffset_Histogram },
+   {  3522, _gloffset_ResetHistogram },
+   {  9972, _gloffset_GetMinmax },
+   { 15399, _gloffset_GetHistogramParameterfv },
+   { 24334, _gloffset_GetMinmaxParameteriv },
+   { 26485, _gloffset_ResetMinmax },
+   { 27314, _gloffset_GetHistogramParameteriv },
+   { 28463, _gloffset_GetHistogram },
+   { 31032, _gloffset_Minmax },
+   { 32578, _gloffset_GetMinmaxParameterfv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_func)
 static const struct gl_function_remap GL_EXT_index_func_functions[] = {
-   { 10951, -1 }, /* IndexFuncEXT */
+   { 11479, -1 }, /* IndexFuncEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_material)
 static const struct gl_function_remap GL_EXT_index_material_functions[] = {
-   { 20258, -1 }, /* IndexMaterialEXT */
+   { 21052, -1 }, /* IndexMaterialEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_light_texture)
 static const struct gl_function_remap GL_EXT_light_texture_functions[] = {
-   { 25367, -1 }, /* ApplyTextureEXT */
-   { 25454, -1 }, /* TextureMaterialEXT */
-   { 25479, -1 }, /* TextureLightEXT */
+   { 26294, -1 }, /* ApplyTextureEXT */
+   { 26439, -1 }, /* TextureMaterialEXT */
+   { 26464, -1 }, /* TextureLightEXT */
    {    -1, -1 }
 };
 #endif
@@ -5704,20 +5806,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[] = {
-   {  7967, _gloffset_ColorTable },
-   { 14611, _gloffset_GetColorTable },
-   { 22064, _gloffset_GetColorTableParameterfv },
-   { 24095, _gloffset_GetColorTableParameteriv },
+   {  8385, _gloffset_ColorTable },
+   { 15245, _gloffset_GetColorTable },
+   { 22882, _gloffset_GetColorTableParameterfv },
+   { 24980, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_pixel_transform)
 static const struct gl_function_remap GL_EXT_pixel_transform_functions[] = {
-   { 20909, -1 }, /* PixelTransformParameterfEXT */
-   { 20989, -1 }, /* PixelTransformParameteriEXT */
-   { 29298, -1 }, /* PixelTransformParameterfvEXT */
-   { 30811, -1 }, /* PixelTransformParameterivEXT */
+   { 21682, -1 }, /* PixelTransformParameterfEXT */
+   { 21762, -1 }, /* PixelTransformParameteriEXT */
+   { 30370, -1 }, /* PixelTransformParameterfvEXT */
+   { 31902, -1 }, /* PixelTransformParameterivEXT */
    {    -1, -1 }
 };
 #endif
@@ -5766,16 +5868,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[] = {
-   {  6688, _gloffset_TexSubImage1D },
-   { 10157, _gloffset_TexSubImage2D },
+   {  7106, _gloffset_TexSubImage1D },
+   { 10649, _gloffset_TexSubImage2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_texture3D)
 static const struct gl_function_remap GL_EXT_texture3D_functions[] = {
-   {  1710, _gloffset_TexImage3D },
-   { 21833, _gloffset_TexSubImage3D },
+   {  1774, _gloffset_TexImage3D },
+   { 22651, _gloffset_TexSubImage3D },
    {    -1, -1 }
 };
 #endif
@@ -5796,19 +5898,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[] = {
-   {  3128, _gloffset_PrioritizeTextures },
-   {  7137, _gloffset_AreTexturesResident },
-   { 12960, _gloffset_GenTextures },
-   { 15097, _gloffset_DeleteTextures },
-   { 18709, _gloffset_IsTexture },
-   { 28480, _gloffset_BindTexture },
+   {  3290, _gloffset_PrioritizeTextures },
+   {  7555, _gloffset_AreTexturesResident },
+   { 13562, _gloffset_GenTextures },
+   { 15731, _gloffset_DeleteTextures },
+   { 19486, _gloffset_IsTexture },
+   { 29513, _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[] = {
-   { 13202, -1 }, /* TextureNormalEXT */
+   { 13804, -1 }, /* TextureNormalEXT */
    {    -1, -1 }
 };
 #endif
@@ -5830,30 +5932,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[] = {
-   { 23247, _gloffset_ArrayElement },
-   { 29548, _gloffset_GetPointerv },
-   { 31114, _gloffset_DrawArrays },
+   { 24110, _gloffset_ArrayElement },
+   { 30620, _gloffset_GetPointerv },
+   { 32205, _gloffset_DrawArrays },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_vertex_weighting)
 static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
-   { 18739, -1 }, /* VertexWeightfvEXT */
-   { 25833, -1 }, /* VertexWeightfEXT */
-   { 27433, -1 }, /* VertexWeightPointerEXT */
+   { 19516, -1 }, /* VertexWeightfvEXT */
+   { 26818, -1 }, /* VertexWeightfEXT */
+   { 28432, -1 }, /* VertexWeightPointerEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_HP_image_transform)
 static const struct gl_function_remap GL_HP_image_transform_functions[] = {
-   {  2240, -1 }, /* GetImageTransformParameterfvHP */
-   {  3545, -1 }, /* ImageTransformParameterfHP */
-   {  9711, -1 }, /* ImageTransformParameterfvHP */
-   { 11420, -1 }, /* ImageTransformParameteriHP */
-   { 11748, -1 }, /* GetImageTransformParameterivHP */
-   { 18803, -1 }, /* ImageTransformParameterivHP */
+   {  2327, -1 }, /* GetImageTransformParameterfvHP */
+   {  3739, -1 }, /* ImageTransformParameterfHP */
+   { 10187, -1 }, /* ImageTransformParameterfvHP */
+   { 11948, -1 }, /* ImageTransformParameteriHP */
+   { 12289, -1 }, /* GetImageTransformParameterivHP */
+   { 19580, -1 }, /* ImageTransformParameterivHP */
    {    -1, -1 }
 };
 #endif
@@ -5867,14 +5969,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[] = {
-   {  4149, -1 }, /* SecondaryColorPointerListIBM */
-   {  5655, -1 }, /* NormalPointerListIBM */
-   {  7311, -1 }, /* FogCoordPointerListIBM */
-   {  7618, -1 }, /* VertexPointerListIBM */
-   { 11341, -1 }, /* ColorPointerListIBM */
-   { 12765, -1 }, /* TexCoordPointerListIBM */
-   { 13224, -1 }, /* IndexPointerListIBM */
-   { 31430, -1 }, /* EdgeFlagPointerListIBM */
+   {  4379, -1 }, /* SecondaryColorPointerListIBM */
+   {  6021, -1 }, /* NormalPointerListIBM */
+   {  7729, -1 }, /* FogCoordPointerListIBM */
+   {  8036, -1 }, /* VertexPointerListIBM */
+   { 11869, -1 }, /* ColorPointerListIBM */
+   { 13326, -1 }, /* TexCoordPointerListIBM */
+   { 13826, -1 }, /* IndexPointerListIBM */
+   { 32521, -1 }, /* EdgeFlagPointerListIBM */
    {    -1, -1 }
 };
 #endif
@@ -5888,10 +5990,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[] = {
-   { 12125, -1 }, /* VertexPointervINTEL */
-   { 14858, -1 }, /* ColorPointervINTEL */
-   { 28751, -1 }, /* NormalPointervINTEL */
-   { 29230, -1 }, /* TexCoordPointervINTEL */
+   { 12666, -1 }, /* VertexPointervINTEL */
+   { 15492, -1 }, /* ColorPointervINTEL */
+   { 29784, -1 }, /* NormalPointervINTEL */
+   { 30302, -1 }, /* TexCoordPointervINTEL */
    {    -1, -1 }
 };
 #endif
@@ -5905,10 +6007,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[] = {
-   {  1574, -1 }, /* GetDebugLogLengthMESA */
-   {  3280, -1 }, /* ClearDebugLogMESA */
-   {  4310, -1 }, /* GetDebugLogMESA */
-   { 29741, -1 }, /* CreateDebugObjectMESA */
+   {  1638, -1 }, /* GetDebugLogLengthMESA */
+   {  3461, -1 }, /* ClearDebugLogMESA */
+   {  4540, -1 }, /* GetDebugLogMESA */
+   { 30813, -1 }, /* CreateDebugObjectMESA */
    {    -1, -1 }
 };
 #endif
@@ -5929,15 +6031,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[] = {
-   {  6350, -1 }, /* GetMapAttribParameterivNV */
-   {  8073, -1 }, /* MapControlPointsNV */
-   {  8172, -1 }, /* MapParameterfvNV */
-   { 10140, -1 }, /* EvalMapsNV */
-   { 16558, -1 }, /* GetMapAttribParameterfvNV */
-   { 16775, -1 }, /* MapParameterivNV */
-   { 23839, -1 }, /* GetMapParameterivNV */
-   { 24337, -1 }, /* GetMapParameterfvNV */
-   { 28087, -1 }, /* GetMapControlPointsNV */
+   {  6768, -1 }, /* GetMapAttribParameterivNV */
+   {  8491, -1 }, /* MapControlPointsNV */
+   {  8590, -1 }, /* MapParameterfvNV */
+   { 10632, -1 }, /* EvalMapsNV */
+   { 17162, -1 }, /* GetMapAttribParameterfvNV */
+   { 17379, -1 }, /* MapParameterivNV */
+   { 24724, -1 }, /* GetMapParameterivNV */
+   { 25222, -1 }, /* GetMapParameterfvNV */
+   { 29099, -1 }, /* GetMapControlPointsNV */
    {    -1, -1 }
 };
 #endif
@@ -5979,8 +6081,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[] = {
-   { 15328, -1 }, /* CombinerStageParameterfvNV */
-   { 15672, -1 }, /* GetCombinerStageParameterfvNV */
+   { 15884, -1 }, /* CombinerStageParameterfvNV */
+   { 16280, -1 }, /* GetCombinerStageParameterfvNV */
    {    -1, -1 }
 };
 #endif
@@ -6008,23 +6110,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[] = {
-   {  8279, -1 }, /* HintPGI */
+   {  8711, -1 }, /* HintPGI */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_detail_texture)
 static const struct gl_function_remap GL_SGIS_detail_texture_functions[] = {
-   { 15645, -1 }, /* GetDetailTexFuncSGIS */
-   { 15992, -1 }, /* DetailTexFuncSGIS */
+   { 16253, -1 }, /* GetDetailTexFuncSGIS */
+   { 16620, -1 }, /* DetailTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_fog_function)
 static const struct gl_function_remap GL_SGIS_fog_function_functions[] = {
-   { 26095, -1 }, /* FogFuncSGIS */
-   { 26782, -1 }, /* GetFogFuncSGIS */
+   { 27080, -1 }, /* FogFuncSGIS */
+   { 27781, -1 }, /* GetFogFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -6052,112 +6154,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[] = {
-   {  6411, -1 }, /* GetSharpenTexFuncSGIS */
-   { 21255, -1 }, /* SharpenTexFuncSGIS */
+   {  6829, -1 }, /* GetSharpenTexFuncSGIS */
+   { 22047, -1 }, /* SharpenTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture4D)
 static const struct gl_function_remap GL_SGIS_texture4D_functions[] = {
-   {   946, -1 }, /* TexImage4DSGIS */
-   { 15166, -1 }, /* TexSubImage4DSGIS */
+   {  1010, -1 }, /* TexImage4DSGIS */
+   { 15800, -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[] = {
-   { 14564, -1 }, /* TextureColorMaskSGIS */
+   { 15198, -1 }, /* TextureColorMaskSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_filter4)
 static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {
-   {  6588, -1 }, /* GetTexFilterFuncSGIS */
-   { 15791, -1 }, /* TexFilterFuncSGIS */
+   {  7006, -1 }, /* GetTexFilterFuncSGIS */
+   { 16399, -1 }, /* TexFilterFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_async)
 static const struct gl_function_remap GL_SGIX_async_functions[] = {
-   {  3206, -1 }, /* AsyncMarkerSGIX */
-   {  4289, -1 }, /* FinishAsyncSGIX */
-   {  5135, -1 }, /* PollAsyncSGIX */
-   { 21423, -1 }, /* DeleteAsyncMarkersSGIX */
-   { 21478, -1 }, /* IsAsyncMarkerSGIX */
-   { 31227, -1 }, /* GenAsyncMarkersSGIX */
+   {  3387, -1 }, /* AsyncMarkerSGIX */
+   {  4519, -1 }, /* FinishAsyncSGIX */
+   {  5466, -1 }, /* PollAsyncSGIX */
+   { 22228, -1 }, /* DeleteAsyncMarkersSGIX */
+   { 22283, -1 }, /* IsAsyncMarkerSGIX */
+   { 32318, -1 }, /* GenAsyncMarkersSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_flush_raster)
 static const struct gl_function_remap GL_SGIX_flush_raster_functions[] = {
-   {  6965, -1 }, /* FlushRasterSGIX */
+   {  7383, -1 }, /* FlushRasterSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_fragment_lighting)
 static const struct gl_function_remap GL_SGIX_fragment_lighting_functions[] = {
-   {  2519, -1 }, /* FragmentMaterialfvSGIX */
-   {  5059, -1 }, /* FragmentLightiSGIX */
-   {  6091, -1 }, /* GetFragmentMaterialfvSGIX */
-   {  7685, -1 }, /* FragmentMaterialfSGIX */
-   {  7846, -1 }, /* GetFragmentLightivSGIX */
-   {  8705, -1 }, /* FragmentLightModeliSGIX */
-   { 10203, -1 }, /* FragmentLightivSGIX */
-   { 10505, -1 }, /* GetFragmentMaterialivSGIX */
-   { 18626, -1 }, /* FragmentLightModelfSGIX */
-   { 18926, -1 }, /* FragmentColorMaterialSGIX */
-   { 19326, -1 }, /* FragmentMaterialiSGIX */
-   { 20586, -1 }, /* LightEnviSGIX */
-   { 22156, -1 }, /* FragmentLightModelfvSGIX */
-   { 22465, -1 }, /* FragmentLightfvSGIX */
-   { 27166, -1 }, /* FragmentLightModelivSGIX */
-   { 27315, -1 }, /* FragmentLightfSGIX */
-   { 30117, -1 }, /* GetFragmentLightfvSGIX */
-   { 31710, -1 }, /* FragmentMaterialivSGIX */
+   {  2625, -1 }, /* FragmentMaterialfvSGIX */
+   {  5370, -1 }, /* FragmentLightiSGIX */
+   {  8103, -1 }, /* FragmentMaterialfSGIX */
+   {  8264, -1 }, /* GetFragmentLightivSGIX */
+   {  9137, -1 }, /* FragmentLightModeliSGIX */
+   { 10695, -1 }, /* FragmentLightivSGIX */
+   { 11013, -1 }, /* GetFragmentMaterialivSGIX */
+   { 16193, -1 }, /* GetFragmentMaterialfvSGIX */
+   { 19403, -1 }, /* FragmentLightModelfSGIX */
+   { 19703, -1 }, /* FragmentColorMaterialSGIX */
+   { 20120, -1 }, /* FragmentMaterialiSGIX */
+   { 21380, -1 }, /* LightEnviSGIX */
+   { 22974, -1 }, /* FragmentLightModelfvSGIX */
+   { 23309, -1 }, /* FragmentLightfvSGIX */
+   { 28165, -1 }, /* FragmentLightModelivSGIX */
+   { 28314, -1 }, /* FragmentLightfSGIX */
+   { 31189, -1 }, /* GetFragmentLightfvSGIX */
+   { 32801, -1 }, /* FragmentMaterialivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_framezoom)
 static const struct gl_function_remap GL_SGIX_framezoom_functions[] = {
-   { 21501, -1 }, /* FrameZoomSGIX */
+   { 22306, -1 }, /* FrameZoomSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_igloo_interface)
 static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
-   { 27623, -1 }, /* IglooInterfaceSGIX */
+   { 28622, -1 }, /* IglooInterfaceSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_instruments)
 static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
-   {  2682, -1 }, /* ReadInstrumentsSGIX */
-   {  6167, -1 }, /* PollInstrumentsSGIX */
-   { 10077, -1 }, /* GetInstrumentsSGIX */
-   { 12363, -1 }, /* StartInstrumentsSGIX */
-   { 15362, -1 }, /* StopInstrumentsSGIX */
-   { 17152, -1 }, /* InstrumentsBufferSGIX */
+   {  2805, -1 }, /* ReadInstrumentsSGIX */
+   {  6585, -1 }, /* PollInstrumentsSGIX */
+   { 10553, -1 }, /* GetInstrumentsSGIX */
+   { 12924, -1 }, /* StartInstrumentsSGIX */
+   { 15918, -1 }, /* StopInstrumentsSGIX */
+   { 17777, -1 }, /* InstrumentsBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_list_priority)
 static const struct gl_function_remap GL_SGIX_list_priority_functions[] = {
-   {  1177, -1 }, /* ListParameterfSGIX */
-   {  2927, -1 }, /* GetListParameterfvSGIX */
-   { 17067, -1 }, /* ListParameteriSGIX */
-   { 17879, -1 }, /* ListParameterfvSGIX */
-   { 19992, -1 }, /* ListParameterivSGIX */
-   { 31271, -1 }, /* GetListParameterivSGIX */
+   {  1241, -1 }, /* ListParameterfSGIX */
+   {  3089, -1 }, /* GetListParameterfvSGIX */
+   { 17692, -1 }, /* ListParameteriSGIX */
+   { 18645, -1 }, /* ListParameterfvSGIX */
+   { 20786, -1 }, /* ListParameterivSGIX */
+   { 32362, -1 }, /* GetListParameterivSGIX */
    {    -1, -1 }
 };
 #endif
@@ -6171,134 +6273,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[] = {
-   {  3491, -1 }, /* LoadIdentityDeformationMapSGIX */
-   { 15462, -1 }, /* DeformSGIX */
-   { 23359, -1 }, /* DeformationMap3fSGIX */
-   { 30005, -1 }, /* DeformationMap3dSGIX */
+   {  3685, -1 }, /* LoadIdentityDeformationMapSGIX */
+   { 16018, -1 }, /* DeformSGIX */
+   { 24222, -1 }, /* DeformationMap3fSGIX */
+   { 31077, -1 }, /* DeformationMap3dSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_reference_plane)
 static const struct gl_function_remap GL_SGIX_reference_plane_functions[] = {
-   { 14115, -1 }, /* ReferencePlaneSGIX */
+   { 14749, -1 }, /* ReferencePlaneSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_sprite)
 static const struct gl_function_remap GL_SGIX_sprite_functions[] = {
-   {  9203, -1 }, /* SpriteParameterfvSGIX */
-   { 19781, -1 }, /* SpriteParameteriSGIX */
-   { 25534, -1 }, /* SpriteParameterfSGIX */
-   { 28209, -1 }, /* SpriteParameterivSGIX */
+   {  9635, -1 }, /* SpriteParameterfvSGIX */
+   { 20575, -1 }, /* SpriteParameteriSGIX */
+   { 26519, -1 }, /* SpriteParameterfSGIX */
+   { 29242, -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[] = {
-   { 19840, -1 }, /* TagSampleBufferSGIX */
+   { 20634, -1 }, /* TagSampleBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGI_color_table)
 static const struct gl_function_remap GL_SGI_color_table_functions[] = {
-   {  7255, _gloffset_ColorTableParameteriv },
-   {  7967, _gloffset_ColorTable },
-   { 14611, _gloffset_GetColorTable },
-   { 14721, _gloffset_CopyColorTable },
-   { 18570, _gloffset_ColorTableParameterfv },
-   { 22064, _gloffset_GetColorTableParameterfv },
-   { 24095, _gloffset_GetColorTableParameteriv },
+   {  7673, _gloffset_ColorTableParameteriv },
+   {  8385, _gloffset_ColorTable },
+   { 15245, _gloffset_GetColorTable },
+   { 15355, _gloffset_CopyColorTable },
+   { 19347, _gloffset_ColorTableParameterfv },
+   { 22882, _gloffset_GetColorTableParameterfv },
+   { 24980, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUNX_constant_data)
 static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
-   { 30095, -1 }, /* FinishTextureSUNX */
+   { 31167, -1 }, /* FinishTextureSUNX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_global_alpha)
 static const struct gl_function_remap GL_SUN_global_alpha_functions[] = {
-   {  3227, -1 }, /* GlobalAlphaFactorubSUN */
-   {  4543, -1 }, /* GlobalAlphaFactoriSUN */
-   {  6192, -1 }, /* GlobalAlphaFactordSUN */
-   {  9287, -1 }, /* GlobalAlphaFactoruiSUN */
-   {  9668, -1 }, /* GlobalAlphaFactorbSUN */
-   { 12678, -1 }, /* GlobalAlphaFactorfSUN */
-   { 12823, -1 }, /* GlobalAlphaFactorusSUN */
-   { 21764, -1 }, /* GlobalAlphaFactorsSUN */
+   {  3408, -1 }, /* GlobalAlphaFactorubSUN */
+   {  4818, -1 }, /* GlobalAlphaFactoriSUN */
+   {  6610, -1 }, /* GlobalAlphaFactordSUN */
+   {  9719, -1 }, /* GlobalAlphaFactoruiSUN */
+   { 10144, -1 }, /* GlobalAlphaFactorbSUN */
+   { 13239, -1 }, /* GlobalAlphaFactorfSUN */
+   { 13403, -1 }, /* GlobalAlphaFactorusSUN */
+   { 22569, -1 }, /* GlobalAlphaFactorsSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_mesh_array)
 static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
-   { 28021, -1 }, /* DrawMeshArraysSUN */
+   { 29033, -1 }, /* DrawMeshArraysSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_triangle_list)
 static const struct gl_function_remap GL_SUN_triangle_list_functions[] = {
-   {  4263, -1 }, /* ReplacementCodeubSUN */
-   {  6003, -1 }, /* ReplacementCodeubvSUN */
-   { 18291, -1 }, /* ReplacementCodeusvSUN */
-   { 18479, -1 }, /* ReplacementCodePointerSUN */
-   { 20650, -1 }, /* ReplacementCodeuiSUN */
-   { 21452, -1 }, /* ReplacementCodeusSUN */
-   { 28666, -1 }, /* ReplacementCodeuivSUN */
+   {  4493, -1 }, /* ReplacementCodeubSUN */
+   {  6369, -1 }, /* ReplacementCodeubvSUN */
+   { 19068, -1 }, /* ReplacementCodeusvSUN */
+   { 19256, -1 }, /* ReplacementCodePointerSUN */
+   { 21444, -1 }, /* ReplacementCodeuiSUN */
+   { 22257, -1 }, /* ReplacementCodeusSUN */
+   { 29699, -1 }, /* ReplacementCodeuivSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_vertex)
 static const struct gl_function_remap GL_SUN_vertex_functions[] = {
-   {  1051, -1 }, /* ReplacementCodeuiColor3fVertex3fvSUN */
-   {  1249, -1 }, /* TexCoord4fColor4fNormal3fVertex4fvSUN */
-   {  1475, -1 }, /* TexCoord2fColor4ubVertex3fvSUN */
-   {  1782, -1 }, /* ReplacementCodeuiVertex3fvSUN */
-   {  1916, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fvSUN */
-   {  2455, -1 }, /* ReplacementCodeuiNormal3fVertex3fSUN */
-   {  2751, -1 }, /* Color4ubVertex3fvSUN */
-   {  4397, -1 }, /* Color4ubVertex3fSUN */
-   {  4500, -1 }, /* TexCoord2fVertex3fSUN */
-   {  4827, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
-   {  5239, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
-   {  5898, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
-   {  6643, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
-   {  7002, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
-   {  7714, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
-   {  8504, -1 }, /* Color3fVertex3fSUN */
-   {  9627, -1 }, /* Color3fVertex3fvSUN */
-   { 10042, -1 }, /* Color4fNormal3fVertex3fvSUN */
-   { 10830, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 12226, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
-   { 13796, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
-   { 14257, -1 }, /* TexCoord2fColor3fVertex3fSUN */
-   { 15387, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
-   { 15750, -1 }, /* Color4ubVertex2fvSUN */
-   { 16017, -1 }, /* Normal3fVertex3fSUN */
-   { 17093, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
-   { 17354, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 18120, -1 }, /* TexCoord2fVertex3fvSUN */
-   { 18896, -1 }, /* Color4ubVertex2fSUN */
-   { 19117, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
-   { 21101, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
-   { 21520, -1 }, /* Normal3fVertex3fvSUN */
-   { 21973, -1 }, /* Color4fNormal3fVertex3fSUN */
-   { 22908, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
-   { 24932, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
-   { 26211, -1 }, /* TexCoord4fVertex4fSUN */
-   { 26637, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
-   { 27010, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
-   { 27137, -1 }, /* TexCoord4fVertex4fvSUN */
-   { 27871, -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 */
+   {  7061, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
+   {  7420, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
+   {  8132, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
+   {  8936, -1 }, /* Color3fVertex3fSUN */
+   { 10080, -1 }, /* Color3fVertex3fvSUN */
+   { 10518, -1 }, /* Color4fNormal3fVertex3fvSUN */
+   { 11358, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 12787, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
+   { 14398, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
+   { 14891, -1 }, /* TexCoord2fColor3fVertex3fSUN */
+   { 15943, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
+   { 16358, -1 }, /* Color4ubVertex2fvSUN */
+   { 16645, -1 }, /* Normal3fVertex3fSUN */
+   { 17718, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
+   { 18079, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 18897, -1 }, /* TexCoord2fVertex3fvSUN */
+   { 19673, -1 }, /* Color4ubVertex2fSUN */
+   { 19911, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
+   { 21893, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
+   { 22325, -1 }, /* Normal3fVertex3fvSUN */
+   { 22791, -1 }, /* Color4fNormal3fVertex3fSUN */
+   { 23771, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
+   { 25840, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
+   { 27196, -1 }, /* TexCoord4fVertex4fSUN */
+   { 27622, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
+   { 28009, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
+   { 28136, -1 }, /* TexCoord4fVertex4fvSUN */
+   { 28870, -1 }, /* ReplacementCodeuiVertex3fSUN */
    {    -1, -1 }
 };
 #endif
@@ -6306,40 +6408,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[] = {
-   {   407, _gloffset_MultiTexCoord3sARB },
-   {   639, _gloffset_ActiveTextureARB },
-   {  4031, _gloffset_MultiTexCoord1fvARB },
-   {  5789, _gloffset_MultiTexCoord3dARB },
-   {  5834, _gloffset_MultiTexCoord2iARB },
-   {  5958, _gloffset_MultiTexCoord2svARB },
-   {  7923, _gloffset_MultiTexCoord2fARB },
-   {  9878, _gloffset_MultiTexCoord3fvARB },
-   { 10459, _gloffset_MultiTexCoord4sARB },
-   { 11120, _gloffset_MultiTexCoord2dvARB },
-   { 11522, _gloffset_MultiTexCoord1svARB },
-   { 11894, _gloffset_MultiTexCoord3svARB },
-   { 11955, _gloffset_MultiTexCoord4iARB },
-   { 12705, _gloffset_MultiTexCoord3iARB },
-   { 13534, _gloffset_MultiTexCoord1dARB },
-   { 13751, _gloffset_MultiTexCoord3dvARB },
-   { 14965, _gloffset_MultiTexCoord3ivARB },
-   { 15010, _gloffset_MultiTexCoord2sARB },
-   { 16393, _gloffset_MultiTexCoord4ivARB },
-   { 18220, _gloffset_ClientActiveTextureARB },
-   { 20503, _gloffset_MultiTexCoord2dARB },
-   { 20944, _gloffset_MultiTexCoord4dvARB },
-   { 21281, _gloffset_MultiTexCoord4fvARB },
-   { 22205, _gloffset_MultiTexCoord3fARB },
-   { 24623, _gloffset_MultiTexCoord4dARB },
-   { 24889, _gloffset_MultiTexCoord1sARB },
-   { 25093, _gloffset_MultiTexCoord1dvARB },
-   { 25957, _gloffset_MultiTexCoord1ivARB },
-   { 26050, _gloffset_MultiTexCoord2ivARB },
-   { 26389, _gloffset_MultiTexCoord1iARB },
-   { 27739, _gloffset_MultiTexCoord4svARB },
-   { 28279, _gloffset_MultiTexCoord1fARB },
-   { 28542, _gloffset_MultiTexCoord4fARB },
-   { 30948, _gloffset_MultiTexCoord2fvARB },
+   {   425, _gloffset_MultiTexCoord3sARB },
+   {   657, _gloffset_ActiveTextureARB },
+   {  4247, _gloffset_MultiTexCoord1fvARB },
+   {  6155, _gloffset_MultiTexCoord3dARB },
+   {  6200, _gloffset_MultiTexCoord2iARB },
+   {  6324, _gloffset_MultiTexCoord2svARB },
+   {  8341, _gloffset_MultiTexCoord2fARB },
+   { 10354, _gloffset_MultiTexCoord3fvARB },
+   { 10967, _gloffset_MultiTexCoord4sARB },
+   { 11648, _gloffset_MultiTexCoord2dvARB },
+   { 12063, _gloffset_MultiTexCoord1svARB },
+   { 12435, _gloffset_MultiTexCoord3svARB },
+   { 12496, _gloffset_MultiTexCoord4iARB },
+   { 13266, _gloffset_MultiTexCoord3iARB },
+   { 14136, _gloffset_MultiTexCoord1dARB },
+   { 14353, _gloffset_MultiTexCoord3dvARB },
+   { 15599, _gloffset_MultiTexCoord3ivARB },
+   { 15644, _gloffset_MultiTexCoord2sARB },
+   { 17045, _gloffset_MultiTexCoord4ivARB },
+   { 18997, _gloffset_ClientActiveTextureARB },
+   { 21297, _gloffset_MultiTexCoord2dARB },
+   { 21717, _gloffset_MultiTexCoord4dvARB },
+   { 22073, _gloffset_MultiTexCoord4fvARB },
+   { 23023, _gloffset_MultiTexCoord3fARB },
+   { 25531, _gloffset_MultiTexCoord4dARB },
+   { 25797, _gloffset_MultiTexCoord1sARB },
+   { 26001, _gloffset_MultiTexCoord1dvARB },
+   { 26942, _gloffset_MultiTexCoord1ivARB },
+   { 27035, _gloffset_MultiTexCoord2ivARB },
+   { 27374, _gloffset_MultiTexCoord1iARB },
+   { 28738, _gloffset_MultiTexCoord4svARB },
+   { 29312, _gloffset_MultiTexCoord1fARB },
+   { 29575, _gloffset_MultiTexCoord4fARB },
+   { 32039, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 #endif
@@ -6386,3 +6488,17 @@ static const struct gl_function_remap GL_VERSION_3_1_functions[] = {
 };
 #endif
 
+#if defined(need_GL_VERSION_3_2)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_VERSION_3_2_functions[] = {
+   {    -1, -1 }
+};
+#endif
+
+#if defined(need_GL_VERSION_3_3)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_VERSION_3_3_functions[] = {
+   {    -1, -1 }
+};
+#endif
+
author	Brian Paul <[email protected]>	2010-11-21 09:19:23 -0700
committer	Brian Paul <[email protected]>	2010-11-21 09:20:44 -0700
commit	5ed51e950f8b5850cada5aa6289215dbf254c1c7 (patch)
tree	0fe2e8dfe748ac01bb72e1ff1173b286fb55a17a /src/mesa/main/remap_helper.h
parent	81c347ef79bc495eb45ae3e257bc534a6ebbf83d (diff)