Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig mesa xserver git update 9 Mar 2014

Conflicts:
	mesalib/src/mapi/glapi/glapi.h
	xorg-server/hw/kdrive/ephyr/hostx.c

1 files changed, 2013 insertions, 2029 deletions

diff --git a/xorg-server/glx/remap_helper.h b/xorg-server/glx/remap_helper.h
index eac065709..efef7806c 100644
--- a/xorg-server/glx/remap_helper.h
+++ b/xorg-server/glx/remap_helper.h
@@ -457,5529 +457,5517 @@ static const char _mesa_function_pool[] =
    "iiipp\0"
    "glGetActiveUniformName\0"
    "\0"
-   /* _mesa_function_pool[2958]: DebugMessageControlARB (will be remapped) */
-   "iiiipi\0"
-   "glDebugMessageControlARB\0"
-   "\0"
-   /* _mesa_function_pool[2991]: GetnUniformivARB (will be remapped) */
+   /* _mesa_function_pool[2958]: GetnUniformivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[3016]: ReleaseShaderCompiler (will be remapped) */
+   /* _mesa_function_pool[2983]: ReleaseShaderCompiler (will be remapped) */
    "\0"
    "glReleaseShaderCompiler\0"
    "\0"
-   /* _mesa_function_pool[3042]: BlendFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[3009]: BlendFuncSeparate (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "glBlendFuncSeparateOES\0"
    "\0"
-   /* _mesa_function_pool[3138]: Color3us (offset 23) */
+   /* _mesa_function_pool[3105]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[3154]: MultiDrawArraysIndirect (will be remapped) */
+   /* _mesa_function_pool[3121]: MultiDrawArraysIndirect (will be remapped) */
    "ipii\0"
    "glMultiDrawArraysIndirect\0"
    "\0"
-   /* _mesa_function_pool[3186]: BufferStorage (will be remapped) */
+   /* _mesa_function_pool[3153]: BufferStorage (will be remapped) */
    "iipi\0"
    "glBufferStorage\0"
    "\0"
-   /* _mesa_function_pool[3208]: Color3ub (offset 19) */
+   /* _mesa_function_pool[3175]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[3224]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[3191]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[3247]: Color3ui (offset 21) */
+   /* _mesa_function_pool[3214]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[3263]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[3230]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[3287]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[3254]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[3320]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[3287]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[3338]: DeleteProgramPipelines (will be remapped) */
+   /* _mesa_function_pool[3305]: DeleteProgramPipelines (will be remapped) */
    "ip\0"
    "glDeleteProgramPipelines\0"
    "\0"
-   /* _mesa_function_pool[3367]: LineWidthx (will be remapped) */
+   /* _mesa_function_pool[3334]: LineWidthx (will be remapped) */
    "i\0"
    "glLineWidthxOES\0"
    "glLineWidthx\0"
    "\0"
-   /* _mesa_function_pool[3399]: Indexdv (offset 45) */
+   /* _mesa_function_pool[3366]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[3412]: GetnPixelMapfvARB (will be remapped) */
+   /* _mesa_function_pool[3379]: GetnPixelMapfvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[3437]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[3404]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[3470]: DepthMask (offset 211) */
+   /* _mesa_function_pool[3437]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[3485]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[3452]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[3507]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[3474]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[3532]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[3499]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[3559]: BlendFuncSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[3526]: BlendFuncSeparateiARB (will be remapped) */
    "iiiii\0"
    "glBlendFuncSeparateiARB\0"
    "glBlendFuncSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[3620]: PixelTexGenParameteriSGIS (dynamic) */
+   /* _mesa_function_pool[3587]: PixelTexGenParameteriSGIS (dynamic) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[3652]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[3619]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[3695]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[3662]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[3723]: DrawTexfvOES (will be remapped) */
+   /* _mesa_function_pool[3690]: DrawTexfvOES (will be remapped) */
    "p\0"
    "glDrawTexfvOES\0"
    "\0"
-   /* _mesa_function_pool[3741]: GetCompressedTexImage (will be remapped) */
+   /* _mesa_function_pool[3708]: GetCompressedTexImage (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[3797]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[3764]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[3832]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[3799]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[3849]: GetQueryObjectui64v (will be remapped) */
+   /* _mesa_function_pool[3816]: GetQueryObjectui64v (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64v\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[3901]: VertexAttribP1uiv (will be remapped) */
+   /* _mesa_function_pool[3868]: VertexAttribP1uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP1uiv\0"
    "\0"
-   /* _mesa_function_pool[3927]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[3894]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[3942]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[3909]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[3974]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[3941]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[3996]: GenTextures (offset 328) */
+   /* _mesa_function_pool[3963]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[4031]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[3998]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4059]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[4026]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[4083]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[4050]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[4109]: VertexAttribP4ui (will be remapped) */
+   /* _mesa_function_pool[4076]: VertexAttribP4ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP4ui\0"
    "\0"
-   /* _mesa_function_pool[4134]: Uniform4i (will be remapped) */
+   /* _mesa_function_pool[4101]: Uniform4i (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[4168]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[4135]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[4197]: Uniform4f (will be remapped) */
+   /* _mesa_function_pool[4164]: Uniform4f (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[4231]: ProgramUniform3f (will be remapped) */
+   /* _mesa_function_pool[4198]: ProgramUniform3f (will be remapped) */
    "iifff\0"
    "glProgramUniform3f\0"
    "\0"
-   /* _mesa_function_pool[4257]: ProgramUniform3i (will be remapped) */
+   /* _mesa_function_pool[4224]: ProgramUniform3i (will be remapped) */
    "iiiii\0"
    "glProgramUniform3i\0"
    "\0"
-   /* _mesa_function_pool[4283]: PointParameterfv (will be remapped) */
+   /* _mesa_function_pool[4250]: PointParameterfv (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[4373]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[4340]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[4433]: GetString (offset 275) */
+   /* _mesa_function_pool[4400]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[4448]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[4415]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[4474]: VDPAUUnmapSurfacesNV (will be remapped) */
+   /* _mesa_function_pool[4441]: VDPAUUnmapSurfacesNV (will be remapped) */
    "ip\0"
    "glVDPAUUnmapSurfacesNV\0"
    "\0"
-   /* _mesa_function_pool[4501]: GetnHistogramARB (will be remapped) */
+   /* _mesa_function_pool[4468]: GetnHistogramARB (will be remapped) */
    "iiiiip\0"
    "glGetnHistogramARB\0"
    "\0"
-   /* _mesa_function_pool[4528]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[4495]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[4581]: SecondaryColor3s (will be remapped) */
+   /* _mesa_function_pool[4548]: SecondaryColor3s (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[4627]: VertexAttribP2uiv (will be remapped) */
+   /* _mesa_function_pool[4594]: VertexAttribP2uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP2uiv\0"
    "\0"
-   /* _mesa_function_pool[4653]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[4620]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[4680]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[4647]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[4705]: SecondaryColor3b (will be remapped) */
+   /* _mesa_function_pool[4672]: SecondaryColor3b (will be remapped) */
    "iii\0"
    "glSecondaryColor3b\0"
    "glSecondaryColor3bEXT\0"
    "\0"
-   /* _mesa_function_pool[4751]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[4718]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[4774]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[4741]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[4801]: SecondaryColor3i (will be remapped) */
+   /* _mesa_function_pool[4768]: SecondaryColor3i (will be remapped) */
    "iii\0"
    "glSecondaryColor3i\0"
    "glSecondaryColor3iEXT\0"
    "\0"
-   /* _mesa_function_pool[4847]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[4814]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[4873]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[4840]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[4906]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[4873]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[4931]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[4898]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "glFlushMappedBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[4989]: Lightfv (offset 160) */
+   /* _mesa_function_pool[4956]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[5004]: GetFramebufferAttachmentParameteriv (will be remapped) */
+   /* _mesa_function_pool[4971]: GetFramebufferAttachmentParameteriv (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "glGetFramebufferAttachmentParameterivOES\0"
    "\0"
-   /* _mesa_function_pool[5130]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[5097]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[5173]: EndPerfMonitorAMD (will be remapped) */
+   /* _mesa_function_pool[5140]: EndPerfMonitorAMD (will be remapped) */
    "i\0"
    "glEndPerfMonitorAMD\0"
    "\0"
-   /* _mesa_function_pool[5196]: Uniform1ui (will be remapped) */
+   /* _mesa_function_pool[5163]: Uniform1ui (will be remapped) */
    "ii\0"
    "glUniform1uiEXT\0"
    "glUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[5229]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[5196]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[5253]: GetMultisamplefv (will be remapped) */
+   /* _mesa_function_pool[5220]: GetMultisamplefv (will be remapped) */
    "iip\0"
    "glGetMultisamplefv\0"
    "\0"
-   /* _mesa_function_pool[5277]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[5244]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[5295]: Rectdv (offset 87) */
+   /* _mesa_function_pool[5262]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[5308]: DrawArraysInstancedARB (will be remapped) */
+   /* _mesa_function_pool[5275]: DrawArraysInstancedARB (will be remapped) */
    "iiii\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "glDrawArraysInstanced\0"
    "\0"
-   /* _mesa_function_pool[5386]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[5353]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[5421]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[5388]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[5445]: SecondaryColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[5412]: SecondaryColorP3uiv (will be remapped) */
    "ip\0"
    "glSecondaryColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[5471]: GetnPixelMapuivARB (will be remapped) */
+   /* _mesa_function_pool[5438]: GetnPixelMapuivARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapuivARB\0"
    "\0"
-   /* _mesa_function_pool[5497]: GetSamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[5464]: GetSamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[5528]: PointParameterxv (will be remapped) */
+   /* _mesa_function_pool[5495]: PointParameterxv (will be remapped) */
    "ip\0"
    "glPointParameterxvOES\0"
    "glPointParameterxv\0"
    "\0"
-   /* _mesa_function_pool[5573]: CompressedTexSubImage3D (will be remapped) */
+   /* _mesa_function_pool[5540]: CompressedTexSubImage3D (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "glCompressedTexSubImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[5670]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[5637]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[5695]: Color3dv (offset 12) */
+   /* _mesa_function_pool[5662]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[5709]: BeginQuery (will be remapped) */
+   /* _mesa_function_pool[5676]: BeginQuery (will be remapped) */
    "ii\0"
    "glBeginQuery\0"
    "glBeginQueryARB\0"
    "\0"
-   /* _mesa_function_pool[5742]: VertexP3uiv (will be remapped) */
+   /* _mesa_function_pool[5709]: VertexP3uiv (will be remapped) */
    "ip\0"
    "glVertexP3uiv\0"
    "\0"
-   /* _mesa_function_pool[5760]: GetUniformLocation (will be remapped) */
+   /* _mesa_function_pool[5727]: GetUniformLocation (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[5809]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[5776]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[5827]: WindowPos2iv (will be remapped) */
+   /* _mesa_function_pool[5794]: WindowPos2iv (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[5882]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[5849]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[5900]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[5867]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[5926]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[5893]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[5958]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[5925]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[5985]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[5952]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6031]: CheckFramebufferStatus (will be remapped) */
+   /* _mesa_function_pool[5998]: CheckFramebufferStatus (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "glCheckFramebufferStatusOES\0"
    "\0"
-   /* _mesa_function_pool[6115]: DispatchComputeIndirect (will be remapped) */
+   /* _mesa_function_pool[6082]: DispatchComputeIndirect (will be remapped) */
    "i\0"
    "glDispatchComputeIndirect\0"
    "\0"
-   /* _mesa_function_pool[6144]: InvalidateBufferData (will be remapped) */
+   /* _mesa_function_pool[6111]: InvalidateBufferData (will be remapped) */
    "i\0"
    "glInvalidateBufferData\0"
    "\0"
-   /* _mesa_function_pool[6170]: VDPAUMapSurfacesNV (will be remapped) */
+   /* _mesa_function_pool[6137]: VDPAUMapSurfacesNV (will be remapped) */
    "ip\0"
    "glVDPAUMapSurfacesNV\0"
    "\0"
-   /* _mesa_function_pool[6195]: IsFramebuffer (will be remapped) */
+   /* _mesa_function_pool[6162]: IsFramebuffer (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "glIsFramebufferOES\0"
    "\0"
-   /* _mesa_function_pool[6252]: GetPixelTexGenParameterfvSGIS (dynamic) */
+   /* _mesa_function_pool[6219]: GetPixelTexGenParameterfvSGIS (dynamic) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[6288]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[6255]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[6305]: GetObjectLabel (will be remapped) */
+   /* _mesa_function_pool[6272]: GetObjectLabel (will be remapped) */
    "iiipp\0"
    "glGetObjectLabel\0"
    "\0"
-   /* _mesa_function_pool[6329]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[6296]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[6350]: ColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[6317]: ColorP3uiv (will be remapped) */
    "ip\0"
    "glColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[6367]: CombinerParameteriNV (dynamic) */
+   /* _mesa_function_pool[6334]: CombinerParameteriNV (dynamic) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[6394]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[6361]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6421]: VertexAttribI4ivEXT (will be remapped) */
+   /* _mesa_function_pool[6388]: VertexAttribI4ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ivEXT\0"
    "glVertexAttribI4iv\0"
    "\0"
-   /* _mesa_function_pool[6466]: SecondaryColor3ubv (will be remapped) */
+   /* _mesa_function_pool[6433]: SecondaryColor3ubv (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[6514]: GetDebugMessageLog (will be remapped) */
+   /* _mesa_function_pool[6481]: GetDebugMessageLog (will be remapped) */
    "iipppppp\0"
+   "glGetDebugMessageLogARB\0"
    "glGetDebugMessageLog\0"
    "\0"
-   /* _mesa_function_pool[6545]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[6536]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[6584]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[6575]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[6608]: VertexAttribI4usv (will be remapped) */
+   /* _mesa_function_pool[6599]: VertexAttribI4usv (will be remapped) */
    "ip\0"
    "glVertexAttribI4usvEXT\0"
    "glVertexAttribI4usv\0"
    "\0"
-   /* _mesa_function_pool[6655]: PixelTexGenParameterfSGIS (dynamic) */
+   /* _mesa_function_pool[6646]: PixelTexGenParameterfSGIS (dynamic) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[6687]: ProgramUniform2ui (will be remapped) */
+   /* _mesa_function_pool[6678]: ProgramUniform2ui (will be remapped) */
    "iiii\0"
    "glProgramUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[6713]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[6704]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6742]: Color4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[6733]: Color4ubVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6769]: GetShaderSource (will be remapped) */
+   /* _mesa_function_pool[6760]: GetShaderSource (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[6814]: BindProgramARB (will be remapped) */
+   /* _mesa_function_pool[6805]: BindProgramARB (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[6851]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[6842]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[6876]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[6867]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[6907]: ProgramUniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[6898]: ProgramUniformMatrix4x3fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[6942]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[6933]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[6962]: DrawElementsInstancedARB (will be remapped) */
+   /* _mesa_function_pool[6953]: DrawElementsInstancedARB (will be remapped) */
    "iiipi\0"
    "glDrawElementsInstancedARB\0"
    "glDrawElementsInstancedEXT\0"
    "glDrawElementsInstanced\0"
    "\0"
-   /* _mesa_function_pool[7047]: GetQueryObjectuiv (will be remapped) */
+   /* _mesa_function_pool[7038]: GetQueryObjectuiv (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[7095]: VertexAttribI4bv (will be remapped) */
+   /* _mesa_function_pool[7086]: VertexAttribI4bv (will be remapped) */
    "ip\0"
    "glVertexAttribI4bvEXT\0"
    "glVertexAttribI4bv\0"
    "\0"
-   /* _mesa_function_pool[7140]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[7131]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[7171]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[7162]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[7192]: ListBase (offset 6) */
+   /* _mesa_function_pool[7183]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[7206]: GenerateMipmap (will be remapped) */
+   /* _mesa_function_pool[7197]: GenerateMipmap (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "glGenerateMipmapOES\0"
    "\0"
-   /* _mesa_function_pool[7266]: BindBufferRange (will be remapped) */
+   /* _mesa_function_pool[7257]: BindBufferRange (will be remapped) */
    "iiiii\0"
    "glBindBufferRange\0"
    "glBindBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[7312]: ProgramUniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[7303]: ProgramUniformMatrix2x4fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2x4fv\0"
    "\0"
-   /* _mesa_function_pool[7347]: GetQueryObjectiv (will be remapped) */
+   /* _mesa_function_pool[7338]: GetQueryObjectiv (will be remapped) */
    "iip\0"
    "glGetQueryObjectiv\0"
    "glGetQueryObjectivARB\0"
    "\0"
-   /* _mesa_function_pool[7393]: VertexAttrib2s (will be remapped) */
+   /* _mesa_function_pool[7384]: VertexAttrib2s (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[7435]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[7426]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[7481]: VertexAttrib2d (will be remapped) */
+   /* _mesa_function_pool[7472]: VertexAttrib2d (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[7523]: Uniform1fv (will be remapped) */
+   /* _mesa_function_pool[7514]: Uniform1fv (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[7557]: GetProgramPipelineInfoLog (will be remapped) */
+   /* _mesa_function_pool[7548]: GetProgramPipelineInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramPipelineInfoLog\0"
    "\0"
-   /* _mesa_function_pool[7591]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[7582]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[7616]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[7607]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[7637]: WindowPos3fv (will be remapped) */
+   /* _mesa_function_pool[7628]: WindowPos3fv (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[7692]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[7683]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[7718]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[7709]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[7778]: PointParameteriv (will be remapped) */
+   /* _mesa_function_pool[7769]: PointParameteriv (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[7822]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[7813]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[7845]: BindRenderbuffer (will be remapped) */
+   /* _mesa_function_pool[7836]: BindRenderbuffer (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferOES\0"
    "\0"
-   /* _mesa_function_pool[7890]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[7881]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[7936]: PrimitiveRestartIndex (will be remapped) */
+   /* _mesa_function_pool[7927]: PrimitiveRestartIndex (will be remapped) */
    "i\0"
    "glPrimitiveRestartIndex\0"
    "glPrimitiveRestartIndexNV\0"
    "\0"
-   /* _mesa_function_pool[7989]: VertexAttribI4ubv (will be remapped) */
+   /* _mesa_function_pool[7980]: VertexAttribI4ubv (will be remapped) */
    "ip\0"
    "glVertexAttribI4ubvEXT\0"
    "glVertexAttribI4ubv\0"
    "\0"
-   /* _mesa_function_pool[8036]: GetGraphicsResetStatusARB (will be remapped) */
+   /* _mesa_function_pool[8027]: GetGraphicsResetStatusARB (will be remapped) */
    "\0"
    "glGetGraphicsResetStatusARB\0"
    "\0"
-   /* _mesa_function_pool[8066]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[8057]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[8092]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[8083]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[8118]: DepthRange (offset 288) */
+   /* _mesa_function_pool[8109]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[8135]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[8126]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[8163]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[8154]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[8189]: Uniform4fv (will be remapped) */
+   /* _mesa_function_pool[8180]: Uniform4fv (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[8223]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[8214]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[8249]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[8240]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[8282]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[8273]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[8310]: Frustumf (will be remapped) */
+   /* _mesa_function_pool[8301]: Frustumf (will be remapped) */
    "ffffff\0"
    "glFrustumfOES\0"
    "glFrustumf\0"
    "\0"
-   /* _mesa_function_pool[8343]: ProgramUniform2uiv (will be remapped) */
+   /* _mesa_function_pool[8334]: ProgramUniform2uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[8370]: Rectsv (offset 93) */
+   /* _mesa_function_pool[8361]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[8383]: Frustumx (will be remapped) */
+   /* _mesa_function_pool[8374]: Frustumx (will be remapped) */
    "iiiiii\0"
    "glFrustumxOES\0"
    "glFrustumx\0"
    "\0"
-   /* _mesa_function_pool[8416]: CullFace (offset 152) */
+   /* _mesa_function_pool[8407]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[8430]: BindTexture (offset 307) */
+   /* _mesa_function_pool[8421]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[8465]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[8456]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[8511]: MultiTexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[8502]: MultiTexCoordP2uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[8537]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[8528]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[8558]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[8549]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[8583]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[8574]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[8607]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[8598]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[8631]: VertexAttrib4bv (will be remapped) */
+   /* _mesa_function_pool[8622]: VertexAttrib4bv (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[8674]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[8665]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[8701]: SecondaryColor3usv (will be remapped) */
+   /* _mesa_function_pool[8692]: SecondaryColor3usv (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[8749]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[8740]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[8770]: Indexfv (offset 47) */
+   /* _mesa_function_pool[8761]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[8783]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[8774]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[8813]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[8804]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[8839]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[8830]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[8855]: MultiTexCoord3i (offset 396) */
+   /* _mesa_function_pool[8846]: MultiTexCoord3i (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[8900]: ProgramUniform1fv (will be remapped) */
+   /* _mesa_function_pool[8891]: ProgramUniform1fv (will be remapped) */
    "iiip\0"
    "glProgramUniform1fv\0"
    "\0"
-   /* _mesa_function_pool[8926]: MultiTexCoord3d (offset 392) */
+   /* _mesa_function_pool[8917]: MultiTexCoord3d (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[8971]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[8962]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[8988]: Fogfv (offset 154) */
+   /* _mesa_function_pool[8979]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[9000]: Minmax (offset 368) */
+   /* _mesa_function_pool[8991]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[9026]: MultiTexCoord3s (offset 398) */
+   /* _mesa_function_pool[9017]: MultiTexCoord3s (offset 398) */
    "iiii\0"
    "glMultiTexCoord3s\0"
    "glMultiTexCoord3sARB\0"
    "\0"
-   /* _mesa_function_pool[9071]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[9062]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[9093]: GetFinalCombinerInputParameterfvNV (dynamic) */
+   /* _mesa_function_pool[9084]: GetFinalCombinerInputParameterfvNV (dynamic) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9135]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[9126]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[9160]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[9151]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[9175]: BufferSubData (will be remapped) */
+   /* _mesa_function_pool[9166]: BufferSubData (will be remapped) */
    "iiip\0"
    "glBufferSubData\0"
    "glBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[9216]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[9207]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[9252]: Begin (offset 7) */
+   /* _mesa_function_pool[9243]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[9263]: LightModeli (offset 165) */
+   /* _mesa_function_pool[9254]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[9281]: UniformMatrix2fv (will be remapped) */
+   /* _mesa_function_pool[9272]: UniformMatrix2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[9328]: LightModelf (offset 163) */
+   /* _mesa_function_pool[9319]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[9346]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[9337]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[9371]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[9362]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[9397]: GetCombinerInputParameterivNV (dynamic) */
+   /* _mesa_function_pool[9388]: GetCombinerInputParameterivNV (dynamic) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[9436]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[9427]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[9465]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[9456]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[9510]: VertexAttrib4ubv (will be remapped) */
+   /* _mesa_function_pool[9501]: VertexAttrib4ubv (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[9555]: GetnTexImageARB (will be remapped) */
+   /* _mesa_function_pool[9546]: GetnTexImageARB (will be remapped) */
    "iiiiip\0"
    "glGetnTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[9581]: ColorMask (offset 210) */
+   /* _mesa_function_pool[9572]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[9599]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[9590]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[9624]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[9615]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[9661]: VertexAttribI4sv (will be remapped) */
+   /* _mesa_function_pool[9652]: VertexAttribI4sv (will be remapped) */
    "ip\0"
    "glVertexAttribI4svEXT\0"
    "glVertexAttribI4sv\0"
    "\0"
-   /* _mesa_function_pool[9706]: DrawElementsInstancedBaseInstance (will be remapped) */
+   /* _mesa_function_pool[9697]: DrawElementsInstancedBaseInstance (will be remapped) */
    "iiipii\0"
    "glDrawElementsInstancedBaseInstance\0"
    "\0"
-   /* _mesa_function_pool[9750]: UniformMatrix4fv (will be remapped) */
+   /* _mesa_function_pool[9741]: UniformMatrix4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4fv\0"
    "glUniformMatrix4fvARB\0"
    "\0"
-   /* _mesa_function_pool[9797]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[9788]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[9824]: VertexAttrib4Nuiv (will be remapped) */
+   /* _mesa_function_pool[9815]: VertexAttrib4Nuiv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[9871]: ClientActiveTexture (offset 375) */
+   /* _mesa_function_pool[9862]: ClientActiveTexture (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[9921]: GetUniformIndices (will be remapped) */
+   /* _mesa_function_pool[9912]: GetUniformIndices (will be remapped) */
    "iipp\0"
    "glGetUniformIndices\0"
    "\0"
-   /* _mesa_function_pool[9947]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[9938]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[9978]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[9969]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[9999]: CombinerParameterivNV (dynamic) */
+   /* _mesa_function_pool[9990]: CombinerParameterivNV (dynamic) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[10027]: MultiTexCoord2sv (offset 391) */
+   /* _mesa_function_pool[10018]: MultiTexCoord2sv (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[10072]: LoadIdentity (offset 290) */
+   /* _mesa_function_pool[10063]: LoadIdentity (offset 290) */
    "\0"
    "glLoadIdentity\0"
    "\0"
-   /* _mesa_function_pool[10089]: ActiveShaderProgram (will be remapped) */
+   /* _mesa_function_pool[10080]: ActiveShaderProgram (will be remapped) */
    "ii\0"
    "glActiveShaderProgram\0"
    "\0"
-   /* _mesa_function_pool[10115]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[10106]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
    "glDeleteTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[10146]: VertexAttrib4ubvNV (will be remapped) */
+   /* _mesa_function_pool[10137]: VertexAttrib4ubvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[10171]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[10162]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[10201]: GetMapfv (offset 267) */
+   /* _mesa_function_pool[10192]: GetMapfv (offset 267) */
    "iip\0"
    "glGetMapfv\0"
    "\0"
-   /* _mesa_function_pool[10217]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[10208]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[10243]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[10234]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[10271]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[10262]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10317]: GetPixelMapfv (offset 271) */
+   /* _mesa_function_pool[10308]: GetPixelMapfv (offset 271) */
    "ip\0"
    "glGetPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[10337]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[10328]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[10355]: DebugMessageCallbackARB (will be remapped) */
-   "pp\0"
-   "glDebugMessageCallbackARB\0"
-   "\0"
-   /* _mesa_function_pool[10385]: VertexAttrib4svNV (will be remapped) */
+   /* _mesa_function_pool[10346]: VertexAttrib4svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4svNV\0"
    "\0"
-   /* _mesa_function_pool[10409]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[10370]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[10458]: VDPAUSurfaceAccessNV (will be remapped) */
+   /* _mesa_function_pool[10419]: VDPAUSurfaceAccessNV (will be remapped) */
    "ii\0"
    "glVDPAUSurfaceAccessNV\0"
    "\0"
-   /* _mesa_function_pool[10485]: EdgeFlagPointer (offset 312) */
+   /* _mesa_function_pool[10446]: EdgeFlagPointer (offset 312) */
    "ip\0"
    "glEdgeFlagPointer\0"
    "\0"
-   /* _mesa_function_pool[10507]: WindowPos2f (will be remapped) */
+   /* _mesa_function_pool[10468]: WindowPos2f (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
    "glWindowPos2fMESA\0"
    "\0"
-   /* _mesa_function_pool[10560]: WindowPos2d (will be remapped) */
+   /* _mesa_function_pool[10521]: WindowPos2d (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[10613]: WindowPos2i (will be remapped) */
+   /* _mesa_function_pool[10574]: WindowPos2i (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[10666]: WindowPos2s (will be remapped) */
+   /* _mesa_function_pool[10627]: WindowPos2s (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[10719]: VertexAttribI1uiEXT (will be remapped) */
+   /* _mesa_function_pool[10680]: VertexAttribI1uiEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1uiEXT\0"
    "glVertexAttribI1ui\0"
    "\0"
-   /* _mesa_function_pool[10764]: DeleteSync (will be remapped) */
+   /* _mesa_function_pool[10725]: DeleteSync (will be remapped) */
    "i\0"
    "glDeleteSync\0"
    "\0"
-   /* _mesa_function_pool[10780]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[10741]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[10802]: CompressedTexImage3D (will be remapped) */
+   /* _mesa_function_pool[10763]: CompressedTexImage3D (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexImage3D\0"
    "glCompressedTexImage3DARB\0"
    "glCompressedTexImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[10888]: VertexAttribI1uiv (will be remapped) */
+   /* _mesa_function_pool[10849]: VertexAttribI1uiv (will be remapped) */
    "ip\0"
    "glVertexAttribI1uivEXT\0"
    "glVertexAttribI1uiv\0"
    "\0"
-   /* _mesa_function_pool[10935]: SecondaryColor3dv (will be remapped) */
+   /* _mesa_function_pool[10896]: SecondaryColor3dv (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[10981]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[10942]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11011]: GetnPixelMapusvARB (will be remapped) */
+   /* _mesa_function_pool[10972]: GetnPixelMapusvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapusvARB\0"
    "\0"
-   /* _mesa_function_pool[11037]: VertexAttrib3s (will be remapped) */
+   /* _mesa_function_pool[10998]: VertexAttrib3s (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[11080]: UniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[11041]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[11107]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[11068]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[11128]: GetQueryiv (will be remapped) */
+   /* _mesa_function_pool[11089]: GetQueryiv (will be remapped) */
    "iip\0"
    "glGetQueryiv\0"
    "glGetQueryivARB\0"
    "\0"
-   /* _mesa_function_pool[11162]: VertexAttrib3d (will be remapped) */
+   /* _mesa_function_pool[11123]: VertexAttrib3d (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[11205]: ImageTransformParameterfHP (dynamic) */
+   /* _mesa_function_pool[11166]: ImageTransformParameterfHP (dynamic) */
    "iif\0"
    "glImageTransformParameterfHP\0"
    "\0"
-   /* _mesa_function_pool[11239]: MapBuffer (will be remapped) */
+   /* _mesa_function_pool[11200]: MapBuffer (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "glMapBufferOES\0"
    "\0"
-   /* _mesa_function_pool[11285]: VertexAttrib4Nbv (will be remapped) */
+   /* _mesa_function_pool[11246]: VertexAttrib4Nbv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[11330]: ProgramBinary (will be remapped) */
+   /* _mesa_function_pool[11291]: ProgramBinary (will be remapped) */
    "iipi\0"
    "glProgramBinary\0"
    "glProgramBinaryOES\0"
    "\0"
-   /* _mesa_function_pool[11371]: InvalidateTexImage (will be remapped) */
+   /* _mesa_function_pool[11332]: InvalidateTexImage (will be remapped) */
    "ii\0"
    "glInvalidateTexImage\0"
    "\0"
-   /* _mesa_function_pool[11396]: Uniform4ui (will be remapped) */
+   /* _mesa_function_pool[11357]: Uniform4ui (will be remapped) */
    "iiiii\0"
    "glUniform4uiEXT\0"
    "glUniform4ui\0"
    "\0"
-   /* _mesa_function_pool[11432]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[11393]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[11473]: GetBooleani_v (will be remapped) */
+   /* _mesa_function_pool[11434]: GetBooleani_v (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "glGetBooleani_v\0"
    "\0"
-   /* _mesa_function_pool[11518]: DrawTexsOES (will be remapped) */
+   /* _mesa_function_pool[11479]: DrawTexsOES (will be remapped) */
    "iiiii\0"
    "glDrawTexsOES\0"
    "\0"
-   /* _mesa_function_pool[11539]: GetObjectPtrLabel (will be remapped) */
+   /* _mesa_function_pool[11500]: GetObjectPtrLabel (will be remapped) */
    "pipp\0"
    "glGetObjectPtrLabel\0"
    "\0"
-   /* _mesa_function_pool[11565]: ProgramParameteri (will be remapped) */
+   /* _mesa_function_pool[11526]: ProgramParameteri (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "glProgramParameteri\0"
    "\0"
-   /* _mesa_function_pool[11613]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[11574]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[11651]: Color3fv (offset 14) */
+   /* _mesa_function_pool[11612]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[11665]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[11626]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[11691]: GetnMapfvARB (will be remapped) */
+   /* _mesa_function_pool[11652]: GetnMapfvARB (will be remapped) */
    "iiip\0"
    "glGetnMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[11712]: MultiTexCoord2i (offset 388) */
+   /* _mesa_function_pool[11673]: MultiTexCoord2i (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[11756]: MultiTexCoord2d (offset 384) */
+   /* _mesa_function_pool[11717]: MultiTexCoord2d (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[11800]: SamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[11761]: SamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[11828]: MultiTexCoord2s (offset 390) */
+   /* _mesa_function_pool[11789]: MultiTexCoord2s (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[11872]: VDPAURegisterVideoSurfaceNV (will be remapped) */
+   /* _mesa_function_pool[11833]: VDPAURegisterVideoSurfaceNV (will be remapped) */
    "piip\0"
    "glVDPAURegisterVideoSurfaceNV\0"
    "\0"
-   /* _mesa_function_pool[11908]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[11869]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[11961]: BindBufferBase (will be remapped) */
+   /* _mesa_function_pool[11922]: BindBufferBase (will be remapped) */
    "iii\0"
    "glBindBufferBase\0"
    "glBindBufferBaseEXT\0"
    "\0"
-   /* _mesa_function_pool[12003]: GetPerfMonitorCounterDataAMD (will be remapped) */
+   /* _mesa_function_pool[11964]: GetPerfMonitorCounterDataAMD (will be remapped) */
    "iiipp\0"
    "glGetPerfMonitorCounterDataAMD\0"
    "\0"
-   /* _mesa_function_pool[12041]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[12002]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[12086]: MultTransposeMatrixf (will be remapped) */
+   /* _mesa_function_pool[12047]: MultTransposeMatrixf (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[12138]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[12099]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[12161]: Scalex (will be remapped) */
+   /* _mesa_function_pool[12122]: Scalex (will be remapped) */
    "iii\0"
    "glScalexOES\0"
    "glScalex\0"
    "\0"
-   /* _mesa_function_pool[12187]: Scaled (offset 301) */
+   /* _mesa_function_pool[12148]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[12201]: Scalef (offset 302) */
+   /* _mesa_function_pool[12162]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[12215]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[12176]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[12239]: GetUniformfv (will be remapped) */
+   /* _mesa_function_pool[12200]: GetUniformfv (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[12277]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[12238]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[12311]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[12272]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[12335]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[12296]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[12357]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12318]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12386]: QueryCounter (will be remapped) */
+   /* _mesa_function_pool[12347]: QueryCounter (will be remapped) */
    "ii\0"
    "glQueryCounter\0"
    "\0"
-   /* _mesa_function_pool[12405]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[12366]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[12430]: ProgramUniform3iv (will be remapped) */
+   /* _mesa_function_pool[12391]: ProgramUniform3iv (will be remapped) */
    "iiip\0"
    "glProgramUniform3iv\0"
    "\0"
-   /* _mesa_function_pool[12456]: GetActiveUniformBlockName (will be remapped) */
+   /* _mesa_function_pool[12417]: GetActiveUniformBlockName (will be remapped) */
    "iiipp\0"
    "glGetActiveUniformBlockName\0"
    "\0"
-   /* _mesa_function_pool[12491]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[12452]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[12523]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[12484]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[12541]: ColorMaski (will be remapped) */
+   /* _mesa_function_pool[12502]: ColorMaski (will be remapped) */
    "iiiii\0"
    "glColorMaskIndexedEXT\0"
    "glColorMaski\0"
    "\0"
-   /* _mesa_function_pool[12583]: Uniform2uiv (will be remapped) */
+   /* _mesa_function_pool[12544]: Uniform2uiv (will be remapped) */
    "iip\0"
    "glUniform2uivEXT\0"
    "glUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[12619]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[12580]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[12638]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[12599]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[12657]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[12618]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[12676]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[12637]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "glBindVertexArrayOES\0"
    "\0"
-   /* _mesa_function_pool[12718]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[12679]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[12737]: GetTexParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[12698]: GetTexParameterIuiv (will be remapped) */
    "iip\0"
    "glGetTexParameterIuivEXT\0"
    "glGetTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[12789]: DrawTransformFeedbackStreamInstanced (will be remapped) */
+   /* _mesa_function_pool[12750]: DrawTransformFeedbackStreamInstanced (will be remapped) */
    "iiii\0"
    "glDrawTransformFeedbackStreamInstanced\0"
    "\0"
-   /* _mesa_function_pool[12834]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[12795]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[12877]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12838]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12907]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[12868]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[12949]: IsFenceNV (dynamic) */
+   /* _mesa_function_pool[12910]: IsFenceNV (dynamic) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[12964]: ColorTable (offset 339) */
+   /* _mesa_function_pool[12925]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[13017]: LoadName (offset 198) */
+   /* _mesa_function_pool[12978]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[13031]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[12992]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[13060]: GetnUniformuivARB (will be remapped) */
+   /* _mesa_function_pool[13021]: GetnUniformuivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformuivARB\0"
    "\0"
-   /* _mesa_function_pool[13086]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[13047]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[13102]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[13063]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[13160]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[13121]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[13181]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[13142]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[13200]: MultiTexCoordP1ui (will be remapped) */
+   /* _mesa_function_pool[13161]: MultiTexCoordP1ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP1ui\0"
    "\0"
-   /* _mesa_function_pool[13225]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[13186]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[13244]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[13205]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[13259]: SelectPerfMonitorCountersAMD (will be remapped) */
+   /* _mesa_function_pool[13220]: SelectPerfMonitorCountersAMD (will be remapped) */
    "iiiip\0"
    "glSelectPerfMonitorCountersAMD\0"
    "\0"
-   /* _mesa_function_pool[13297]: BindFramebuffer (will be remapped) */
+   /* _mesa_function_pool[13258]: BindFramebuffer (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferOES\0"
    "\0"
-   /* _mesa_function_pool[13340]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[13301]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[13376]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[13337]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[13410]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[13371]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[13436]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[13397]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[13462]: GetActiveUniformsiv (will be remapped) */
+   /* _mesa_function_pool[13423]: GetActiveUniformsiv (will be remapped) */
    "iipip\0"
    "glGetActiveUniformsiv\0"
    "\0"
-   /* _mesa_function_pool[13491]: VertexAttrib2sv (will be remapped) */
+   /* _mesa_function_pool[13452]: VertexAttrib2sv (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[13534]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[13495]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[13569]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[13530]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[13592]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[13553]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[13640]: GetPerfMonitorGroupStringAMD (will be remapped) */
+   /* _mesa_function_pool[13601]: GetPerfMonitorGroupStringAMD (will be remapped) */
    "iipp\0"
    "glGetPerfMonitorGroupStringAMD\0"
    "\0"
-   /* _mesa_function_pool[13677]: GetError (offset 261) */
+   /* _mesa_function_pool[13638]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[13690]: PassThrough (offset 199) */
+   /* _mesa_function_pool[13651]: PassThrough (offset 199) */
    "f\0"
    "glPassThrough\0"
    "\0"
-   /* _mesa_function_pool[13707]: GetListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[13668]: GetListParameterfvSGIX (dynamic) */
    "iip\0"
    "glGetListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[13737]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[13698]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[13771]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[13732]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[13799]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[13760]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[13842]: WindowPos3dv (will be remapped) */
+   /* _mesa_function_pool[13803]: WindowPos3dv (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[13897]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[13858]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[13924]: DeleteFencesNV (dynamic) */
+   /* _mesa_function_pool[13885]: DeleteFencesNV (dynamic) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[13945]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[13906]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[13983]: StencilOp (offset 244) */
+   /* _mesa_function_pool[13944]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[14000]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[13961]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[14021]: ProgramUniform1iv (will be remapped) */
+   /* _mesa_function_pool[13982]: ProgramUniform1iv (will be remapped) */
    "iiip\0"
    "glProgramUniform1iv\0"
    "\0"
-   /* _mesa_function_pool[14047]: ProgramUniform3ui (will be remapped) */
+   /* _mesa_function_pool[14008]: ProgramUniform3ui (will be remapped) */
    "iiiii\0"
    "glProgramUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[14074]: SecondaryColor3sv (will be remapped) */
+   /* _mesa_function_pool[14035]: SecondaryColor3sv (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[14120]: TexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[14081]: TexCoordP3ui (will be remapped) */
    "ii\0"
    "glTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[14139]: Fogxv (will be remapped) */
+   /* _mesa_function_pool[14100]: Fogxv (will be remapped) */
    "ip\0"
    "glFogxvOES\0"
    "glFogxv\0"
    "\0"
-   /* _mesa_function_pool[14162]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[14123]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[14189]: VertexAttribP1ui (will be remapped) */
+   /* _mesa_function_pool[14150]: VertexAttribP1ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP1ui\0"
    "\0"
-   /* _mesa_function_pool[14214]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[14175]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[14232]: LogicOp (offset 242) */
+   /* _mesa_function_pool[14193]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[14245]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[14206]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[14321]: WindowPos3d (will be remapped) */
+   /* _mesa_function_pool[14282]: WindowPos3d (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[14375]: Enablei (will be remapped) */
+   /* _mesa_function_pool[14336]: Enablei (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "glEnablei\0"
    "\0"
-   /* _mesa_function_pool[14408]: WindowPos3f (will be remapped) */
+   /* _mesa_function_pool[14369]: WindowPos3f (will be remapped) */
    "fff\0"
    "glWindowPos3f\0"
    "glWindowPos3fARB\0"
    "glWindowPos3fMESA\0"
    "\0"
-   /* _mesa_function_pool[14462]: GenProgramsARB (will be remapped) */
+   /* _mesa_function_pool[14423]: GenProgramsARB (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[14499]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[14460]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[14517]: WindowPos3i (will be remapped) */
+   /* _mesa_function_pool[14478]: WindowPos3i (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[14571]: MultiTexCoord4iv (offset 405) */
+   /* _mesa_function_pool[14532]: MultiTexCoord4iv (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[14616]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[14577]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[14633]: WindowPos3s (will be remapped) */
+   /* _mesa_function_pool[14594]: WindowPos3s (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[14687]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[14648]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[14706]: DebugMessageInsert (will be remapped) */
+   /* _mesa_function_pool[14667]: DebugMessageInsert (will be remapped) */
    "iiiiip\0"
+   "glDebugMessageInsertARB\0"
    "glDebugMessageInsert\0"
    "\0"
-   /* _mesa_function_pool[14735]: Orthof (will be remapped) */
+   /* _mesa_function_pool[14720]: Orthof (will be remapped) */
    "ffffff\0"
    "glOrthofOES\0"
    "glOrthof\0"
    "\0"
-   /* _mesa_function_pool[14764]: CompressedTexImage2D (will be remapped) */
+   /* _mesa_function_pool[14749]: CompressedTexImage2D (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[14823]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[14808]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[14844]: IsSync (will be remapped) */
+   /* _mesa_function_pool[14829]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[14856]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[14841]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[14871]: MultiTexCoord1sv (offset 383) */
+   /* _mesa_function_pool[14856]: MultiTexCoord1sv (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[14916]: Orthox (will be remapped) */
+   /* _mesa_function_pool[14901]: Orthox (will be remapped) */
    "iiiiii\0"
    "glOrthoxOES\0"
    "glOrthox\0"
    "\0"
-   /* _mesa_function_pool[14945]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[14930]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[14961]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[14946]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[14979]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[14964]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[14995]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[14980]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[15036]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[15021]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[15058]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[15043]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[15076]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[15061]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[15094]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[15079]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[15112]: InvalidateSubFramebuffer (will be remapped) */
+   /* _mesa_function_pool[15097]: InvalidateSubFramebuffer (will be remapped) */
    "iipiiii\0"
    "glInvalidateSubFramebuffer\0"
    "\0"
-   /* _mesa_function_pool[15148]: Color4ub (offset 35) */
+   /* _mesa_function_pool[15133]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[15165]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[15150]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[15183]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[15168]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[15218]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[15203]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[15245]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[15230]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[15280]: MultiTexCoord3dv (offset 393) */
+   /* _mesa_function_pool[15265]: MultiTexCoord3dv (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[15325]: BindProgramPipeline (will be remapped) */
+   /* _mesa_function_pool[15310]: BindProgramPipeline (will be remapped) */
    "i\0"
    "glBindProgramPipeline\0"
    "\0"
-   /* _mesa_function_pool[15350]: VertexAttribP4uiv (will be remapped) */
+   /* _mesa_function_pool[15335]: VertexAttribP4uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP4uiv\0"
    "\0"
-   /* _mesa_function_pool[15376]: DebugMessageCallback (will be remapped) */
+   /* _mesa_function_pool[15361]: DebugMessageCallback (will be remapped) */
    "pp\0"
+   "glDebugMessageCallbackARB\0"
    "glDebugMessageCallback\0"
    "\0"
-   /* _mesa_function_pool[15403]: MultiTexCoord1i (offset 380) */
+   /* _mesa_function_pool[15414]: MultiTexCoord1i (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[15446]: WindowPos2dv (will be remapped) */
+   /* _mesa_function_pool[15457]: WindowPos2dv (will be remapped) */
    "p\0"
    "glWindowPos2dv\0"
    "glWindowPos2dvARB\0"
    "glWindowPos2dvMESA\0"
    "\0"
-   /* _mesa_function_pool[15501]: TexParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[15512]: TexParameterIuiv (will be remapped) */
    "iip\0"
    "glTexParameterIuivEXT\0"
    "glTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[15547]: MultiTexCoord1d (offset 376) */
+   /* _mesa_function_pool[15558]: MultiTexCoord1d (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[15590]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[15601]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[15617]: MultiTexCoord1s (offset 382) */
+   /* _mesa_function_pool[15628]: MultiTexCoord1s (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[15660]: BeginConditionalRender (will be remapped) */
+   /* _mesa_function_pool[15671]: BeginConditionalRender (will be remapped) */
    "ii\0"
    "glBeginConditionalRender\0"
    "glBeginConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[15716]: LoadPaletteFromModelViewMatrixOES (dynamic) */
+   /* _mesa_function_pool[15727]: LoadPaletteFromModelViewMatrixOES (dynamic) */
    "\0"
    "glLoadPaletteFromModelViewMatrixOES\0"
    "\0"
-   /* _mesa_function_pool[15754]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[15765]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[15773]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[15784]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[15807]: CopyConvolutionFilter1D (offset 354) */
+   /* _mesa_function_pool[15818]: CopyConvolutionFilter1D (offset 354) */
    "iiiii\0"
    "glCopyConvolutionFilter1D\0"
    "glCopyConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[15869]: ClearBufferfv (will be remapped) */
+   /* _mesa_function_pool[15880]: ClearBufferfv (will be remapped) */
    "iip\0"
    "glClearBufferfv\0"
    "\0"
-   /* _mesa_function_pool[15890]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[15901]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[15918]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[15929]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[15945]: GetTexParameterxv (will be remapped) */
+   /* _mesa_function_pool[15956]: GetTexParameterxv (will be remapped) */
    "iip\0"
    "glGetTexParameterxvOES\0"
    "glGetTexParameterxv\0"
    "\0"
-   /* _mesa_function_pool[15993]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[16004]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[16020]: ClearBufferfi (will be remapped) */
+   /* _mesa_function_pool[16031]: ClearBufferfi (will be remapped) */
    "iifi\0"
    "glClearBufferfi\0"
    "\0"
-   /* _mesa_function_pool[16042]: Materialiv (offset 172) */
+   /* _mesa_function_pool[16053]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[16060]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[16071]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[16089]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[16100]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[16108]: DrawElementsInstancedBaseVertex (will be remapped) */
+   /* _mesa_function_pool[16119]: DrawElementsInstancedBaseVertex (will be remapped) */
    "iiipii\0"
    "glDrawElementsInstancedBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[16150]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[16161]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[16174]: TexGeni (offset 192) */
+   /* _mesa_function_pool[16185]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "glTexGeniOES\0"
    "\0"
-   /* _mesa_function_pool[16202]: TexGenf (offset 190) */
+   /* _mesa_function_pool[16213]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "glTexGenfOES\0"
    "\0"
-   /* _mesa_function_pool[16230]: TexGend (offset 188) */
+   /* _mesa_function_pool[16241]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[16245]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[16256]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[16272]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[16283]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[16301]: Color4sv (offset 34) */
+   /* _mesa_function_pool[16312]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[16315]: GetCombinerInputParameterfvNV (dynamic) */
+   /* _mesa_function_pool[16326]: GetCombinerInputParameterfvNV (dynamic) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[16354]: LoadTransposeMatrixf (will be remapped) */
+   /* _mesa_function_pool[16365]: LoadTransposeMatrixf (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[16406]: LoadTransposeMatrixd (will be remapped) */
+   /* _mesa_function_pool[16417]: LoadTransposeMatrixd (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[16458]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[16469]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[16474]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[16485]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[16532]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[16543]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[16588]: IsTexture (offset 330) */
+   /* _mesa_function_pool[16599]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[16618]: ProgramUniform3uiv (will be remapped) */
+   /* _mesa_function_pool[16629]: ProgramUniform3uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[16645]: ProgramUniform2fv (will be remapped) */
+   /* _mesa_function_pool[16656]: ProgramUniform2fv (will be remapped) */
    "iiip\0"
    "glProgramUniform2fv\0"
    "\0"
-   /* _mesa_function_pool[16671]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[16682]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[16706]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[16717]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[16732]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[16743]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[16748]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[16759]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "glGenVertexArraysOES\0"
    "\0"
-   /* _mesa_function_pool[16791]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[16802]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[16840]: IsBuffer (will be remapped) */
+   /* _mesa_function_pool[16851]: IsBuffer (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[16868]: ColorP4ui (will be remapped) */
+   /* _mesa_function_pool[16879]: ColorP4ui (will be remapped) */
    "ii\0"
    "glColorP4ui\0"
    "\0"
-   /* _mesa_function_pool[16884]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[16895]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[16911]: TexCoordP3uiv (will be remapped) */
+   /* _mesa_function_pool[16922]: TexCoordP3uiv (will be remapped) */
    "ip\0"
    "glTexCoordP3uiv\0"
    "\0"
-   /* _mesa_function_pool[16931]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[16942]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[16950]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[16961]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[16967]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[16978]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[16993]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[17004]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[17021]: Uniform1iv (will be remapped) */
+   /* _mesa_function_pool[17032]: Uniform1iv (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[17055]: Uniform4uiv (will be remapped) */
+   /* _mesa_function_pool[17066]: Uniform4uiv (will be remapped) */
    "iip\0"
    "glUniform4uivEXT\0"
    "glUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[17091]: PopDebugGroup (will be remapped) */
+   /* _mesa_function_pool[17102]: PopDebugGroup (will be remapped) */
    "\0"
    "glPopDebugGroup\0"
    "\0"
-   /* _mesa_function_pool[17109]: VertexAttrib1d (will be remapped) */
+   /* _mesa_function_pool[17120]: VertexAttrib1d (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[17150]: CompressedTexImage1D (will be remapped) */
+   /* _mesa_function_pool[17161]: CompressedTexImage1D (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[17208]: TexBufferRange (will be remapped) */
+   /* _mesa_function_pool[17219]: TexBufferRange (will be remapped) */
    "iiiii\0"
    "glTexBufferRange\0"
    "\0"
-   /* _mesa_function_pool[17232]: VertexAttrib1s (will be remapped) */
+   /* _mesa_function_pool[17243]: VertexAttrib1s (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[17273]: MultiDrawElementsIndirect (will be remapped) */
+   /* _mesa_function_pool[17284]: MultiDrawElementsIndirect (will be remapped) */
    "iipii\0"
    "glMultiDrawElementsIndirect\0"
    "\0"
-   /* _mesa_function_pool[17308]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[17319]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[17340]: BeginPerfMonitorAMD (will be remapped) */
+   /* _mesa_function_pool[17351]: BeginPerfMonitorAMD (will be remapped) */
    "i\0"
    "glBeginPerfMonitorAMD\0"
    "\0"
-   /* _mesa_function_pool[17365]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[17376]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[17457]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[17468]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[17502]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[17513]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[17533]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[17544]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[17548]: GetnMapdvARB (will be remapped) */
+   /* _mesa_function_pool[17559]: GetnMapdvARB (will be remapped) */
    "iiip\0"
    "glGetnMapdvARB\0"
    "\0"
-   /* _mesa_function_pool[17569]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[17580]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[17593]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[17604]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[17620]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[17631]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[17644]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[17655]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[17663]: ViewportArrayv (will be remapped) */
+   /* _mesa_function_pool[17674]: ViewportArrayv (will be remapped) */
    "iip\0"
    "glViewportArrayv\0"
    "\0"
-   /* _mesa_function_pool[17685]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[17696]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[17756]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[17767]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[17809]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[17820]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[17854]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[17865]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[17890]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[17901]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[17914]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[17925]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[17943]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[17954]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[17961]: Fogiv (offset 156) */
+   /* _mesa_function_pool[17972]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[17973]: EndQuery (will be remapped) */
+   /* _mesa_function_pool[17984]: EndQuery (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[18001]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[18012]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[18018]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[18029]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[18035]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[18046]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[18062]: Clear (offset 203) */
+   /* _mesa_function_pool[18073]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[18073]: VertexAttrib4sv (will be remapped) */
+   /* _mesa_function_pool[18084]: VertexAttrib4sv (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[18116]: Ortho (offset 296) */
+   /* _mesa_function_pool[18127]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[18132]: Uniform3uiv (will be remapped) */
+   /* _mesa_function_pool[18143]: Uniform3uiv (will be remapped) */
    "iip\0"
    "glUniform3uivEXT\0"
    "glUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[18168]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[18179]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "glMatrixIndexPointerOES\0"
    "\0"
-   /* _mesa_function_pool[18222]: EndQueryIndexed (will be remapped) */
+   /* _mesa_function_pool[18233]: EndQueryIndexed (will be remapped) */
    "ii\0"
    "glEndQueryIndexed\0"
    "\0"
-   /* _mesa_function_pool[18244]: TexParameterxv (will be remapped) */
+   /* _mesa_function_pool[18255]: TexParameterxv (will be remapped) */
    "iip\0"
    "glTexParameterxvOES\0"
    "glTexParameterxv\0"
    "\0"
-   /* _mesa_function_pool[18286]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[18297]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[18323]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[18334]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[18358]: ProgramUniformMatrix2fv (will be remapped) */
+   /* _mesa_function_pool[18369]: ProgramUniformMatrix2fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2fv\0"
    "\0"
-   /* _mesa_function_pool[18391]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[18402]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[18426]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[18437]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[18452]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[18463]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[18472]: LightModelx (will be remapped) */
+   /* _mesa_function_pool[18483]: LightModelx (will be remapped) */
    "ii\0"
    "glLightModelxOES\0"
    "glLightModelx\0"
    "\0"
-   /* _mesa_function_pool[18507]: VertexAttribI3iEXT (will be remapped) */
+   /* _mesa_function_pool[18518]: VertexAttribI3iEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3iEXT\0"
    "glVertexAttribI3i\0"
    "\0"
-   /* _mesa_function_pool[18552]: ClearColorx (will be remapped) */
+   /* _mesa_function_pool[18563]: ClearColorx (will be remapped) */
    "iiii\0"
    "glClearColorxOES\0"
    "glClearColorx\0"
    "\0"
-   /* _mesa_function_pool[18589]: EndTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[18600]: EndTransformFeedback (will be remapped) */
    "\0"
    "glEndTransformFeedback\0"
    "glEndTransformFeedbackEXT\0"
    "\0"
-   /* _mesa_function_pool[18640]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[18651]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[18666]: GetProgramBinary (will be remapped) */
+   /* _mesa_function_pool[18677]: GetProgramBinary (will be remapped) */
    "iippp\0"
    "glGetProgramBinary\0"
    "glGetProgramBinaryOES\0"
    "\0"
-   /* _mesa_function_pool[18714]: ViewportIndexedfv (will be remapped) */
+   /* _mesa_function_pool[18725]: ViewportIndexedfv (will be remapped) */
    "ip\0"
    "glViewportIndexedfv\0"
    "\0"
-   /* _mesa_function_pool[18738]: CallList (offset 2) */
+   /* _mesa_function_pool[18749]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[18752]: Materialfv (offset 170) */
+   /* _mesa_function_pool[18763]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[18770]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[18781]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[18789]: GetActiveAtomicCounterBufferiv (will be remapped) */
+   /* _mesa_function_pool[18800]: GetActiveAtomicCounterBufferiv (will be remapped) */
    "iiip\0"
    "glGetActiveAtomicCounterBufferiv\0"
    "\0"
-   /* _mesa_function_pool[18828]: TexParameterIiv (will be remapped) */
+   /* _mesa_function_pool[18839]: TexParameterIiv (will be remapped) */
    "iip\0"
    "glTexParameterIivEXT\0"
    "glTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[18872]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[18883]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[18894]: FlushVertexArrayRangeNV (dynamic) */
+   /* _mesa_function_pool[18905]: FlushVertexArrayRangeNV (dynamic) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[18922]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[18933]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[18977]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[18988]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[19012]: Uniform2iv (will be remapped) */
+   /* _mesa_function_pool[19023]: Uniform2iv (will be remapped) */
    "iip\0"
    "glUniform2iv\0"
    "glUniform2ivARB\0"
    "\0"
-   /* _mesa_function_pool[19046]: GetFixedv (will be remapped) */
+   /* _mesa_function_pool[19057]: GetFixedv (will be remapped) */
    "ip\0"
    "glGetFixedvOES\0"
    "glGetFixedv\0"
    "\0"
-   /* _mesa_function_pool[19077]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[19088]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[19108]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[19119]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[19128]: SampleCoveragex (will be remapped) */
+   /* _mesa_function_pool[19139]: SampleCoveragex (will be remapped) */
    "ii\0"
    "glSampleCoveragexOES\0"
    "glSampleCoveragex\0"
    "\0"
-   /* _mesa_function_pool[19171]: DeleteFramebuffers (will be remapped) */
+   /* _mesa_function_pool[19182]: DeleteFramebuffers (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "glDeleteFramebuffersOES\0"
    "\0"
-   /* _mesa_function_pool[19244]: CombinerInputNV (dynamic) */
+   /* _mesa_function_pool[19255]: CombinerInputNV (dynamic) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[19270]: VertexAttrib4uiv (will be remapped) */
+   /* _mesa_function_pool[19281]: VertexAttrib4uiv (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[19315]: VertexAttrib4Nsv (will be remapped) */
+   /* _mesa_function_pool[19326]: VertexAttrib4Nsv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[19360]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[19371]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[19377]: VertexAttribI2iEXT (will be remapped) */
+   /* _mesa_function_pool[19388]: VertexAttribI2iEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2iEXT\0"
    "glVertexAttribI2i\0"
    "\0"
-   /* _mesa_function_pool[19421]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[19432]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[19438]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[19449]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[19455]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[19466]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "glGetTexGenfvOES\0"
    "\0"
-   /* _mesa_function_pool[19491]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[19502]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[19508]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[19519]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[19539]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[19550]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[19570]: GetVertexAttribIuiv (will be remapped) */
+   /* _mesa_function_pool[19581]: GetVertexAttribIuiv (will be remapped) */
    "iip\0"
    "glGetVertexAttribIuivEXT\0"
    "glGetVertexAttribIuiv\0"
    "\0"
-   /* _mesa_function_pool[19622]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[19633]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[19641]: Vertex4dv (offset 143) */
+   /* _mesa_function_pool[19652]: Vertex4dv (offset 143) */
    "p\0"
    "glVertex4dv\0"
    "\0"
-   /* _mesa_function_pool[19656]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[19667]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[19687]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[19698]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[19709]: StencilMask (offset 209) */
+   /* _mesa_function_pool[19720]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[19726]: IsList (offset 287) */
+   /* _mesa_function_pool[19737]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[19738]: ClearBufferiv (will be remapped) */
+   /* _mesa_function_pool[19749]: ClearBufferiv (will be remapped) */
    "iip\0"
    "glClearBufferiv\0"
    "\0"
-   /* _mesa_function_pool[19759]: GetIntegeri_v (will be remapped) */
+   /* _mesa_function_pool[19770]: GetIntegeri_v (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "glGetIntegeri_v\0"
    "\0"
-   /* _mesa_function_pool[19804]: ProgramUniform2iv (will be remapped) */
+   /* _mesa_function_pool[19815]: ProgramUniform2iv (will be remapped) */
    "iiip\0"
    "glProgramUniform2iv\0"
    "\0"
-   /* _mesa_function_pool[19830]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[19841]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[19856]: FogCoordPointer (will be remapped) */
+   /* _mesa_function_pool[19867]: FogCoordPointer (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[19900]: SecondaryColor3us (will be remapped) */
+   /* _mesa_function_pool[19911]: SecondaryColor3us (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[19948]: DeformationMap3dSGIX (dynamic) */
+   /* _mesa_function_pool[19959]: DeformationMap3dSGIX (dynamic) */
    "iddiiddiiddiip\0"
    "glDeformationMap3dSGIX\0"
    "\0"
-   /* _mesa_function_pool[19987]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[19998]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[20009]: SecondaryColor3ub (will be remapped) */
+   /* _mesa_function_pool[20020]: SecondaryColor3ub (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[20057]: SecondaryColor3ui (will be remapped) */
+   /* _mesa_function_pool[20068]: SecondaryColor3ui (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[20105]: VertexAttribI3uivEXT (will be remapped) */
+   /* _mesa_function_pool[20116]: VertexAttribI3uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3uivEXT\0"
    "glVertexAttribI3uiv\0"
    "\0"
-   /* _mesa_function_pool[20152]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[20163]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[20172]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[20183]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[20201]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[20212]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[20224]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[20235]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[20244]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[20255]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[20274]: InitNames (offset 197) */
+   /* _mesa_function_pool[20285]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[20288]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[20299]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[20303]: DeleteQueries (will be remapped) */
+   /* _mesa_function_pool[20314]: DeleteQueries (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[20342]: InvalidateFramebuffer (will be remapped) */
+   /* _mesa_function_pool[20353]: InvalidateFramebuffer (will be remapped) */
    "iip\0"
    "glInvalidateFramebuffer\0"
    "\0"
-   /* _mesa_function_pool[20371]: Hint (offset 158) */
+   /* _mesa_function_pool[20382]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[20382]: MemoryBarrier (will be remapped) */
+   /* _mesa_function_pool[20393]: MemoryBarrier (will be remapped) */
    "i\0"
    "glMemoryBarrier\0"
    "\0"
-   /* _mesa_function_pool[20401]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[20412]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[20451]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[20462]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[20469]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[20480]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[20500]: GetTexEnvxv (will be remapped) */
+   /* _mesa_function_pool[20511]: GetTexEnvxv (will be remapped) */
    "iip\0"
    "glGetTexEnvxvOES\0"
    "glGetTexEnvxv\0"
    "\0"
-   /* _mesa_function_pool[20536]: DrawTexsvOES (will be remapped) */
+   /* _mesa_function_pool[20547]: DrawTexsvOES (will be remapped) */
    "p\0"
    "glDrawTexsvOES\0"
    "\0"
-   /* _mesa_function_pool[20554]: Disable (offset 214) */
+   /* _mesa_function_pool[20565]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[20567]: ClearColor (offset 206) */
+   /* _mesa_function_pool[20578]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[20586]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[20597]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[20605]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[20616]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[20623]: VDPAUIsSurfaceNV (will be remapped) */
+   /* _mesa_function_pool[20634]: VDPAUIsSurfaceNV (will be remapped) */
    "i\0"
    "glVDPAUIsSurfaceNV\0"
    "\0"
-   /* _mesa_function_pool[20645]: ProgramUniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[20656]: ProgramUniformMatrix2x3fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[20680]: BindVertexBuffer (will be remapped) */
+   /* _mesa_function_pool[20691]: BindVertexBuffer (will be remapped) */
    "iiii\0"
    "glBindVertexBuffer\0"
    "\0"
-   /* _mesa_function_pool[20705]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[20716]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[20726]: RasterPos4i (offset 82) */
+   /* _mesa_function_pool[20737]: RasterPos4i (offset 82) */
    "iiii\0"
    "glRasterPos4i\0"
    "\0"
-   /* _mesa_function_pool[20746]: RasterPos4d (offset 78) */
+   /* _mesa_function_pool[20757]: RasterPos4d (offset 78) */
    "dddd\0"
    "glRasterPos4d\0"
    "\0"
-   /* _mesa_function_pool[20766]: RasterPos4f (offset 80) */
+   /* _mesa_function_pool[20777]: RasterPos4f (offset 80) */
    "ffff\0"
    "glRasterPos4f\0"
    "\0"
-   /* _mesa_function_pool[20786]: GetQueryIndexediv (will be remapped) */
+   /* _mesa_function_pool[20797]: GetQueryIndexediv (will be remapped) */
    "iiip\0"
    "glGetQueryIndexediv\0"
    "\0"
-   /* _mesa_function_pool[20812]: RasterPos3dv (offset 71) */
+   /* _mesa_function_pool[20823]: RasterPos3dv (offset 71) */
    "p\0"
    "glRasterPos3dv\0"
    "\0"
-   /* _mesa_function_pool[20830]: GetProgramiv (will be remapped) */
+   /* _mesa_function_pool[20841]: GetProgramiv (will be remapped) */
    "iip\0"
    "glGetProgramiv\0"
    "\0"
-   /* _mesa_function_pool[20850]: GetDebugMessageLogARB (will be remapped) */
-   "iipppppp\0"
-   "glGetDebugMessageLogARB\0"
-   "\0"
-   /* _mesa_function_pool[20884]: TexCoord1iv (offset 99) */
+   /* _mesa_function_pool[20861]: TexCoord1iv (offset 99) */
    "p\0"
    "glTexCoord1iv\0"
    "\0"
-   /* _mesa_function_pool[20901]: RasterPos4s (offset 84) */
+   /* _mesa_function_pool[20878]: RasterPos4s (offset 84) */
    "iiii\0"
    "glRasterPos4s\0"
    "\0"
-   /* _mesa_function_pool[20921]: PixelTexGenParameterfvSGIS (dynamic) */
+   /* _mesa_function_pool[20898]: PixelTexGenParameterfvSGIS (dynamic) */
    "ip\0"
    "glPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[20954]: VertexAttrib3dv (will be remapped) */
+   /* _mesa_function_pool[20931]: VertexAttrib3dv (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[20997]: Histogram (offset 367) */
+   /* _mesa_function_pool[20974]: Histogram (offset 367) */
    "iiii\0"
    "glHistogram\0"
    "glHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[21030]: Uniform2fv (will be remapped) */
+   /* _mesa_function_pool[21007]: Uniform2fv (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[21064]: TexImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[21041]: TexImage4DSGIS (dynamic) */
    "iiiiiiiiiip\0"
    "glTexImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[21094]: DrawBuffers (will be remapped) */
+   /* _mesa_function_pool[21071]: DrawBuffers (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "glDrawBuffersNV\0"
    "\0"
-   /* _mesa_function_pool[21162]: GetnPolygonStippleARB (will be remapped) */
+   /* _mesa_function_pool[21139]: GetnPolygonStippleARB (will be remapped) */
    "ip\0"
    "glGetnPolygonStippleARB\0"
    "\0"
-   /* _mesa_function_pool[21190]: Color3uiv (offset 22) */
+   /* _mesa_function_pool[21167]: Color3uiv (offset 22) */
    "p\0"
    "glColor3uiv\0"
    "\0"
-   /* _mesa_function_pool[21205]: EvalCoord2fv (offset 235) */
+   /* _mesa_function_pool[21182]: EvalCoord2fv (offset 235) */
    "p\0"
    "glEvalCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[21223]: TextureStorage3DEXT (will be remapped) */
+   /* _mesa_function_pool[21200]: TextureStorage3DEXT (will be remapped) */
    "iiiiiii\0"
    "glTextureStorage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[21254]: VertexAttrib2fARB (will be remapped) */
+   /* _mesa_function_pool[21231]: VertexAttrib2fARB (will be remapped) */
    "iff\0"
    "glVertexAttrib2f\0"
    "glVertexAttrib2fARB\0"
    "\0"
-   /* _mesa_function_pool[21296]: WindowPos2fv (will be remapped) */
+   /* _mesa_function_pool[21273]: WindowPos2fv (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[21351]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[21328]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[21371]: TexImage3D (offset 371) */
+   /* _mesa_function_pool[21348]: TexImage3D (offset 371) */
    "iiiiiiiiip\0"
    "glTexImage3D\0"
    "glTexImage3DEXT\0"
    "glTexImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[21428]: BindFragDataLocation (will be remapped) */
+   /* _mesa_function_pool[21405]: BindFragDataLocation (will be remapped) */
    "iip\0"
    "glBindFragDataLocationEXT\0"
    "glBindFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[21482]: LightModeliv (offset 166) */
+   /* _mesa_function_pool[21459]: LightModeliv (offset 166) */
    "ip\0"
    "glLightModeliv\0"
    "\0"
-   /* _mesa_function_pool[21501]: Normal3bv (offset 53) */
+   /* _mesa_function_pool[21478]: Normal3bv (offset 53) */
    "p\0"
    "glNormal3bv\0"
    "\0"
-   /* _mesa_function_pool[21516]: BeginQueryIndexed (will be remapped) */
+   /* _mesa_function_pool[21493]: BeginQueryIndexed (will be remapped) */
    "iii\0"
    "glBeginQueryIndexed\0"
    "\0"
-   /* _mesa_function_pool[21541]: Vertex3iv (offset 139) */
+   /* _mesa_function_pool[21518]: Vertex3iv (offset 139) */
    "p\0"
    "glVertex3iv\0"
    "\0"
-   /* _mesa_function_pool[21556]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[21533]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[21573]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[21550]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[21600]: VertexP3ui (will be remapped) */
+   /* _mesa_function_pool[21577]: VertexP3ui (will be remapped) */
    "ii\0"
    "glVertexP3ui\0"
    "\0"
-   /* _mesa_function_pool[21617]: CreateProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[21594]: CreateProgramObjectARB (will be remapped) */
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[21644]: UniformMatrix3fv (will be remapped) */
+   /* _mesa_function_pool[21621]: UniformMatrix3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3fv\0"
    "glUniformMatrix3fvARB\0"
    "\0"
-   /* _mesa_function_pool[21691]: PrioritizeTextures (offset 331) */
+   /* _mesa_function_pool[21668]: PrioritizeTextures (offset 331) */
    "ipp\0"
    "glPrioritizeTextures\0"
    "glPrioritizeTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[21741]: VertexAttribI3uiEXT (will be remapped) */
+   /* _mesa_function_pool[21718]: VertexAttribI3uiEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3uiEXT\0"
    "glVertexAttribI3ui\0"
    "\0"
-   /* _mesa_function_pool[21788]: AsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[21765]: AsyncMarkerSGIX (dynamic) */
    "i\0"
    "glAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[21809]: GetProgramNamedParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[21786]: GetProgramNamedParameterfvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[21846]: GetMaterialxv (will be remapped) */
+   /* _mesa_function_pool[21823]: GetMaterialxv (will be remapped) */
    "iip\0"
    "glGetMaterialxvOES\0"
    "glGetMaterialxv\0"
    "\0"
-   /* _mesa_function_pool[21886]: MatrixIndexusvARB (dynamic) */
+   /* _mesa_function_pool[21863]: MatrixIndexusvARB (dynamic) */
    "ip\0"
    "glMatrixIndexusvARB\0"
    "\0"
-   /* _mesa_function_pool[21910]: SecondaryColor3uiv (will be remapped) */
+   /* _mesa_function_pool[21887]: SecondaryColor3uiv (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[21958]: EndConditionalRender (will be remapped) */
+   /* _mesa_function_pool[21935]: EndConditionalRender (will be remapped) */
    "\0"
    "glEndConditionalRender\0"
    "glEndConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[22008]: ProgramLocalParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[21985]: ProgramLocalParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramLocalParameter4dARB\0"
    "\0"
-   /* _mesa_function_pool[22045]: Color3sv (offset 18) */
+   /* _mesa_function_pool[22022]: Color3sv (offset 18) */
    "p\0"
    "glColor3sv\0"
    "\0"
-   /* _mesa_function_pool[22059]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[22036]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[22086]: BlendEquationSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[22063]: BlendEquationSeparateiARB (will be remapped) */
    "iii\0"
    "glBlendEquationSeparateiARB\0"
    "glBlendEquationSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[22153]: TestFenceNV (dynamic) */
+   /* _mesa_function_pool[22130]: TestFenceNV (dynamic) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[22170]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[22147]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[22215]: TexStorage2D (will be remapped) */
+   /* _mesa_function_pool[22192]: TexStorage2D (will be remapped) */
    "iiiii\0"
    "glTexStorage2D\0"
    "\0"
-   /* _mesa_function_pool[22237]: GetPixelTexGenParameterivSGIS (dynamic) */
+   /* _mesa_function_pool[22214]: GetPixelTexGenParameterivSGIS (dynamic) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[22273]: FramebufferTexture2D (will be remapped) */
+   /* _mesa_function_pool[22250]: FramebufferTexture2D (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "glFramebufferTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[22355]: GetSamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[22332]: GetSamplerParameterfv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[22384]: VertexAttrib2dv (will be remapped) */
+   /* _mesa_function_pool[22361]: VertexAttrib2dv (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[22427]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[22404]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[22442]: GetQueryObjecti64v (will be remapped) */
+   /* _mesa_function_pool[22419]: GetQueryObjecti64v (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64v\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[22492]: ClampColor (will be remapped) */
+   /* _mesa_function_pool[22469]: ClampColor (will be remapped) */
    "ii\0"
    "glClampColorARB\0"
    "glClampColor\0"
    "\0"
-   /* _mesa_function_pool[22525]: TextureRangeAPPLE (dynamic) */
+   /* _mesa_function_pool[22502]: TextureRangeAPPLE (dynamic) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[22550]: ConvolutionFilter1D (offset 348) */
+   /* _mesa_function_pool[22527]: ConvolutionFilter1D (offset 348) */
    "iiiiip\0"
    "glConvolutionFilter1D\0"
    "glConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[22605]: DrawElementsIndirect (will be remapped) */
+   /* _mesa_function_pool[22582]: DrawElementsIndirect (will be remapped) */
    "iip\0"
    "glDrawElementsIndirect\0"
    "\0"
-   /* _mesa_function_pool[22633]: WindowPos3sv (will be remapped) */
+   /* _mesa_function_pool[22610]: WindowPos3sv (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[22688]: FragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[22665]: FragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[22718]: CallLists (offset 3) */
+   /* _mesa_function_pool[22695]: CallLists (offset 3) */
    "iip\0"
    "glCallLists\0"
    "\0"
-   /* _mesa_function_pool[22735]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[22712]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[22751]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[22728]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[22765]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[22742]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[22803]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[22780]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[22818]: DepthRangex (will be remapped) */
+   /* _mesa_function_pool[22795]: DepthRangex (will be remapped) */
    "ii\0"
    "glDepthRangexOES\0"
    "glDepthRangex\0"
    "\0"
-   /* _mesa_function_pool[22853]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[22830]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[22880]: VDPAUInitNV (will be remapped) */
+   /* _mesa_function_pool[22857]: VDPAUInitNV (will be remapped) */
    "pp\0"
    "glVDPAUInitNV\0"
    "\0"
-   /* _mesa_function_pool[22898]: GetBufferParameteri64v (will be remapped) */
+   /* _mesa_function_pool[22875]: GetBufferParameteri64v (will be remapped) */
    "iip\0"
    "glGetBufferParameteri64v\0"
    "\0"
-   /* _mesa_function_pool[22928]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[22905]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[22946]: DepthRangef (will be remapped) */
+   /* _mesa_function_pool[22923]: DepthRangef (will be remapped) */
    "ff\0"
    "glDepthRangef\0"
    "glDepthRangefOES\0"
    "\0"
-   /* _mesa_function_pool[22981]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[22958]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[23009]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[22986]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[23046]: ValidateProgram (will be remapped) */
+   /* _mesa_function_pool[23023]: ValidateProgram (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[23088]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[23065]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[23114]: Scissor (offset 176) */
+   /* _mesa_function_pool[23091]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[23130]: BeginTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[23107]: BeginTransformFeedback (will be remapped) */
    "i\0"
    "glBeginTransformFeedback\0"
    "glBeginTransformFeedbackEXT\0"
    "\0"
-   /* _mesa_function_pool[23186]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[23163]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[23203]: Color4ui (offset 37) */
+   /* _mesa_function_pool[23180]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[23220]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[23197]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[23237]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[23214]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[23254]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[23231]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[23271]: PointSizePointerOES (will be remapped) */
+   /* _mesa_function_pool[23248]: PointSizePointerOES (will be remapped) */
    "iip\0"
    "glPointSizePointerOES\0"
    "\0"
-   /* _mesa_function_pool[23298]: Color4us (offset 39) */
+   /* _mesa_function_pool[23275]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[23315]: Color3bv (offset 10) */
+   /* _mesa_function_pool[23292]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[23329]: PrimitiveRestartNV (will be remapped) */
+   /* _mesa_function_pool[23306]: PrimitiveRestartNV (will be remapped) */
    "\0"
    "glPrimitiveRestartNV\0"
    "\0"
-   /* _mesa_function_pool[23352]: BindBufferOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[23329]: BindBufferOffsetEXT (will be remapped) */
    "iiii\0"
    "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[23380]: ProvokingVertex (will be remapped) */
+   /* _mesa_function_pool[23357]: ProvokingVertex (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[23422]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[23399]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[23448]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[23425]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[23480]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[23457]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[23495]: HintPGI (dynamic) */
+   /* _mesa_function_pool[23472]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[23509]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[23486]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[23534]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[23511]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[23552]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[23529]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[23569]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[23546]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[23590]: MultiTexCoord4dv (offset 401) */
+   /* _mesa_function_pool[23567]: MultiTexCoord4dv (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[23635]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[23612]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[23692]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[23669]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[23710]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[23687]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[23740]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[23717]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[23755]: EndList (offset 1) */
+   /* _mesa_function_pool[23732]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[23767]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[23744]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[23818]: GetTexGenxvOES (will be remapped) */
+   /* _mesa_function_pool[23795]: GetTexGenxvOES (will be remapped) */
    "iip\0"
    "glGetTexGenxvOES\0"
    "\0"
-   /* _mesa_function_pool[23840]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[23817]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[23858]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[23835]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[23880]: BlendFunciARB (will be remapped) */
+   /* _mesa_function_pool[23857]: BlendFunciARB (will be remapped) */
    "iii\0"
    "glBlendFunciARB\0"
    "glBlendFuncIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[23923]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[23900]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[23950]: Uniform2ui (will be remapped) */
+   /* _mesa_function_pool[23927]: Uniform2ui (will be remapped) */
    "iii\0"
    "glUniform2uiEXT\0"
    "glUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[23984]: ScissorIndexed (will be remapped) */
+   /* _mesa_function_pool[23961]: ScissorIndexed (will be remapped) */
    "iiiii\0"
    "glScissorIndexed\0"
    "\0"
-   /* _mesa_function_pool[24008]: End (offset 43) */
+   /* _mesa_function_pool[23985]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[24016]: GetSamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[23993]: GetSamplerParameteriv (will be remapped) */
    "iip\0"
    "glGetSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[24045]: GenProgramPipelines (will be remapped) */
+   /* _mesa_function_pool[24022]: GenProgramPipelines (will be remapped) */
    "ip\0"
    "glGenProgramPipelines\0"
    "\0"
-   /* _mesa_function_pool[24071]: Enable (offset 215) */
+   /* _mesa_function_pool[24048]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[24083]: IsProgramPipeline (will be remapped) */
+   /* _mesa_function_pool[24060]: IsProgramPipeline (will be remapped) */
    "i\0"
    "glIsProgramPipeline\0"
    "\0"
-   /* _mesa_function_pool[24106]: ShaderBinary (will be remapped) */
+   /* _mesa_function_pool[24083]: ShaderBinary (will be remapped) */
    "ipipi\0"
    "glShaderBinary\0"
    "\0"
-   /* _mesa_function_pool[24128]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[24105]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[24161]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[24138]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "glWeightPointerOES\0"
    "\0"
-   /* _mesa_function_pool[24205]: Normal3x (will be remapped) */
+   /* _mesa_function_pool[24182]: Normal3x (will be remapped) */
    "iii\0"
    "glNormal3xOES\0"
    "glNormal3x\0"
    "\0"
-   /* _mesa_function_pool[24235]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[24212]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[24279]: ReadnPixelsARB (will be remapped) */
+   /* _mesa_function_pool[24256]: ReadnPixelsARB (will be remapped) */
    "iiiiiiip\0"
    "glReadnPixelsARB\0"
    "\0"
-   /* _mesa_function_pool[24306]: InvalidateTexSubImage (will be remapped) */
+   /* _mesa_function_pool[24283]: InvalidateTexSubImage (will be remapped) */
    "iiiiiiii\0"
    "glInvalidateTexSubImage\0"
    "\0"
-   /* _mesa_function_pool[24340]: Normal3s (offset 60) */
+   /* _mesa_function_pool[24317]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[24356]: Materialxv (will be remapped) */
+   /* _mesa_function_pool[24333]: Materialxv (will be remapped) */
    "iip\0"
    "glMaterialxvOES\0"
    "glMaterialxv\0"
    "\0"
-   /* _mesa_function_pool[24390]: Normal3i (offset 58) */
+   /* _mesa_function_pool[24367]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[24406]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[24383]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[24441]: Normal3b (offset 52) */
+   /* _mesa_function_pool[24418]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[24457]: Normal3d (offset 54) */
+   /* _mesa_function_pool[24434]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[24473]: Normal3f (offset 56) */
+   /* _mesa_function_pool[24450]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[24489]: Indexi (offset 48) */
+   /* _mesa_function_pool[24466]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[24501]: Uniform1uiv (will be remapped) */
+   /* _mesa_function_pool[24478]: Uniform1uiv (will be remapped) */
    "iip\0"
    "glUniform1uivEXT\0"
    "glUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[24537]: VertexAttribI2uiEXT (will be remapped) */
+   /* _mesa_function_pool[24514]: VertexAttribI2uiEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2uiEXT\0"
    "glVertexAttribI2ui\0"
    "\0"
-   /* _mesa_function_pool[24583]: IsRenderbuffer (will be remapped) */
+   /* _mesa_function_pool[24560]: IsRenderbuffer (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "glIsRenderbufferOES\0"
    "\0"
-   /* _mesa_function_pool[24643]: NormalP3uiv (will be remapped) */
+   /* _mesa_function_pool[24620]: NormalP3uiv (will be remapped) */
    "ip\0"
    "glNormalP3uiv\0"
    "\0"
-   /* _mesa_function_pool[24661]: Indexf (offset 46) */
+   /* _mesa_function_pool[24638]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[24673]: Indexd (offset 44) */
+   /* _mesa_function_pool[24650]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[24685]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[24662]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[24706]: Indexs (offset 50) */
+   /* _mesa_function_pool[24683]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[24718]: MultiTexCoordP1uiv (will be remapped) */
+   /* _mesa_function_pool[24695]: MultiTexCoordP1uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP1uiv\0"
    "\0"
-   /* _mesa_function_pool[24744]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[24721]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[24800]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[24777]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[24815]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[24792]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[24830]: Color4bv (offset 26) */
+   /* _mesa_function_pool[24807]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[24844]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[24821]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[24868]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[24845]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[24883]: ActiveTexture (offset 374) */
+   /* _mesa_function_pool[24860]: ActiveTexture (offset 374) */
    "i\0"
    "glActiveTexture\0"
    "glActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[24921]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[24898]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[24948]: ColorP4uiv (will be remapped) */
+   /* _mesa_function_pool[24925]: ColorP4uiv (will be remapped) */
    "ip\0"
    "glColorP4uiv\0"
    "\0"
-   /* _mesa_function_pool[24965]: DrawTexxOES (will be remapped) */
+   /* _mesa_function_pool[24942]: DrawTexxOES (will be remapped) */
    "iiiii\0"
    "glDrawTexxOES\0"
    "\0"
-   /* _mesa_function_pool[24986]: SetFenceNV (dynamic) */
+   /* _mesa_function_pool[24963]: SetFenceNV (dynamic) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[25003]: PixelTexGenParameterivSGIS (dynamic) */
+   /* _mesa_function_pool[24980]: PixelTexGenParameterivSGIS (dynamic) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[25036]: MultiTexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[25013]: MultiTexCoordP3ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[25061]: GetAttribLocation (will be remapped) */
+   /* _mesa_function_pool[25038]: GetAttribLocation (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[25108]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[25085]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[25145]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[25122]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[25161]: MultiTexCoord2dv (offset 385) */
+   /* _mesa_function_pool[25138]: MultiTexCoord2dv (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[25206]: IsSampler (will be remapped) */
+   /* _mesa_function_pool[25183]: IsSampler (will be remapped) */
    "i\0"
    "glIsSampler\0"
    "\0"
-   /* _mesa_function_pool[25221]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[25198]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[25237]: LineStipple (offset 167) */
+   /* _mesa_function_pool[25214]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[25255]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[25232]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[25274]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[25251]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[25294]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[25271]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[25312]: TexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[25289]: TexCoordP2ui (will be remapped) */
    "ii\0"
    "glTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[25331]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[25308]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[25353]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[25330]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[25396]: ProgramUniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[25373]: ProgramUniformMatrix3x4fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[25431]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[25408]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[25466]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[25443]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[25495]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[25472]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[25555]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[25532]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[25573]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[25550]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[25617]: Frustum (offset 289) */
+   /* _mesa_function_pool[25594]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[25635]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[25612]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[25653]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[25630]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[25671]: DepthRangeArrayv (will be remapped) */
+   /* _mesa_function_pool[25648]: DepthRangeArrayv (will be remapped) */
    "iip\0"
    "glDepthRangeArrayv\0"
    "\0"
-   /* _mesa_function_pool[25695]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[25672]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[25736]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[25713]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[25764]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[25741]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[25782]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[25759]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[25816]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[25793]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[25850]: GenPerfMonitorsAMD (will be remapped) */
+   /* _mesa_function_pool[25827]: GenPerfMonitorsAMD (will be remapped) */
    "ip\0"
    "glGenPerfMonitorsAMD\0"
    "\0"
-   /* _mesa_function_pool[25875]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[25852]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[25894]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[25871]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[25910]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[25887]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[25927]: TexStorage3D (will be remapped) */
+   /* _mesa_function_pool[25904]: TexStorage3D (will be remapped) */
    "iiiiii\0"
    "glTexStorage3D\0"
    "\0"
-   /* _mesa_function_pool[25950]: FramebufferTexture3D (will be remapped) */
+   /* _mesa_function_pool[25927]: FramebufferTexture3D (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "glFramebufferTexture3DOES\0"
    "\0"
-   /* _mesa_function_pool[26033]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[26010]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[26064]: GetBufferParameteriv (will be remapped) */
+   /* _mesa_function_pool[26041]: GetBufferParameteriv (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[26118]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[26095]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[26142]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[26119]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[26172]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[26149]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[26219]: DebugMessageInsertARB (will be remapped) */
-   "iiiiip\0"
-   "glDebugMessageInsertARB\0"
-   "\0"
-   /* _mesa_function_pool[26251]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[26196]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[26266]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[26211]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[26288]: CreateShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[26233]: CreateShaderProgramEXT (will be remapped) */
    "ip\0"
    "glCreateShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[26317]: VertexAttribs1dvNV (will be remapped) */
+   /* _mesa_function_pool[26262]: VertexAttribs1dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1dvNV\0"
    "\0"
-   /* _mesa_function_pool[26343]: IsQuery (will be remapped) */
+   /* _mesa_function_pool[26288]: IsQuery (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[26369]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[26314]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[26395]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[26340]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[26421]: CreateShaderProgramv (will be remapped) */
+   /* _mesa_function_pool[26366]: CreateShaderProgramv (will be remapped) */
    "iip\0"
    "glCreateShaderProgramv\0"
    "\0"
-   /* _mesa_function_pool[26449]: BlendEquationiARB (will be remapped) */
+   /* _mesa_function_pool[26394]: BlendEquationiARB (will be remapped) */
    "ii\0"
    "glBlendEquationiARB\0"
    "glBlendEquationIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[26499]: VertexAttribI4uivEXT (will be remapped) */
+   /* _mesa_function_pool[26444]: VertexAttribI4uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4uivEXT\0"
    "glVertexAttribI4uiv\0"
    "\0"
-   /* _mesa_function_pool[26546]: PointSizex (will be remapped) */
+   /* _mesa_function_pool[26491]: PointSizex (will be remapped) */
    "i\0"
    "glPointSizexOES\0"
    "glPointSizex\0"
    "\0"
-   /* _mesa_function_pool[26578]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[26523]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[26596]: SecondaryColor3iv (will be remapped) */
+   /* _mesa_function_pool[26541]: SecondaryColor3iv (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[26642]: VertexAttribI1iEXT (will be remapped) */
+   /* _mesa_function_pool[26587]: VertexAttribI1iEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1iEXT\0"
    "glVertexAttribI1i\0"
    "\0"
-   /* _mesa_function_pool[26685]: VertexAttrib4Niv (will be remapped) */
+   /* _mesa_function_pool[26630]: VertexAttrib4Niv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[26730]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[26675]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[26764]: GetnUniformdvARB (will be remapped) */
+   /* _mesa_function_pool[26709]: GetnUniformdvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformdvARB\0"
    "\0"
-   /* _mesa_function_pool[26789]: LinkProgram (will be remapped) */
+   /* _mesa_function_pool[26734]: LinkProgram (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[26823]: ProgramUniform4f (will be remapped) */
+   /* _mesa_function_pool[26768]: ProgramUniform4f (will be remapped) */
    "iiffff\0"
    "glProgramUniform4f\0"
    "\0"
-   /* _mesa_function_pool[26850]: ProgramUniform4i (will be remapped) */
+   /* _mesa_function_pool[26795]: ProgramUniform4i (will be remapped) */
    "iiiiii\0"
    "glProgramUniform4i\0"
    "\0"
-   /* _mesa_function_pool[26877]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[26822]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[26904]: VertexAttrib4d (will be remapped) */
+   /* _mesa_function_pool[26849]: VertexAttrib4d (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[26948]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[26893]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[26972]: VertexAttrib4s (will be remapped) */
+   /* _mesa_function_pool[26917]: VertexAttrib4s (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[27016]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[26961]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[27040]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[26985]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[27073]: TexStorage3DMultisample (will be remapped) */
+   /* _mesa_function_pool[27018]: TexStorage3DMultisample (will be remapped) */
    "iiiiiii\0"
    "glTexStorage3DMultisample\0"
    "\0"
-   /* _mesa_function_pool[27108]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[27053]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[27128]: SamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[27073]: SamplerParameteriv (will be remapped) */
    "iip\0"
    "glSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[27154]: VertexAttribP3uiv (will be remapped) */
+   /* _mesa_function_pool[27099]: VertexAttribP3uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP3uiv\0"
    "\0"
-   /* _mesa_function_pool[27180]: ScissorIndexedv (will be remapped) */
+   /* _mesa_function_pool[27125]: ScissorIndexedv (will be remapped) */
    "ip\0"
    "glScissorIndexedv\0"
    "\0"
-   /* _mesa_function_pool[27202]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[27147]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[27232]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[27177]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[27264]: GetStringi (will be remapped) */
+   /* _mesa_function_pool[27209]: GetStringi (will be remapped) */
    "ii\0"
    "glGetStringi\0"
    "\0"
-   /* _mesa_function_pool[27281]: VertexAttrib4dv (will be remapped) */
+   /* _mesa_function_pool[27226]: VertexAttrib4dv (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[27324]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[27269]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[27342]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[27287]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[27365]: CompressedTexSubImage1D (will be remapped) */
+   /* _mesa_function_pool[27310]: CompressedTexSubImage1D (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[27429]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[27374]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[27482]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[27427]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[27508]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[27453]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[27530]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[27475]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[27548]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[27493]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[27571]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[27516]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[27621]: GetnSeparableFilterARB (will be remapped) */
+   /* _mesa_function_pool[27566]: GetnSeparableFilterARB (will be remapped) */
    "iiiipipp\0"
    "glGetnSeparableFilterARB\0"
    "\0"
-   /* _mesa_function_pool[27656]: FrontFace (offset 157) */
+   /* _mesa_function_pool[27601]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[27671]: MultiModeDrawArraysIBM (will be remapped) */
+   /* _mesa_function_pool[27616]: MultiModeDrawArraysIBM (will be remapped) */
    "pppii\0"
    "glMultiModeDrawArraysIBM\0"
    "\0"
-   /* _mesa_function_pool[27703]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[27648]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[27722]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[27667]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[27742]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[27687]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[27757]: Lightf (offset 159) */
+   /* _mesa_function_pool[27702]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[27771]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[27716]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[27787]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[27732]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[27808]: Lighti (offset 161) */
+   /* _mesa_function_pool[27753]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[27822]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[27767]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[27853]: GetFragDataIndex (will be remapped) */
+   /* _mesa_function_pool[27798]: GetFragDataIndex (will be remapped) */
    "ip\0"
    "glGetFragDataIndex\0"
    "\0"
-   /* _mesa_function_pool[27876]: Lightx (will be remapped) */
+   /* _mesa_function_pool[27821]: Lightx (will be remapped) */
    "iii\0"
    "glLightxOES\0"
    "glLightx\0"
    "\0"
-   /* _mesa_function_pool[27902]: ProgramUniform3fv (will be remapped) */
+   /* _mesa_function_pool[27847]: ProgramUniform3fv (will be remapped) */
    "iiip\0"
    "glProgramUniform3fv\0"
    "\0"
-   /* _mesa_function_pool[27928]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[27873]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[27945]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[27890]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[27962]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[27907]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[28007]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[27952]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[28034]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[27979]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[28056]: MultMatrixx (will be remapped) */
+   /* _mesa_function_pool[28001]: MultMatrixx (will be remapped) */
    "p\0"
    "glMultMatrixxOES\0"
    "glMultMatrixx\0"
    "\0"
-   /* _mesa_function_pool[28090]: PointParameterx (will be remapped) */
+   /* _mesa_function_pool[28035]: PointParameterx (will be remapped) */
    "ii\0"
    "glPointParameterxOES\0"
    "glPointParameterx\0"
    "\0"
-   /* _mesa_function_pool[28133]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[28078]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[28167]: PointParameteri (will be remapped) */
+   /* _mesa_function_pool[28112]: PointParameteri (will be remapped) */
    "ii\0"
    "glPointParameteri\0"
    "glPointParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[28209]: PointParameterf (will be remapped) */
+   /* _mesa_function_pool[28154]: PointParameterf (will be remapped) */
    "if\0"
    "glPointParameterf\0"
    "glPointParameterfARB\0"
    "glPointParameterfEXT\0"
    "glPointParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[28295]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[28240]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[28322]: VertexAttribBinding (will be remapped) */
+   /* _mesa_function_pool[28267]: VertexAttribBinding (will be remapped) */
    "ii\0"
    "glVertexAttribBinding\0"
    "\0"
-   /* _mesa_function_pool[28348]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[28293]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[28395]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[28340]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[28413]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[28358]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[28445]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[28390]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[28480]: DeleteBuffers (will be remapped) */
+   /* _mesa_function_pool[28425]: DeleteBuffers (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[28519]: GetBufferSubData (will be remapped) */
+   /* _mesa_function_pool[28464]: GetBufferSubData (will be remapped) */
    "iiip\0"
    "glGetBufferSubData\0"
    "glGetBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[28566]: GetPerfMonitorGroupsAMD (will be remapped) */
+   /* _mesa_function_pool[28511]: GetPerfMonitorGroupsAMD (will be remapped) */
    "pip\0"
    "glGetPerfMonitorGroupsAMD\0"
    "\0"
-   /* _mesa_function_pool[28597]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[28542]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[28617]: VertexAttribP2ui (will be remapped) */
+   /* _mesa_function_pool[28562]: VertexAttribP2ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP2ui\0"
    "\0"
-   /* _mesa_function_pool[28642]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[28587]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[28696]: DrawTexivOES (will be remapped) */
+   /* _mesa_function_pool[28641]: DrawTexivOES (will be remapped) */
    "p\0"
    "glDrawTexivOES\0"
    "\0"
-   /* _mesa_function_pool[28714]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[28659]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[28760]: GetnColorTableARB (will be remapped) */
+   /* _mesa_function_pool[28705]: GetnColorTableARB (will be remapped) */
    "iiiip\0"
    "glGetnColorTableARB\0"
    "\0"
-   /* _mesa_function_pool[28787]: VertexAttribFormat (will be remapped) */
+   /* _mesa_function_pool[28732]: VertexAttribFormat (will be remapped) */
    "iiiii\0"
    "glVertexAttribFormat\0"
    "\0"
-   /* _mesa_function_pool[28815]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[28760]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[28831]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[28776]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[28847]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[28792]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[28863]: GetProgramPipelineiv (will be remapped) */
+   /* _mesa_function_pool[28808]: GetProgramPipelineiv (will be remapped) */
    "iip\0"
    "glGetProgramPipelineiv\0"
    "\0"
-   /* _mesa_function_pool[28891]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[28836]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "glReadBufferNV\0"
    "\0"
-   /* _mesa_function_pool[28922]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[28867]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[28978]: GetTexParameterIiv (will be remapped) */
+   /* _mesa_function_pool[28923]: GetTexParameterIiv (will be remapped) */
    "iip\0"
    "glGetTexParameterIivEXT\0"
    "glGetTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[29028]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[28973]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[29044]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[28989]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[29100]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[29045]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[29192]: GetTransformFeedbackVarying (will be remapped) */
+   /* _mesa_function_pool[29137]: GetTransformFeedbackVarying (will be remapped) */
    "iiipppp\0"
    "glGetTransformFeedbackVarying\0"
    "glGetTransformFeedbackVaryingEXT\0"
    "\0"
-   /* _mesa_function_pool[29264]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[29209]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[29281]: TextureBarrierNV (will be remapped) */
+   /* _mesa_function_pool[29226]: TextureBarrierNV (will be remapped) */
    "\0"
    "glTextureBarrierNV\0"
    "\0"
-   /* _mesa_function_pool[29302]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[29247]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[29361]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[29306]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[29398]: ObjectLabel (will be remapped) */
+   /* _mesa_function_pool[29343]: ObjectLabel (will be remapped) */
    "iiip\0"
    "glObjectLabel\0"
    "\0"
-   /* _mesa_function_pool[29418]: PauseTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[29363]: PauseTransformFeedback (will be remapped) */
    "\0"
    "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[29445]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[29390]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[29463]: CompileShader (will be remapped) */
+   /* _mesa_function_pool[29408]: CompileShader (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[29501]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[29446]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[29516]: TexGendv (offset 189) */
+   /* _mesa_function_pool[29461]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[29532]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[29477]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[29569]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[29514]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[29603]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[29548]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[29630]: DeleteProgramsARB (will be remapped) */
+   /* _mesa_function_pool[29575]: DeleteProgramsARB (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[29673]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[29618]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[29689]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[29634]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[29715]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[29660]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[29733]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[29678]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[29764]: MultiDrawArrays (will be remapped) */
+   /* _mesa_function_pool[29709]: MultiDrawArrays (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[29809]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[29754]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[29846]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[29791]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "glMapBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[29889]: DispatchCompute (will be remapped) */
+   /* _mesa_function_pool[29834]: DispatchCompute (will be remapped) */
    "iii\0"
    "glDispatchCompute\0"
    "\0"
-   /* _mesa_function_pool[29912]: UseProgramStages (will be remapped) */
+   /* _mesa_function_pool[29857]: UseProgramStages (will be remapped) */
    "iii\0"
    "glUseProgramStages\0"
    "\0"
-   /* _mesa_function_pool[29936]: ProgramUniformMatrix4fv (will be remapped) */
+   /* _mesa_function_pool[29881]: ProgramUniformMatrix4fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix4fv\0"
    "\0"
-   /* _mesa_function_pool[29969]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[29914]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[29990]: FramebufferRenderbuffer (will be remapped) */
+   /* _mesa_function_pool[29935]: FramebufferRenderbuffer (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "glFramebufferRenderbufferOES\0"
    "\0"
-   /* _mesa_function_pool[30080]: IsProgramARB (will be remapped) */
+   /* _mesa_function_pool[30025]: IsProgramARB (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[30112]: Map2d (offset 222) */
+   /* _mesa_function_pool[30057]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[30132]: Map2f (offset 223) */
+   /* _mesa_function_pool[30077]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[30152]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[30097]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[30177]: MultiTexCoord4x (will be remapped) */
+   /* _mesa_function_pool[30122]: MultiTexCoord4x (will be remapped) */
    "iiiii\0"
    "glMultiTexCoord4xOES\0"
    "glMultiTexCoord4x\0"
    "\0"
-   /* _mesa_function_pool[30223]: MultiTexCoord4s (offset 406) */
+   /* _mesa_function_pool[30168]: MultiTexCoord4s (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[30269]: ViewportIndexedf (will be remapped) */
+   /* _mesa_function_pool[30214]: ViewportIndexedf (will be remapped) */
    "iffff\0"
    "glViewportIndexedf\0"
    "\0"
-   /* _mesa_function_pool[30295]: MultiTexCoord4i (offset 404) */
+   /* _mesa_function_pool[30240]: MultiTexCoord4i (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[30341]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[30286]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[30362]: DebugMessageControl (will be remapped) */
+   /* _mesa_function_pool[30307]: DebugMessageControl (will be remapped) */
    "iiiipi\0"
+   "glDebugMessageControlARB\0"
    "glDebugMessageControl\0"
    "\0"
-   /* _mesa_function_pool[30392]: MultiTexCoord4d (offset 400) */
+   /* _mesa_function_pool[30362]: MultiTexCoord4d (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[30438]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[30408]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[30478]: Translatex (will be remapped) */
+   /* _mesa_function_pool[30448]: Translatex (will be remapped) */
    "iii\0"
    "glTranslatexOES\0"
    "glTranslatex\0"
    "\0"
-   /* _mesa_function_pool[30512]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[30482]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[30537]: Indexsv (offset 51) */
+   /* _mesa_function_pool[30507]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[30550]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[30520]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[30593]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[30563]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[30610]: Translated (offset 303) */
+   /* _mesa_function_pool[30580]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[30628]: Translatef (offset 304) */
+   /* _mesa_function_pool[30598]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[30646]: MultTransposeMatrixd (will be remapped) */
+   /* _mesa_function_pool[30616]: MultTransposeMatrixd (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[30698]: ProgramUniform4uiv (will be remapped) */
+   /* _mesa_function_pool[30668]: ProgramUniform4uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[30725]: RenderMode (offset 196) */
+   /* _mesa_function_pool[30695]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[30741]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[30711]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[30784]: SecondaryColor3d (will be remapped) */
+   /* _mesa_function_pool[30754]: SecondaryColor3d (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[30830]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[30800]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[30857]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[30827]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[30875]: ProgramUniform4fv (will be remapped) */
+   /* _mesa_function_pool[30845]: ProgramUniform4fv (will be remapped) */
    "iiip\0"
    "glProgramUniform4fv\0"
    "\0"
-   /* _mesa_function_pool[30901]: LightModelxv (will be remapped) */
+   /* _mesa_function_pool[30871]: LightModelxv (will be remapped) */
    "ip\0"
    "glLightModelxvOES\0"
    "glLightModelxv\0"
    "\0"
-   /* _mesa_function_pool[30938]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[30908]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[30989]: PushDebugGroup (will be remapped) */
+   /* _mesa_function_pool[30959]: PushDebugGroup (will be remapped) */
    "iiip\0"
    "glPushDebugGroup\0"
    "\0"
-   /* _mesa_function_pool[31012]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[30982]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[31031]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[31001]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[31051]: TexGenxvOES (will be remapped) */
+   /* _mesa_function_pool[31021]: TexGenxvOES (will be remapped) */
    "iip\0"
    "glTexGenxvOES\0"
    "\0"
-   /* _mesa_function_pool[31070]: VertexAttrib4Nubv (will be remapped) */
+   /* _mesa_function_pool[31040]: VertexAttrib4Nubv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[31117]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[31087]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[31137]: VertexP2uiv (will be remapped) */
+   /* _mesa_function_pool[31107]: VertexP2uiv (will be remapped) */
    "ip\0"
    "glVertexP2uiv\0"
    "\0"
-   /* _mesa_function_pool[31155]: VertexAttribPointer (will be remapped) */
+   /* _mesa_function_pool[31125]: VertexAttribPointer (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[31210]: IndexMask (offset 212) */
+   /* _mesa_function_pool[31180]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[31225]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[31195]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[31251]: VertexAttribIFormat (will be remapped) */
+   /* _mesa_function_pool[31221]: VertexAttribIFormat (will be remapped) */
    "iiii\0"
    "glVertexAttribIFormat\0"
    "\0"
-   /* _mesa_function_pool[31279]: CombinerOutputNV (dynamic) */
+   /* _mesa_function_pool[31249]: CombinerOutputNV (dynamic) */
    "iiiiiiiiii\0"
    "glCombinerOutputNV\0"
    "\0"
-   /* _mesa_function_pool[31310]: DrawArraysInstancedBaseInstance (will be remapped) */
+   /* _mesa_function_pool[31280]: DrawArraysInstancedBaseInstance (will be remapped) */
    "iiiii\0"
    "glDrawArraysInstancedBaseInstance\0"
    "\0"
-   /* _mesa_function_pool[31351]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[31321]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[31365]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[31335]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[31407]: Uniform3ui (will be remapped) */
+   /* _mesa_function_pool[31377]: Uniform3ui (will be remapped) */
    "iiii\0"
    "glUniform3uiEXT\0"
    "glUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[31442]: DeletePerfMonitorsAMD (will be remapped) */
+   /* _mesa_function_pool[31412]: DeletePerfMonitorsAMD (will be remapped) */
    "ip\0"
    "glDeletePerfMonitorsAMD\0"
    "\0"
-   /* _mesa_function_pool[31470]: Color4dv (offset 28) */
+   /* _mesa_function_pool[31440]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[31484]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[31454]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[31513]: DisableVertexAttribArray (will be remapped) */
+   /* _mesa_function_pool[31483]: DisableVertexAttribArray (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[31573]: ProgramUniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[31543]: ProgramUniformMatrix3x2fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[31608]: GetDoublei_v (will be remapped) */
+   /* _mesa_function_pool[31578]: GetDoublei_v (will be remapped) */
    "iip\0"
    "glGetDoublei_v\0"
    "\0"
-   /* _mesa_function_pool[31628]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[31598]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[31653]: ClipPlanex (will be remapped) */
+   /* _mesa_function_pool[31623]: ClipPlanex (will be remapped) */
    "ip\0"
    "glClipPlanexOES\0"
    "glClipPlanex\0"
    "\0"
-   /* _mesa_function_pool[31686]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[31656]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[31733]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[31703]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[31751]: ClipPlanef (will be remapped) */
+   /* _mesa_function_pool[31721]: ClipPlanef (will be remapped) */
    "ip\0"
    "glClipPlanefOES\0"
    "glClipPlanef\0"
    "\0"
-   /* _mesa_function_pool[31784]: ProgramUniform1ui (will be remapped) */
+   /* _mesa_function_pool[31754]: ProgramUniform1ui (will be remapped) */
    "iii\0"
    "glProgramUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[31809]: SecondaryColorPointer (will be remapped) */
+   /* _mesa_function_pool[31779]: SecondaryColorPointer (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[31866]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[31836]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[31885]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[31855]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[31905]: Indexub (offset 315) */
+   /* _mesa_function_pool[31875]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[31918]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[31888]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[31944]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[31914]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[31971]: GenRenderbuffers (will be remapped) */
+   /* _mesa_function_pool[31941]: GenRenderbuffers (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "glGenRenderbuffersOES\0"
    "\0"
-   /* _mesa_function_pool[32038]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[32008]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[32092]: IsEnabledi (will be remapped) */
+   /* _mesa_function_pool[32062]: IsEnabledi (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "glIsEnabledi\0"
    "\0"
-   /* _mesa_function_pool[32131]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[32101]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[32161]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[32131]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[32177]: GetVertexAttribPointerv (will be remapped) */
+   /* _mesa_function_pool[32147]: GetVertexAttribPointerv (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[32265]: NewList (dynamic) */
+   /* _mesa_function_pool[32235]: NewList (dynamic) */
    "ii\0"
    "glNewList\0"
    "\0"
-   /* _mesa_function_pool[32279]: TexBuffer (will be remapped) */
+   /* _mesa_function_pool[32249]: TexBuffer (will be remapped) */
    "iii\0"
    "glTexBufferARB\0"
    "glTexBuffer\0"
    "\0"
-   /* _mesa_function_pool[32311]: TexCoord4sv (offset 125) */
+   /* _mesa_function_pool[32281]: TexCoord4sv (offset 125) */
    "p\0"
    "glTexCoord4sv\0"
    "\0"
-   /* _mesa_function_pool[32328]: TexCoord1f (offset 96) */
+   /* _mesa_function_pool[32298]: TexCoord1f (offset 96) */
    "f\0"
    "glTexCoord1f\0"
    "\0"
-   /* _mesa_function_pool[32344]: TexCoord1d (offset 94) */
+   /* _mesa_function_pool[32314]: TexCoord1d (offset 94) */
    "d\0"
    "glTexCoord1d\0"
    "\0"
-   /* _mesa_function_pool[32360]: TexCoord1i (offset 98) */
+   /* _mesa_function_pool[32330]: TexCoord1i (offset 98) */
    "i\0"
    "glTexCoord1i\0"
    "\0"
-   /* _mesa_function_pool[32376]: GetnUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[32346]: GetnUniformfvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[32401]: TexCoord1s (offset 100) */
+   /* _mesa_function_pool[32371]: TexCoord1s (offset 100) */
    "i\0"
    "glTexCoord1s\0"
    "\0"
-   /* _mesa_function_pool[32417]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[32387]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[32444]: TexStorage1D (will be remapped) */
+   /* _mesa_function_pool[32414]: TexStorage1D (will be remapped) */
    "iiii\0"
    "glTexStorage1D\0"
    "\0"
-   /* _mesa_function_pool[32465]: BlitFramebuffer (will be remapped) */
+   /* _mesa_function_pool[32435]: BlitFramebuffer (will be remapped) */
    "iiiiiiiiii\0"
    "glBlitFramebuffer\0"
    "glBlitFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[32516]: FramebufferTexture1D (will be remapped) */
+   /* _mesa_function_pool[32486]: FramebufferTexture1D (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[32572]: GetMapiv (offset 268) */
+   /* _mesa_function_pool[32542]: GetMapiv (offset 268) */
    "iip\0"
    "glGetMapiv\0"
    "\0"
-   /* _mesa_function_pool[32588]: TexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[32558]: TexCoordP4ui (will be remapped) */
    "ii\0"
    "glTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[32607]: VertexAttrib1sv (will be remapped) */
+   /* _mesa_function_pool[32577]: VertexAttrib1sv (will be remapped) */
    "ip\0"
    "glVertexAttrib1sv\0"
    "glVertexAttrib1svARB\0"
    "\0"
-   /* _mesa_function_pool[32650]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[32620]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[32674]: Vertex3dv (offset 135) */
+   /* _mesa_function_pool[32644]: Vertex3dv (offset 135) */
    "p\0"
    "glVertex3dv\0"
    "\0"
-   /* _mesa_function_pool[32689]: MultiTexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[32659]: MultiTexCoordP2ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[32714]: GetnMapivARB (will be remapped) */
+   /* _mesa_function_pool[32684]: GetnMapivARB (will be remapped) */
    "iiip\0"
    "glGetnMapivARB\0"
    "\0"
-   /* _mesa_function_pool[32735]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[32705]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[32759]: GetVertexAttribfv (will be remapped) */
+   /* _mesa_function_pool[32729]: GetVertexAttribfv (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[32807]: MultiTexCoordP4uiv (will be remapped) */
+   /* _mesa_function_pool[32777]: MultiTexCoordP4uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP4uiv\0"
    "\0"
-   /* _mesa_function_pool[32833]: TexGeniv (offset 193) */
+   /* _mesa_function_pool[32803]: TexGeniv (offset 193) */
    "iip\0"
    "glTexGeniv\0"
    "glTexGenivOES\0"
    "\0"
-   /* _mesa_function_pool[32863]: WeightubvARB (dynamic) */
+   /* _mesa_function_pool[32833]: WeightubvARB (dynamic) */
    "ip\0"
    "glWeightubvARB\0"
    "\0"
-   /* _mesa_function_pool[32882]: BlendColor (offset 336) */
+   /* _mesa_function_pool[32852]: BlendColor (offset 336) */
    "ffff\0"
    "glBlendColor\0"
    "glBlendColorEXT\0"
    "\0"
-   /* _mesa_function_pool[32917]: Materiali (offset 171) */
+   /* _mesa_function_pool[32887]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[32934]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[32904]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[32958]: ResetHistogram (offset 369) */
+   /* _mesa_function_pool[32928]: ResetHistogram (offset 369) */
    "i\0"
    "glResetHistogram\0"
    "glResetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[32998]: CompressedTexSubImage2D (will be remapped) */
+   /* _mesa_function_pool[32968]: CompressedTexSubImage2D (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexSubImage2D\0"
    "glCompressedTexSubImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[33064]: TexCoord2sv (offset 109) */
+   /* _mesa_function_pool[33034]: TexCoord2sv (offset 109) */
    "p\0"
    "glTexCoord2sv\0"
    "\0"
-   /* _mesa_function_pool[33081]: StencilMaskSeparate (will be remapped) */
+   /* _mesa_function_pool[33051]: StencilMaskSeparate (will be remapped) */
    "ii\0"
    "glStencilMaskSeparate\0"
    "\0"
-   /* _mesa_function_pool[33107]: MultiTexCoord3sv (offset 399) */
+   /* _mesa_function_pool[33077]: MultiTexCoord3sv (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[33152]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[33122]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[33179]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[33149]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[33196]: MultiTexCoord4sv (offset 407) */
+   /* _mesa_function_pool[33166]: MultiTexCoord4sv (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[33241]: VertexBindingDivisor (will be remapped) */
+   /* _mesa_function_pool[33211]: VertexBindingDivisor (will be remapped) */
    "ii\0"
    "glVertexBindingDivisor\0"
    "\0"
-   /* _mesa_function_pool[33268]: GetPerfMonitorCounterInfoAMD (will be remapped) */
+   /* _mesa_function_pool[33238]: GetPerfMonitorCounterInfoAMD (will be remapped) */
    "iiip\0"
    "glGetPerfMonitorCounterInfoAMD\0"
    "\0"
-   /* _mesa_function_pool[33305]: UniformBlockBinding (will be remapped) */
+   /* _mesa_function_pool[33275]: UniformBlockBinding (will be remapped) */
    "iii\0"
    "glUniformBlockBinding\0"
    "\0"
-   /* _mesa_function_pool[33332]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[33302]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[33348]: VertexAttrib4Nusv (will be remapped) */
+   /* _mesa_function_pool[33318]: VertexAttrib4Nusv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nusv\0"
    "glVertexAttrib4NusvARB\0"
    "\0"
-   /* _mesa_function_pool[33395]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[33365]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[33430]: VertexP2ui (will be remapped) */
+   /* _mesa_function_pool[33400]: VertexP2ui (will be remapped) */
    "ii\0"
    "glVertexP2ui\0"
    "\0"
-   /* _mesa_function_pool[33447]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[33417]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[33466]: BindAttribLocation (will be remapped) */
+   /* _mesa_function_pool[33436]: BindAttribLocation (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[33516]: TextureStorage2DEXT (will be remapped) */
+   /* _mesa_function_pool[33486]: TextureStorage2DEXT (will be remapped) */
    "iiiiii\0"
    "glTextureStorage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[33546]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[33516]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[33572]: DrawTransformFeedbackInstanced (will be remapped) */
+   /* _mesa_function_pool[33542]: DrawTransformFeedbackInstanced (will be remapped) */
    "iii\0"
    "glDrawTransformFeedbackInstanced\0"
    "\0"
-   /* _mesa_function_pool[33610]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[33580]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[33629]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[33599]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[33657]: GetProgramNamedParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[33627]: GetProgramNamedParameterdvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[33694]: VertexAttribI1iv (will be remapped) */
+   /* _mesa_function_pool[33664]: VertexAttribI1iv (will be remapped) */
    "ip\0"
    "glVertexAttribI1ivEXT\0"
    "glVertexAttribI1iv\0"
    "\0"
-   /* _mesa_function_pool[33739]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[33709]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[33754]: VertexAttribI2uivEXT (will be remapped) */
+   /* _mesa_function_pool[33724]: VertexAttribI2uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2uivEXT\0"
    "glVertexAttribI2uiv\0"
    "\0"
-   /* _mesa_function_pool[33801]: SampleMaski (will be remapped) */
+   /* _mesa_function_pool[33771]: SampleMaski (will be remapped) */
    "ii\0"
    "glSampleMaski\0"
    "\0"
-   /* _mesa_function_pool[33819]: GetFloati_v (will be remapped) */
+   /* _mesa_function_pool[33789]: GetFloati_v (will be remapped) */
    "iip\0"
    "glGetFloati_v\0"
    "\0"
-   /* _mesa_function_pool[33838]: MultiTexCoord2iv (offset 389) */
+   /* _mesa_function_pool[33808]: MultiTexCoord2iv (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[33883]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[33853]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[33903]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[33873]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[33963]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[33933]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[33991]: VertexAttribs3fvNV (will be remapped) */
+   /* _mesa_function_pool[33961]: VertexAttribs3fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3fvNV\0"
    "\0"
-   /* _mesa_function_pool[34017]: GenLists (offset 5) */
+   /* _mesa_function_pool[33987]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[34031]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[34001]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[34051]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[34021]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[34071]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[34041]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[34091]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[34061]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[34119]: GetActiveAttrib (will be remapped) */
+   /* _mesa_function_pool[34089]: GetActiveAttrib (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[34167]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[34137]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[34205]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[34175]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[34223]: ClearBufferData (will be remapped) */
+   /* _mesa_function_pool[34193]: ClearBufferData (will be remapped) */
    "iiiip\0"
    "glClearBufferData\0"
    "\0"
-   /* _mesa_function_pool[34248]: Color3usv (offset 24) */
+   /* _mesa_function_pool[34218]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[34263]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[34233]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[34312]: GenSamplers (will be remapped) */
+   /* _mesa_function_pool[34282]: GenSamplers (will be remapped) */
    "ip\0"
    "glGenSamplers\0"
    "\0"
-   /* _mesa_function_pool[34330]: DrawTexfOES (will be remapped) */
+   /* _mesa_function_pool[34300]: DrawTexfOES (will be remapped) */
    "fffff\0"
    "glDrawTexfOES\0"
    "\0"
-   /* _mesa_function_pool[34351]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[34321]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[34373]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[34343]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[34403]: Accum (offset 213) */
+   /* _mesa_function_pool[34373]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[34415]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[34385]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[34436]: Color4x (will be remapped) */
+   /* _mesa_function_pool[34406]: Color4x (will be remapped) */
    "iiii\0"
    "glColor4xOES\0"
    "glColor4x\0"
    "\0"
-   /* _mesa_function_pool[34465]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[34435]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[34523]: Color4s (offset 33) */
+   /* _mesa_function_pool[34493]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[34539]: CullParameterdvEXT (dynamic) */
+   /* _mesa_function_pool[34509]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[34564]: GetUniformuiv (will be remapped) */
+   /* _mesa_function_pool[34534]: GetUniformuiv (will be remapped) */
    "iip\0"
    "glGetUniformuivEXT\0"
    "glGetUniformuiv\0"
    "\0"
-   /* _mesa_function_pool[34604]: Color4i (offset 31) */
+   /* _mesa_function_pool[34574]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[34620]: Color4f (offset 29) */
+   /* _mesa_function_pool[34590]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[34636]: Color4d (offset 27) */
+   /* _mesa_function_pool[34606]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[34652]: Color4b (offset 25) */
+   /* _mesa_function_pool[34622]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[34668]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[34638]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[34690]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[34660]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[34720]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[34690]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[34738]: VertexAttribLFormat (will be remapped) */
+   /* _mesa_function_pool[34708]: VertexAttribLFormat (will be remapped) */
    "iiii\0"
    "glVertexAttribLFormat\0"
    "\0"
-   /* _mesa_function_pool[34766]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[34736]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[34794]: ShaderSource (will be remapped) */
+   /* _mesa_function_pool[34764]: ShaderSource (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[34833]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[34803]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[34848]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[34818]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[34883]: NormalP3ui (will be remapped) */
+   /* _mesa_function_pool[34853]: NormalP3ui (will be remapped) */
    "ii\0"
    "glNormalP3ui\0"
    "\0"
-   /* _mesa_function_pool[34900]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[34870]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[34945]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[34915]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[34977]: BufferData (will be remapped) */
+   /* _mesa_function_pool[34947]: BufferData (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[35012]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[34982]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[35058]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[35028]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[35085]: GetTexParameterPointervAPPLE (dynamic) */
+   /* _mesa_function_pool[35055]: GetTexParameterPointervAPPLE (dynamic) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[35121]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[35091]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "glTexGenfvOES\0"
    "\0"
-   /* _mesa_function_pool[35151]: GetVertexAttribiv (will be remapped) */
+   /* _mesa_function_pool[35121]: GetVertexAttribiv (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[35199]: TexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[35169]: TexCoordP2uiv (will be remapped) */
    "ip\0"
    "glTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[35219]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[35189]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[35263]: Uniform3fv (will be remapped) */
+   /* _mesa_function_pool[35233]: Uniform3fv (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[35297]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[35267]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "glBlendEquationOES\0"
    "\0"
-   /* _mesa_function_pool[35354]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[35324]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[35379]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[35349]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[35443]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[35413]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[35462]: UseShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[35432]: UseShaderProgramEXT (will be remapped) */
    "ii\0"
    "glUseShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[35488]: PushName (offset 201) */
+   /* _mesa_function_pool[35458]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[35502]: GenFencesNV (dynamic) */
+   /* _mesa_function_pool[35472]: GenFencesNV (dynamic) */
    "ip\0"
    "glGenFencesNV\0"
    "\0"
-   /* _mesa_function_pool[35520]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[35490]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[35545]: DeleteRenderbuffers (will be remapped) */
+   /* _mesa_function_pool[35515]: DeleteRenderbuffers (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "glDeleteRenderbuffersOES\0"
    "\0"
-   /* _mesa_function_pool[35621]: VertexAttrib1dv (will be remapped) */
+   /* _mesa_function_pool[35591]: VertexAttrib1dv (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[35664]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[35634]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[35698]: IsShader (will be remapped) */
+   /* _mesa_function_pool[35668]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[35712]: Rotated (offset 299) */
+   /* _mesa_function_pool[35682]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[35728]: Color4iv (offset 32) */
+   /* _mesa_function_pool[35698]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[35742]: Disablei (will be remapped) */
+   /* _mesa_function_pool[35712]: Disablei (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "glDisablei\0"
    "\0"
-   /* _mesa_function_pool[35777]: Rotatex (will be remapped) */
+   /* _mesa_function_pool[35747]: Rotatex (will be remapped) */
    "iiii\0"
    "glRotatexOES\0"
    "glRotatex\0"
    "\0"
-   /* _mesa_function_pool[35806]: FramebufferTextureLayer (will be remapped) */
+   /* _mesa_function_pool[35776]: FramebufferTextureLayer (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
    "glFramebufferTextureLayerARB\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[35897]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[35867]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[35913]: ProgramUniformMatrix3fv (will be remapped) */
+   /* _mesa_function_pool[35883]: ProgramUniformMatrix3fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3fv\0"
    "\0"
-   /* _mesa_function_pool[35946]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[35916]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[35963]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[35933]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[36000]: LoadMatrixx (will be remapped) */
+   /* _mesa_function_pool[35970]: LoadMatrixx (will be remapped) */
    "p\0"
    "glLoadMatrixxOES\0"
    "glLoadMatrixx\0"
    "\0"
-   /* _mesa_function_pool[36034]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[36004]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[36073]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[36043]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[36097]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[36067]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[36117]: SecondaryColor3bv (will be remapped) */
+   /* _mesa_function_pool[36087]: SecondaryColor3bv (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[36163]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[36133]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[36191]: GetCombinerOutputParameterivNV (dynamic) */
+   /* _mesa_function_pool[36161]: GetCombinerOutputParameterivNV (dynamic) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[36230]: DrawTexxvOES (will be remapped) */
+   /* _mesa_function_pool[36200]: DrawTexxvOES (will be remapped) */
    "p\0"
    "glDrawTexxvOES\0"
    "\0"
-   /* _mesa_function_pool[36248]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[36218]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[36270]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[36240]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[36285]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[36255]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[36302]: FogCoorddv (will be remapped) */
+   /* _mesa_function_pool[36272]: FogCoorddv (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[36334]: VDPAUUnregisterSurfaceNV (will be remapped) */
+   /* _mesa_function_pool[36304]: VDPAUUnregisterSurfaceNV (will be remapped) */
    "i\0"
    "glVDPAUUnregisterSurfaceNV\0"
    "\0"
-   /* _mesa_function_pool[36364]: ColorP3ui (will be remapped) */
+   /* _mesa_function_pool[36334]: ColorP3ui (will be remapped) */
    "ii\0"
    "glColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[36380]: ClearBufferuiv (will be remapped) */
+   /* _mesa_function_pool[36350]: ClearBufferuiv (will be remapped) */
    "iip\0"
    "glClearBufferuiv\0"
    "\0"
-   /* _mesa_function_pool[36402]: GetShaderPrecisionFormat (will be remapped) */
+   /* _mesa_function_pool[36372]: GetShaderPrecisionFormat (will be remapped) */
    "iipp\0"
    "glGetShaderPrecisionFormat\0"
    "\0"
-   /* _mesa_function_pool[36435]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[36405]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[36470]: Flush (offset 217) */
+   /* _mesa_function_pool[36440]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[36480]: VertexAttribI4iEXT (will be remapped) */
+   /* _mesa_function_pool[36450]: VertexAttribI4iEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4iEXT\0"
    "glVertexAttribI4i\0"
    "\0"
-   /* _mesa_function_pool[36526]: FogCoordd (will be remapped) */
+   /* _mesa_function_pool[36496]: FogCoordd (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[36556]: Uniform3iv (will be remapped) */
+   /* _mesa_function_pool[36526]: Uniform3iv (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[36590]: TexStorage2DMultisample (will be remapped) */
+   /* _mesa_function_pool[36560]: TexStorage2DMultisample (will be remapped) */
    "iiiiii\0"
    "glTexStorage2DMultisample\0"
    "\0"
-   /* _mesa_function_pool[36624]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[36594]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[36644]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[36614]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[36668]: VertexAttrib4iv (will be remapped) */
+   /* _mesa_function_pool[36638]: VertexAttrib4iv (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[36711]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[36681]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "glCopyTexSubImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[36788]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[36758]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[36808]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[36778]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[36830]: Indexiv (offset 49) */
+   /* _mesa_function_pool[36800]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[36843]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[36813]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[36858]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[36828]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[36873]: TexEnvx (will be remapped) */
+   /* _mesa_function_pool[36843]: TexEnvx (will be remapped) */
    "iii\0"
    "glTexEnvxOES\0"
    "glTexEnvx\0"
    "\0"
-   /* _mesa_function_pool[36901]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[36871]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[36926]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[36896]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[36982]: InvalidateBufferSubData (will be remapped) */
+   /* _mesa_function_pool[36952]: InvalidateBufferSubData (will be remapped) */
    "iii\0"
    "glInvalidateBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[37013]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[36983]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[37040]: SamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[37010]: SamplerParameterIiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[37067]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[37037]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[37087]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[37057]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[37113]: SamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[37083]: SamplerParameterfv (will be remapped) */
    "iip\0"
    "glSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[37139]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[37109]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[37169]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[37139]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[37227]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[37197]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[37243]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[37213]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[37267]: Color4fv (offset 30) */
+   /* _mesa_function_pool[37237]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[37281]: GetnMinmaxARB (will be remapped) */
+   /* _mesa_function_pool[37251]: GetnMinmaxARB (will be remapped) */
    "iiiiip\0"
    "glGetnMinmaxARB\0"
    "\0"
-   /* _mesa_function_pool[37305]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[37275]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[37326]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[37296]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[37361]: Lightiv (offset 162) */
+   /* _mesa_function_pool[37331]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[37376]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[37346]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[37401]: TransformFeedbackVaryings (will be remapped) */
+   /* _mesa_function_pool[37371]: TransformFeedbackVaryings (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryings\0"
    "glTransformFeedbackVaryingsEXT\0"
    "\0"
-   /* _mesa_function_pool[37466]: VertexAttrib3sv (will be remapped) */
+   /* _mesa_function_pool[37436]: VertexAttrib3sv (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[37509]: IsVertexArray (will be remapped) */
+   /* _mesa_function_pool[37479]: IsVertexArray (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "glIsVertexArrayOES\0"
    "\0"
-   /* _mesa_function_pool[37568]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[37538]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[37590]: ProgramUniform4ui (will be remapped) */
+   /* _mesa_function_pool[37560]: ProgramUniform4ui (will be remapped) */
    "iiiiii\0"
    "glProgramUniform4ui\0"
    "\0"
-   /* _mesa_function_pool[37618]: Uniform1f (will be remapped) */
+   /* _mesa_function_pool[37588]: Uniform1f (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[37649]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[37619]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[37678]: Uniform1i (will be remapped) */
+   /* _mesa_function_pool[37648]: Uniform1i (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[37709]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[37679]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[37732]: PixelTexGenSGIX (dynamic) */
+   /* _mesa_function_pool[37702]: PixelTexGenSGIX (dynamic) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[37753]: TexGenxOES (will be remapped) */
+   /* _mesa_function_pool[37723]: TexGenxOES (will be remapped) */
    "iii\0"
    "glTexGenxOES\0"
    "\0"
-   /* _mesa_function_pool[37771]: UseProgram (will be remapped) */
+   /* _mesa_function_pool[37741]: UseProgram (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[37809]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[37779]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[37834]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[37804]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[37869]: GetFragDataLocation (will be remapped) */
+   /* _mesa_function_pool[37839]: GetFragDataLocation (will be remapped) */
    "ip\0"
    "glGetFragDataLocationEXT\0"
    "glGetFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[37920]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[37890]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[37939]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[37909]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[37962]: GetFenceivNV (dynamic) */
+   /* _mesa_function_pool[37932]: GetFenceivNV (dynamic) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[37982]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[37952]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "glCurrentPaletteMatrixOES\0"
    "\0"
-   /* _mesa_function_pool[38037]: GetInteger64i_v (will be remapped) */
+   /* _mesa_function_pool[38007]: GetInteger64i_v (will be remapped) */
    "iip\0"
    "glGetInteger64i_v\0"
    "\0"
-   /* _mesa_function_pool[38060]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[38030]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[38103]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[38073]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[38127]: Color3s (offset 17) */
+   /* _mesa_function_pool[38097]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[38142]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[38112]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[38166]: Color3i (offset 15) */
+   /* _mesa_function_pool[38136]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[38181]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[38151]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[38199]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[38169]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[38217]: Color3b (offset 9) */
+   /* _mesa_function_pool[38187]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[38232]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[38202]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[38256]: Color3f (offset 13) */
+   /* _mesa_function_pool[38226]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[38271]: Color3d (offset 11) */
+   /* _mesa_function_pool[38241]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[38286]: GetVertexAttribdv (will be remapped) */
+   /* _mesa_function_pool[38256]: GetVertexAttribdv (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[38334]: GetBufferPointerv (will be remapped) */
+   /* _mesa_function_pool[38304]: GetBufferPointerv (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "glGetBufferPointervOES\0"
    "\0"
-   /* _mesa_function_pool[38405]: GenFramebuffers (will be remapped) */
+   /* _mesa_function_pool[38375]: GenFramebuffers (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "glGenFramebuffersOES\0"
    "\0"
-   /* _mesa_function_pool[38469]: GenBuffers (will be remapped) */
+   /* _mesa_function_pool[38439]: GenBuffers (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[38502]: ClearDepthx (will be remapped) */
+   /* _mesa_function_pool[38472]: ClearDepthx (will be remapped) */
    "i\0"
    "glClearDepthxOES\0"
    "glClearDepthx\0"
    "\0"
-   /* _mesa_function_pool[38536]: BlendEquationSeparate (will be remapped) */
+   /* _mesa_function_pool[38506]: BlendEquationSeparate (will be remapped) */
    "ii\0"
    "glBlendEquationSeparate\0"
    "glBlendEquationSeparateEXT\0"
    "glBlendEquationSeparateATI\0"
    "glBlendEquationSeparateOES\0"
    "\0"
-   /* _mesa_function_pool[38645]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[38615]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[38680]: MultiTexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[38650]: MultiTexCoordP4ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[38705]: VertexAttribIPointer (will be remapped) */
+   /* _mesa_function_pool[38675]: VertexAttribIPointer (will be remapped) */
    "iiiip\0"
    "glVertexAttribIPointerEXT\0"
    "glVertexAttribIPointer\0"
    "\0"
-   /* _mesa_function_pool[38761]: EnableVertexAttribArray (will be remapped) */
+   /* _mesa_function_pool[38731]: EnableVertexAttribArray (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[38819]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[38789]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[38838]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[38808]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[38856]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[38826]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[38875]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[38845]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[38894]: TextureView (will be remapped) */
+   /* _mesa_function_pool[38864]: TextureView (will be remapped) */
    "iiiiiiii\0"
    "glTextureView\0"
    "\0"
-   /* _mesa_function_pool[38918]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[38888]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[38934]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[38904]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "glTexSubImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[39001]: Bitmap (offset 8) */
+   /* _mesa_function_pool[38971]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[39019]: VertexAttribDivisor (will be remapped) */
+   /* _mesa_function_pool[38989]: VertexAttribDivisor (will be remapped) */
    "ii\0"
    "glVertexAttribDivisorARB\0"
    "glVertexAttribDivisor\0"
    "\0"
-   /* _mesa_function_pool[39070]: DrawTransformFeedbackStream (will be remapped) */
+   /* _mesa_function_pool[39040]: DrawTransformFeedbackStream (will be remapped) */
    "iii\0"
    "glDrawTransformFeedbackStream\0"
    "\0"
-   /* _mesa_function_pool[39105]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[39075]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[39123]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[39093]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[39150]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[39120]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[39187]: GetActiveUniform (will be remapped) */
+   /* _mesa_function_pool[39157]: GetActiveUniform (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[39237]: AlphaFuncx (will be remapped) */
+   /* _mesa_function_pool[39207]: AlphaFuncx (will be remapped) */
    "ii\0"
    "glAlphaFuncxOES\0"
    "glAlphaFuncx\0"
    "\0"
-   /* _mesa_function_pool[39270]: VertexAttribI2ivEXT (will be remapped) */
+   /* _mesa_function_pool[39240]: VertexAttribI2ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2ivEXT\0"
    "glVertexAttribI2iv\0"
    "\0"
-   /* _mesa_function_pool[39315]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[39285]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[39335]: Map1d (offset 220) */
+   /* _mesa_function_pool[39305]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[39351]: Map1f (offset 221) */
+   /* _mesa_function_pool[39321]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[39367]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[39337]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[39419]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[39389]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[39456]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[39426]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[39477]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[39447]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[39501]: GetFinalCombinerInputParameterivNV (dynamic) */
+   /* _mesa_function_pool[39471]: GetFinalCombinerInputParameterivNV (dynamic) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[39543]: SecondaryColorP3ui (will be remapped) */
+   /* _mesa_function_pool[39513]: SecondaryColorP3ui (will be remapped) */
    "ii\0"
    "glSecondaryColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[39568]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[39538]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[39595]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[39565]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[39619]: Rectiv (offset 91) */
+   /* _mesa_function_pool[39589]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[39632]: MultiTexCoord1iv (offset 381) */
+   /* _mesa_function_pool[39602]: MultiTexCoord1iv (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[39677]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[39647]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[39700]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[39670]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[39720]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[39690]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[39735]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[39705]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[39761]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[39731]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[39776]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[39746]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[39793]: DiscardFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[39763]: DiscardFramebufferEXT (will be remapped) */
    "iip\0"
    "glDiscardFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[39822]: Uniform2f (will be remapped) */
+   /* _mesa_function_pool[39792]: Uniform2f (will be remapped) */
    "iff\0"
    "glUniform2f\0"
    "glUniform2fARB\0"
    "\0"
-   /* _mesa_function_pool[39854]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[39824]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[39879]: LineWidth (offset 168) */
+   /* _mesa_function_pool[39849]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[39894]: Uniform2i (will be remapped) */
+   /* _mesa_function_pool[39864]: Uniform2i (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[39926]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[39896]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[39964]: Lightxv (will be remapped) */
+   /* _mesa_function_pool[39934]: Lightxv (will be remapped) */
    "iip\0"
    "glLightxvOES\0"
    "glLightxv\0"
    "\0"
-   /* _mesa_function_pool[39992]: DepthRangeIndexed (will be remapped) */
+   /* _mesa_function_pool[39962]: DepthRangeIndexed (will be remapped) */
    "idd\0"
    "glDepthRangeIndexed\0"
    "\0"
-   /* _mesa_function_pool[40017]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[39987]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[40081]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[40051]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[40112]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[40082]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[40149]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[40119]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[40170]: TexImage3DMultisample (will be remapped) */
+   /* _mesa_function_pool[40140]: TexImage3DMultisample (will be remapped) */
    "iiiiiii\0"
    "glTexImage3DMultisample\0"
    "\0"
-   /* _mesa_function_pool[40203]: VertexAttrib1fvNV (will be remapped) */
+   /* _mesa_function_pool[40173]: VertexAttrib1fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1fvNV\0"
    "\0"
-   /* _mesa_function_pool[40227]: GetUniformBlockIndex (will be remapped) */
+   /* _mesa_function_pool[40197]: GetUniformBlockIndex (will be remapped) */
    "ip\0"
    "glGetUniformBlockIndex\0"
    "\0"
-   /* _mesa_function_pool[40254]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[40224]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[40273]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[40243]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[40326]: SampleCoverage (will be remapped) */
+   /* _mesa_function_pool[40296]: SampleCoverage (will be remapped) */
    "fi\0"
    "glSampleCoverage\0"
    "glSampleCoverageARB\0"
    "\0"
-   /* _mesa_function_pool[40367]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[40337]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[40398]: Color3iv (offset 16) */
+   /* _mesa_function_pool[40368]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[40412]: DrawElements (offset 311) */
+   /* _mesa_function_pool[40382]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[40433]: ScissorArrayv (will be remapped) */
+   /* _mesa_function_pool[40403]: ScissorArrayv (will be remapped) */
    "iip\0"
    "glScissorArrayv\0"
    "\0"
-   /* _mesa_function_pool[40454]: GetInternalformativ (will be remapped) */
+   /* _mesa_function_pool[40424]: GetInternalformativ (will be remapped) */
    "iiiip\0"
    "glGetInternalformativ\0"
    "\0"
-   /* _mesa_function_pool[40483]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[40453]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[40500]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[40470]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[40516]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[40486]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[40530]: FinishFenceNV (dynamic) */
+   /* _mesa_function_pool[40500]: FinishFenceNV (dynamic) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[40549]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[40519]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[40568]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[40538]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "glGetTexGenivOES\0"
    "\0"
-   /* _mesa_function_pool[40604]: ActiveProgramEXT (will be remapped) */
+   /* _mesa_function_pool[40574]: ActiveProgramEXT (will be remapped) */
    "i\0"
    "glActiveProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[40626]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[40596]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[40662]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[40632]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[40691]: UnmapBuffer (will be remapped) */
+   /* _mesa_function_pool[40661]: UnmapBuffer (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "glUnmapBufferOES\0"
    "\0"
-   /* _mesa_function_pool[40742]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[40712]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[40759]: EvalCoord1f (offset 230) */
+   /* _mesa_function_pool[40729]: EvalCoord1f (offset 230) */
    "f\0"
    "glEvalCoord1f\0"
    "\0"
-   /* _mesa_function_pool[40776]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[40746]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[40799]: Materialf (offset 169) */
+   /* _mesa_function_pool[40769]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[40816]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[40786]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[40842]: ProgramUniform1uiv (will be remapped) */
+   /* _mesa_function_pool[40812]: ProgramUniform1uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[40869]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[40839]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[40887]: Materialx (will be remapped) */
+   /* _mesa_function_pool[40857]: Materialx (will be remapped) */
    "iii\0"
    "glMaterialxOES\0"
    "glMaterialx\0"
    "\0"
-   /* _mesa_function_pool[40919]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[40889]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[40937]: BindBuffer (will be remapped) */
+   /* _mesa_function_pool[40907]: BindBuffer (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[40970]: ProgramUniform1i (will be remapped) */
+   /* _mesa_function_pool[40940]: ProgramUniform1i (will be remapped) */
    "iii\0"
    "glProgramUniform1i\0"
    "\0"
-   /* _mesa_function_pool[40994]: ProgramUniform1f (will be remapped) */
+   /* _mesa_function_pool[40964]: ProgramUniform1f (will be remapped) */
    "iif\0"
    "glProgramUniform1f\0"
    "\0"
-   /* _mesa_function_pool[41018]: WindowPos3iv (will be remapped) */
+   /* _mesa_function_pool[40988]: WindowPos3iv (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[41073]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[41043]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[41136]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[41106]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[41163]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[41133]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[41181]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[41151]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[41208]: Recti (offset 90) */
+   /* _mesa_function_pool[41178]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[41222]: VertexAttribI3ivEXT (will be remapped) */
+   /* _mesa_function_pool[41192]: VertexAttribI3ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3ivEXT\0"
    "glVertexAttribI3iv\0"
    "\0"
-   /* _mesa_function_pool[41267]: DeleteSamplers (will be remapped) */
+   /* _mesa_function_pool[41237]: DeleteSamplers (will be remapped) */
    "ip\0"
    "glDeleteSamplers\0"
    "\0"
-   /* _mesa_function_pool[41288]: SamplerParameteri (will be remapped) */
+   /* _mesa_function_pool[41258]: SamplerParameteri (will be remapped) */
    "iii\0"
    "glSamplerParameteri\0"
    "\0"
-   /* _mesa_function_pool[41313]: Rectf (offset 88) */
+   /* _mesa_function_pool[41283]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[41327]: Rectd (offset 86) */
+   /* _mesa_function_pool[41297]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[41341]: SamplerParameterf (will be remapped) */
+   /* _mesa_function_pool[41311]: SamplerParameterf (will be remapped) */
    "iif\0"
    "glSamplerParameterf\0"
    "\0"
-   /* _mesa_function_pool[41366]: Rects (offset 92) */
+   /* _mesa_function_pool[41336]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[41380]: CombinerParameterfNV (dynamic) */
+   /* _mesa_function_pool[41350]: CombinerParameterfNV (dynamic) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[41407]: GetVertexAttribIiv (will be remapped) */
+   /* _mesa_function_pool[41377]: GetVertexAttribIiv (will be remapped) */
    "iip\0"
    "glGetVertexAttribIivEXT\0"
    "glGetVertexAttribIiv\0"
    "\0"
-   /* _mesa_function_pool[41457]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[41427]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[41479]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[41449]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[41498]: TexEnvxv (will be remapped) */
+   /* _mesa_function_pool[41468]: TexEnvxv (will be remapped) */
    "iip\0"
    "glTexEnvxvOES\0"
    "glTexEnvxv\0"
    "\0"
-   /* _mesa_function_pool[41528]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[41498]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[41547]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[41517]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[41575]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[41545]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[41594]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[41564]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[41613]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[41583]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[41631]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[41601]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[41654]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[41624]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[41674]: GetActiveUniformBlockiv (will be remapped) */
+   /* _mesa_function_pool[41644]: GetActiveUniformBlockiv (will be remapped) */
    "iiip\0"
    "glGetActiveUniformBlockiv\0"
    "\0"
-   /* _mesa_function_pool[41706]: GetPerfMonitorCountersAMD (will be remapped) */
+   /* _mesa_function_pool[41676]: GetPerfMonitorCountersAMD (will be remapped) */
    "ippip\0"
    "glGetPerfMonitorCountersAMD\0"
    "\0"
-   /* _mesa_function_pool[41741]: ObjectPtrLabel (will be remapped) */
+   /* _mesa_function_pool[41711]: ObjectPtrLabel (will be remapped) */
    "pip\0"
    "glObjectPtrLabel\0"
    "\0"
-   /* _mesa_function_pool[41763]: Rectfv (offset 89) */
+   /* _mesa_function_pool[41733]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[41776]: BindImageTexture (will be remapped) */
+   /* _mesa_function_pool[41746]: BindImageTexture (will be remapped) */
    "iiiiiii\0"
    "glBindImageTexture\0"
    "\0"
-   /* _mesa_function_pool[41804]: ClearDepthf (will be remapped) */
+   /* _mesa_function_pool[41774]: ClearDepthf (will be remapped) */
    "f\0"
    "glClearDepthf\0"
    "glClearDepthfOES\0"
    "\0"
-   /* _mesa_function_pool[41838]: VertexP4uiv (will be remapped) */
+   /* _mesa_function_pool[41808]: VertexP4uiv (will be remapped) */
    "ip\0"
    "glVertexP4uiv\0"
    "\0"
-   /* _mesa_function_pool[41856]: MinSampleShading (will be remapped) */
+   /* _mesa_function_pool[41826]: MinSampleShading (will be remapped) */
    "f\0"
    "glMinSampleShadingARB\0"
    "glMinSampleShading\0"
    "\0"
-   /* _mesa_function_pool[41900]: GetRenderbufferParameteriv (will be remapped) */
+   /* _mesa_function_pool[41870]: GetRenderbufferParameteriv (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "glGetRenderbufferParameterivOES\0"
    "\0"
-   /* _mesa_function_pool[41998]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[41968]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[42028]: WindowPos2sv (will be remapped) */
+   /* _mesa_function_pool[41998]: WindowPos2sv (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[42083]: VertexArrayRangeNV (dynamic) */
+   /* _mesa_function_pool[42053]: VertexArrayRangeNV (dynamic) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[42108]: GetPerfMonitorCounterStringAMD (will be remapped) */
+   /* _mesa_function_pool[42078]: GetPerfMonitorCounterStringAMD (will be remapped) */
    "iiipp\0"
    "glGetPerfMonitorCounterStringAMD\0"
    "\0"
-   /* _mesa_function_pool[42148]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[42118]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[42173]: Uniform4iv (will be remapped) */
+   /* _mesa_function_pool[42143]: Uniform4iv (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
@@ -5988,828 +5976,824 @@ static const char _mesa_function_pool[] =
 
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   { 17150, CompressedTexImage1D_remap_index },
-   { 14764, CompressedTexImage2D_remap_index },
-   { 10802, CompressedTexImage3D_remap_index },
-   { 27365, CompressedTexSubImage1D_remap_index },
-   { 32998, CompressedTexSubImage2D_remap_index },
-   {  5573, CompressedTexSubImage3D_remap_index },
-   {  3741, GetCompressedTexImage_remap_index },
-   { 16406, LoadTransposeMatrixd_remap_index },
-   { 16354, LoadTransposeMatrixf_remap_index },
-   { 30646, MultTransposeMatrixd_remap_index },
-   { 12086, MultTransposeMatrixf_remap_index },
-   { 40326, SampleCoverage_remap_index },
-   {  3042, BlendFuncSeparate_remap_index },
-   { 19856, FogCoordPointer_remap_index },
-   { 36526, FogCoordd_remap_index },
-   { 36302, FogCoorddv_remap_index },
-   { 29764, MultiDrawArrays_remap_index },
-   { 28209, PointParameterf_remap_index },
-   {  4283, PointParameterfv_remap_index },
-   { 28167, PointParameteri_remap_index },
-   {  7778, PointParameteriv_remap_index },
-   {  4705, SecondaryColor3b_remap_index },
-   { 36117, SecondaryColor3bv_remap_index },
-   { 30784, SecondaryColor3d_remap_index },
-   { 10935, SecondaryColor3dv_remap_index },
-   {  4801, SecondaryColor3i_remap_index },
-   { 26596, SecondaryColor3iv_remap_index },
-   {  4581, SecondaryColor3s_remap_index },
-   { 14074, SecondaryColor3sv_remap_index },
-   { 20009, SecondaryColor3ub_remap_index },
-   {  6466, SecondaryColor3ubv_remap_index },
-   { 20057, SecondaryColor3ui_remap_index },
-   { 21910, SecondaryColor3uiv_remap_index },
-   { 19900, SecondaryColor3us_remap_index },
-   {  8701, SecondaryColor3usv_remap_index },
-   { 31809, SecondaryColorPointer_remap_index },
-   { 10560, WindowPos2d_remap_index },
-   { 15446, WindowPos2dv_remap_index },
-   { 10507, WindowPos2f_remap_index },
-   { 21296, WindowPos2fv_remap_index },
-   { 10613, WindowPos2i_remap_index },
-   {  5827, WindowPos2iv_remap_index },
-   { 10666, WindowPos2s_remap_index },
-   { 42028, WindowPos2sv_remap_index },
-   { 14321, WindowPos3d_remap_index },
-   { 13842, WindowPos3dv_remap_index },
-   { 14408, WindowPos3f_remap_index },
-   {  7637, WindowPos3fv_remap_index },
-   { 14517, WindowPos3i_remap_index },
-   { 41018, WindowPos3iv_remap_index },
-   { 14633, WindowPos3s_remap_index },
-   { 22633, WindowPos3sv_remap_index },
-   {  5709, BeginQuery_remap_index },
-   { 40937, BindBuffer_remap_index },
-   { 34977, BufferData_remap_index },
-   {  9175, BufferSubData_remap_index },
-   { 28480, DeleteBuffers_remap_index },
-   { 20303, DeleteQueries_remap_index },
-   { 17973, EndQuery_remap_index },
-   { 38469, GenBuffers_remap_index },
+   { 17161, CompressedTexImage1D_remap_index },
+   { 14749, CompressedTexImage2D_remap_index },
+   { 10763, CompressedTexImage3D_remap_index },
+   { 27310, CompressedTexSubImage1D_remap_index },
+   { 32968, CompressedTexSubImage2D_remap_index },
+   {  5540, CompressedTexSubImage3D_remap_index },
+   {  3708, GetCompressedTexImage_remap_index },
+   { 16417, LoadTransposeMatrixd_remap_index },
+   { 16365, LoadTransposeMatrixf_remap_index },
+   { 30616, MultTransposeMatrixd_remap_index },
+   { 12047, MultTransposeMatrixf_remap_index },
+   { 40296, SampleCoverage_remap_index },
+   {  3009, BlendFuncSeparate_remap_index },
+   { 19867, FogCoordPointer_remap_index },
+   { 36496, FogCoordd_remap_index },
+   { 36272, FogCoorddv_remap_index },
+   { 29709, MultiDrawArrays_remap_index },
+   { 28154, PointParameterf_remap_index },
+   {  4250, PointParameterfv_remap_index },
+   { 28112, PointParameteri_remap_index },
+   {  7769, PointParameteriv_remap_index },
+   {  4672, SecondaryColor3b_remap_index },
+   { 36087, SecondaryColor3bv_remap_index },
+   { 30754, SecondaryColor3d_remap_index },
+   { 10896, SecondaryColor3dv_remap_index },
+   {  4768, SecondaryColor3i_remap_index },
+   { 26541, SecondaryColor3iv_remap_index },
+   {  4548, SecondaryColor3s_remap_index },
+   { 14035, SecondaryColor3sv_remap_index },
+   { 20020, SecondaryColor3ub_remap_index },
+   {  6433, SecondaryColor3ubv_remap_index },
+   { 20068, SecondaryColor3ui_remap_index },
+   { 21887, SecondaryColor3uiv_remap_index },
+   { 19911, SecondaryColor3us_remap_index },
+   {  8692, SecondaryColor3usv_remap_index },
+   { 31779, SecondaryColorPointer_remap_index },
+   { 10521, WindowPos2d_remap_index },
+   { 15457, WindowPos2dv_remap_index },
+   { 10468, WindowPos2f_remap_index },
+   { 21273, WindowPos2fv_remap_index },
+   { 10574, WindowPos2i_remap_index },
+   {  5794, WindowPos2iv_remap_index },
+   { 10627, WindowPos2s_remap_index },
+   { 41998, WindowPos2sv_remap_index },
+   { 14282, WindowPos3d_remap_index },
+   { 13803, WindowPos3dv_remap_index },
+   { 14369, WindowPos3f_remap_index },
+   {  7628, WindowPos3fv_remap_index },
+   { 14478, WindowPos3i_remap_index },
+   { 40988, WindowPos3iv_remap_index },
+   { 14594, WindowPos3s_remap_index },
+   { 22610, WindowPos3sv_remap_index },
+   {  5676, BeginQuery_remap_index },
+   { 40907, BindBuffer_remap_index },
+   { 34947, BufferData_remap_index },
+   {  9166, BufferSubData_remap_index },
+   { 28425, DeleteBuffers_remap_index },
+   { 20314, DeleteQueries_remap_index },
+   { 17984, EndQuery_remap_index },
+   { 38439, GenBuffers_remap_index },
    {  1755, GenQueries_remap_index },
-   { 26064, GetBufferParameteriv_remap_index },
-   { 38334, GetBufferPointerv_remap_index },
-   { 28519, GetBufferSubData_remap_index },
-   {  7347, GetQueryObjectiv_remap_index },
-   {  7047, GetQueryObjectuiv_remap_index },
-   { 11128, GetQueryiv_remap_index },
-   { 16840, IsBuffer_remap_index },
-   { 26343, IsQuery_remap_index },
-   { 11239, MapBuffer_remap_index },
-   { 40691, UnmapBuffer_remap_index },
+   { 26041, GetBufferParameteriv_remap_index },
+   { 38304, GetBufferPointerv_remap_index },
+   { 28464, GetBufferSubData_remap_index },
+   {  7338, GetQueryObjectiv_remap_index },
+   {  7038, GetQueryObjectuiv_remap_index },
+   { 11089, GetQueryiv_remap_index },
+   { 16851, IsBuffer_remap_index },
+   { 26288, IsQuery_remap_index },
+   { 11200, MapBuffer_remap_index },
+   { 40661, UnmapBuffer_remap_index },
    {   315, AttachShader_remap_index },
-   { 33466, BindAttribLocation_remap_index },
-   { 38536, BlendEquationSeparate_remap_index },
-   { 29463, CompileShader_remap_index },
-   { 22928, CreateProgram_remap_index },
-   { 28395, CreateShader_remap_index },
-   { 18770, DeleteProgram_remap_index },
-   { 29445, DeleteShader_remap_index },
-   { 40254, DetachShader_remap_index },
-   { 31513, DisableVertexAttribArray_remap_index },
-   { 21094, DrawBuffers_remap_index },
-   { 38761, EnableVertexAttribArray_remap_index },
-   { 34119, GetActiveAttrib_remap_index },
-   { 39187, GetActiveUniform_remap_index },
-   { 15993, GetAttachedShaders_remap_index },
-   { 25061, GetAttribLocation_remap_index },
-   { 10217, GetProgramInfoLog_remap_index },
-   { 20830, GetProgramiv_remap_index },
-   {  3507, GetShaderInfoLog_remap_index },
-   {  6769, GetShaderSource_remap_index },
-   { 15754, GetShaderiv_remap_index },
-   {  5760, GetUniformLocation_remap_index },
-   { 12239, GetUniformfv_remap_index },
+   { 33436, BindAttribLocation_remap_index },
+   { 38506, BlendEquationSeparate_remap_index },
+   { 29408, CompileShader_remap_index },
+   { 22905, CreateProgram_remap_index },
+   { 28340, CreateShader_remap_index },
+   { 18781, DeleteProgram_remap_index },
+   { 29390, DeleteShader_remap_index },
+   { 40224, DetachShader_remap_index },
+   { 31483, DisableVertexAttribArray_remap_index },
+   { 21071, DrawBuffers_remap_index },
+   { 38731, EnableVertexAttribArray_remap_index },
+   { 34089, GetActiveAttrib_remap_index },
+   { 39157, GetActiveUniform_remap_index },
+   { 16004, GetAttachedShaders_remap_index },
+   { 25038, GetAttribLocation_remap_index },
+   { 10208, GetProgramInfoLog_remap_index },
+   { 20841, GetProgramiv_remap_index },
+   {  3474, GetShaderInfoLog_remap_index },
+   {  6760, GetShaderSource_remap_index },
+   { 15765, GetShaderiv_remap_index },
+   {  5727, GetUniformLocation_remap_index },
+   { 12200, GetUniformfv_remap_index },
    {  1991, GetUniformiv_remap_index },
-   { 32177, GetVertexAttribPointerv_remap_index },
-   { 38286, GetVertexAttribdv_remap_index },
-   { 32759, GetVertexAttribfv_remap_index },
-   { 35151, GetVertexAttribiv_remap_index },
-   {  3927, IsProgram_remap_index },
-   { 35698, IsShader_remap_index },
-   { 26789, LinkProgram_remap_index },
-   { 34794, ShaderSource_remap_index },
-   { 34766, StencilFuncSeparate_remap_index },
-   { 33081, StencilMaskSeparate_remap_index },
-   { 34263, StencilOpSeparate_remap_index },
-   { 37618, Uniform1f_remap_index },
-   {  7523, Uniform1fv_remap_index },
-   { 37678, Uniform1i_remap_index },
-   { 17021, Uniform1iv_remap_index },
-   { 39822, Uniform2f_remap_index },
-   { 21030, Uniform2fv_remap_index },
-   { 39894, Uniform2i_remap_index },
-   { 19012, Uniform2iv_remap_index },
+   { 32147, GetVertexAttribPointerv_remap_index },
+   { 38256, GetVertexAttribdv_remap_index },
+   { 32729, GetVertexAttribfv_remap_index },
+   { 35121, GetVertexAttribiv_remap_index },
+   {  3894, IsProgram_remap_index },
+   { 35668, IsShader_remap_index },
+   { 26734, LinkProgram_remap_index },
+   { 34764, ShaderSource_remap_index },
+   { 34736, StencilFuncSeparate_remap_index },
+   { 33051, StencilMaskSeparate_remap_index },
+   { 34233, StencilOpSeparate_remap_index },
+   { 37588, Uniform1f_remap_index },
+   {  7514, Uniform1fv_remap_index },
+   { 37648, Uniform1i_remap_index },
+   { 17032, Uniform1iv_remap_index },
+   { 39792, Uniform2f_remap_index },
+   { 21007, Uniform2fv_remap_index },
+   { 39864, Uniform2i_remap_index },
+   { 19023, Uniform2iv_remap_index },
    {   858, Uniform3f_remap_index },
-   { 35263, Uniform3fv_remap_index },
+   { 35233, Uniform3fv_remap_index },
    {   771, Uniform3i_remap_index },
-   { 36556, Uniform3iv_remap_index },
-   {  4197, Uniform4f_remap_index },
-   {  8189, Uniform4fv_remap_index },
-   {  4134, Uniform4i_remap_index },
-   { 42173, Uniform4iv_remap_index },
-   {  9281, UniformMatrix2fv_remap_index },
-   { 21644, UniformMatrix3fv_remap_index },
-   {  9750, UniformMatrix4fv_remap_index },
-   { 37771, UseProgram_remap_index },
-   { 23046, ValidateProgram_remap_index },
-   { 17109, VertexAttrib1d_remap_index },
-   { 35621, VertexAttrib1dv_remap_index },
-   { 17232, VertexAttrib1s_remap_index },
-   { 32607, VertexAttrib1sv_remap_index },
-   {  7481, VertexAttrib2d_remap_index },
-   { 22384, VertexAttrib2dv_remap_index },
-   {  7393, VertexAttrib2s_remap_index },
-   { 13491, VertexAttrib2sv_remap_index },
-   { 11162, VertexAttrib3d_remap_index },
-   { 20954, VertexAttrib3dv_remap_index },
-   { 11037, VertexAttrib3s_remap_index },
-   { 37466, VertexAttrib3sv_remap_index },
-   { 11285, VertexAttrib4Nbv_remap_index },
-   { 26685, VertexAttrib4Niv_remap_index },
-   { 19315, VertexAttrib4Nsv_remap_index },
+   { 36526, Uniform3iv_remap_index },
+   {  4164, Uniform4f_remap_index },
+   {  8180, Uniform4fv_remap_index },
+   {  4101, Uniform4i_remap_index },
+   { 42143, Uniform4iv_remap_index },
+   {  9272, UniformMatrix2fv_remap_index },
+   { 21621, UniformMatrix3fv_remap_index },
+   {  9741, UniformMatrix4fv_remap_index },
+   { 37741, UseProgram_remap_index },
+   { 23023, ValidateProgram_remap_index },
+   { 17120, VertexAttrib1d_remap_index },
+   { 35591, VertexAttrib1dv_remap_index },
+   { 17243, VertexAttrib1s_remap_index },
+   { 32577, VertexAttrib1sv_remap_index },
+   {  7472, VertexAttrib2d_remap_index },
+   { 22361, VertexAttrib2dv_remap_index },
+   {  7384, VertexAttrib2s_remap_index },
+   { 13452, VertexAttrib2sv_remap_index },
+   { 11123, VertexAttrib3d_remap_index },
+   { 20931, VertexAttrib3dv_remap_index },
+   { 10998, VertexAttrib3s_remap_index },
+   { 37436, VertexAttrib3sv_remap_index },
+   { 11246, VertexAttrib4Nbv_remap_index },
+   { 26630, VertexAttrib4Niv_remap_index },
+   { 19326, VertexAttrib4Nsv_remap_index },
    {  1408, VertexAttrib4Nub_remap_index },
-   { 31070, VertexAttrib4Nubv_remap_index },
-   {  9824, VertexAttrib4Nuiv_remap_index },
-   { 33348, VertexAttrib4Nusv_remap_index },
-   {  8631, VertexAttrib4bv_remap_index },
-   { 26904, VertexAttrib4d_remap_index },
-   { 27281, VertexAttrib4dv_remap_index },
-   { 36668, VertexAttrib4iv_remap_index },
-   { 26972, VertexAttrib4s_remap_index },
-   { 18073, VertexAttrib4sv_remap_index },
-   {  9510, VertexAttrib4ubv_remap_index },
-   { 19270, VertexAttrib4uiv_remap_index },
+   { 31040, VertexAttrib4Nubv_remap_index },
+   {  9815, VertexAttrib4Nuiv_remap_index },
+   { 33318, VertexAttrib4Nusv_remap_index },
+   {  8622, VertexAttrib4bv_remap_index },
+   { 26849, VertexAttrib4d_remap_index },
+   { 27226, VertexAttrib4dv_remap_index },
+   { 36638, VertexAttrib4iv_remap_index },
+   { 26917, VertexAttrib4s_remap_index },
+   { 18084, VertexAttrib4sv_remap_index },
+   {  9501, VertexAttrib4ubv_remap_index },
+   { 19281, VertexAttrib4uiv_remap_index },
    {  1334, VertexAttrib4usv_remap_index },
-   { 31155, VertexAttribPointer_remap_index },
-   { 28007, UniformMatrix2x3fv_remap_index },
+   { 31125, VertexAttribPointer_remap_index },
+   { 27952, UniformMatrix2x3fv_remap_index },
    {   891, UniformMatrix2x4fv_remap_index },
-   {  9797, UniformMatrix3x2fv_remap_index },
-   { 41181, UniformMatrix3x4fv_remap_index },
-   { 37013, UniformMatrix4x2fv_remap_index },
-   { 11080, UniformMatrix4x3fv_remap_index },
-   { 15660, BeginConditionalRender_remap_index },
-   { 23130, BeginTransformFeedback_remap_index },
-   { 11961, BindBufferBase_remap_index },
-   {  7266, BindBufferRange_remap_index },
-   { 21428, BindFragDataLocation_remap_index },
-   { 22492, ClampColor_remap_index },
-   { 16020, ClearBufferfi_remap_index },
-   { 15869, ClearBufferfv_remap_index },
-   { 19738, ClearBufferiv_remap_index },
-   { 36380, ClearBufferuiv_remap_index },
-   { 12541, ColorMaski_remap_index },
-   { 35742, Disablei_remap_index },
-   { 14375, Enablei_remap_index },
-   { 21958, EndConditionalRender_remap_index },
-   { 18589, EndTransformFeedback_remap_index },
-   { 11473, GetBooleani_v_remap_index },
-   { 37869, GetFragDataLocation_remap_index },
-   { 19759, GetIntegeri_v_remap_index },
-   { 27264, GetStringi_remap_index },
-   { 28978, GetTexParameterIiv_remap_index },
-   { 12737, GetTexParameterIuiv_remap_index },
-   { 29192, GetTransformFeedbackVarying_remap_index },
-   { 34564, GetUniformuiv_remap_index },
-   { 41407, GetVertexAttribIiv_remap_index },
-   { 19570, GetVertexAttribIuiv_remap_index },
-   { 32092, IsEnabledi_remap_index },
-   { 18828, TexParameterIiv_remap_index },
-   { 15501, TexParameterIuiv_remap_index },
-   { 37401, TransformFeedbackVaryings_remap_index },
-   {  5196, Uniform1ui_remap_index },
-   { 24501, Uniform1uiv_remap_index },
-   { 23950, Uniform2ui_remap_index },
-   { 12583, Uniform2uiv_remap_index },
-   { 31407, Uniform3ui_remap_index },
-   { 18132, Uniform3uiv_remap_index },
-   { 11396, Uniform4ui_remap_index },
-   { 17055, Uniform4uiv_remap_index },
-   { 33694, VertexAttribI1iv_remap_index },
-   { 10888, VertexAttribI1uiv_remap_index },
-   {  7095, VertexAttribI4bv_remap_index },
-   {  9661, VertexAttribI4sv_remap_index },
-   {  7989, VertexAttribI4ubv_remap_index },
-   {  6608, VertexAttribI4usv_remap_index },
-   { 38705, VertexAttribIPointer_remap_index },
-   {  7936, PrimitiveRestartIndex_remap_index },
-   { 32279, TexBuffer_remap_index },
+   {  9788, UniformMatrix3x2fv_remap_index },
+   { 41151, UniformMatrix3x4fv_remap_index },
+   { 36983, UniformMatrix4x2fv_remap_index },
+   { 11041, UniformMatrix4x3fv_remap_index },
+   { 15671, BeginConditionalRender_remap_index },
+   { 23107, BeginTransformFeedback_remap_index },
+   { 11922, BindBufferBase_remap_index },
+   {  7257, BindBufferRange_remap_index },
+   { 21405, BindFragDataLocation_remap_index },
+   { 22469, ClampColor_remap_index },
+   { 16031, ClearBufferfi_remap_index },
+   { 15880, ClearBufferfv_remap_index },
+   { 19749, ClearBufferiv_remap_index },
+   { 36350, ClearBufferuiv_remap_index },
+   { 12502, ColorMaski_remap_index },
+   { 35712, Disablei_remap_index },
+   { 14336, Enablei_remap_index },
+   { 21935, EndConditionalRender_remap_index },
+   { 18600, EndTransformFeedback_remap_index },
+   { 11434, GetBooleani_v_remap_index },
+   { 37839, GetFragDataLocation_remap_index },
+   { 19770, GetIntegeri_v_remap_index },
+   { 27209, GetStringi_remap_index },
+   { 28923, GetTexParameterIiv_remap_index },
+   { 12698, GetTexParameterIuiv_remap_index },
+   { 29137, GetTransformFeedbackVarying_remap_index },
+   { 34534, GetUniformuiv_remap_index },
+   { 41377, GetVertexAttribIiv_remap_index },
+   { 19581, GetVertexAttribIuiv_remap_index },
+   { 32062, IsEnabledi_remap_index },
+   { 18839, TexParameterIiv_remap_index },
+   { 15512, TexParameterIuiv_remap_index },
+   { 37371, TransformFeedbackVaryings_remap_index },
+   {  5163, Uniform1ui_remap_index },
+   { 24478, Uniform1uiv_remap_index },
+   { 23927, Uniform2ui_remap_index },
+   { 12544, Uniform2uiv_remap_index },
+   { 31377, Uniform3ui_remap_index },
+   { 18143, Uniform3uiv_remap_index },
+   { 11357, Uniform4ui_remap_index },
+   { 17066, Uniform4uiv_remap_index },
+   { 33664, VertexAttribI1iv_remap_index },
+   { 10849, VertexAttribI1uiv_remap_index },
+   {  7086, VertexAttribI4bv_remap_index },
+   {  9652, VertexAttribI4sv_remap_index },
+   {  7980, VertexAttribI4ubv_remap_index },
+   {  6599, VertexAttribI4usv_remap_index },
+   { 38675, VertexAttribIPointer_remap_index },
+   {  7927, PrimitiveRestartIndex_remap_index },
+   { 32249, TexBuffer_remap_index },
    {   111, FramebufferTexture_remap_index },
-   { 22898, GetBufferParameteri64v_remap_index },
-   { 38037, GetInteger64i_v_remap_index },
-   { 39019, VertexAttribDivisor_remap_index },
-   { 41856, MinSampleShading_remap_index },
-   {  6814, BindProgramARB_remap_index },
-   { 29630, DeleteProgramsARB_remap_index },
-   { 14462, GenProgramsARB_remap_index },
-   { 13534, GetProgramEnvParameterdvARB_remap_index },
-   { 28445, GetProgramEnvParameterfvARB_remap_index },
-   { 29809, GetProgramLocalParameterdvARB_remap_index },
-   { 35963, GetProgramLocalParameterfvARB_remap_index },
-   { 21573, GetProgramStringARB_remap_index },
-   {  7822, GetProgramivARB_remap_index },
-   { 30080, IsProgramARB_remap_index },
-   { 16474, ProgramEnvParameter4dARB_remap_index },
+   { 22875, GetBufferParameteri64v_remap_index },
+   { 38007, GetInteger64i_v_remap_index },
+   { 38989, VertexAttribDivisor_remap_index },
+   { 41826, MinSampleShading_remap_index },
+   {  6805, BindProgramARB_remap_index },
+   { 29575, DeleteProgramsARB_remap_index },
+   { 14423, GenProgramsARB_remap_index },
+   { 13495, GetProgramEnvParameterdvARB_remap_index },
+   { 28390, GetProgramEnvParameterfvARB_remap_index },
+   { 29754, GetProgramLocalParameterdvARB_remap_index },
+   { 35933, GetProgramLocalParameterfvARB_remap_index },
+   { 21550, GetProgramStringARB_remap_index },
+   {  7813, GetProgramivARB_remap_index },
+   { 30025, IsProgramARB_remap_index },
+   { 16485, ProgramEnvParameter4dARB_remap_index },
    {  2502, ProgramEnvParameter4dvARB_remap_index },
-   { 37169, ProgramEnvParameter4fARB_remap_index },
-   { 23635, ProgramEnvParameter4fvARB_remap_index },
-   { 22008, ProgramLocalParameter4dARB_remap_index },
-   {  3797, ProgramLocalParameter4dvARB_remap_index },
-   { 29361, ProgramLocalParameter4fARB_remap_index },
-   { 18391, ProgramLocalParameter4fvARB_remap_index },
-   { 30152, ProgramStringARB_remap_index },
-   { 11432, VertexAttrib1fARB_remap_index },
-   { 30550, VertexAttrib1fvARB_remap_index },
-   { 21254, VertexAttrib2fARB_remap_index },
-   { 12834, VertexAttrib2fvARB_remap_index },
+   { 37139, ProgramEnvParameter4fARB_remap_index },
+   { 23612, ProgramEnvParameter4fvARB_remap_index },
+   { 21985, ProgramLocalParameter4dARB_remap_index },
+   {  3764, ProgramLocalParameter4dvARB_remap_index },
+   { 29306, ProgramLocalParameter4fARB_remap_index },
+   { 18402, ProgramLocalParameter4fvARB_remap_index },
+   { 30097, ProgramStringARB_remap_index },
+   { 11393, VertexAttrib1fARB_remap_index },
+   { 30520, VertexAttrib1fvARB_remap_index },
+   { 21231, VertexAttrib2fARB_remap_index },
+   { 12795, VertexAttrib2fvARB_remap_index },
    {   334, VertexAttrib3fARB_remap_index },
-   { 25353, VertexAttrib3fvARB_remap_index },
-   { 24235, VertexAttrib4fARB_remap_index },
-   { 13799, VertexAttrib4fvARB_remap_index },
-   { 34351, AttachObjectARB_remap_index },
-   { 21617, CreateProgramObjectARB_remap_index },
-   { 15918, CreateShaderObjectARB_remap_index },
-   { 14823, DeleteObjectARB_remap_index },
-   { 36808, DetachObjectARB_remap_index },
-   { 34690, GetAttachedObjectsARB_remap_index },
-   { 23840, GetHandleARB_remap_index },
-   { 19687, GetInfoLogARB_remap_index },
-   { 20469, GetObjectParameterfvARB_remap_index },
-   { 40367, GetObjectParameterivARB_remap_index },
-   {  5308, DrawArraysInstancedARB_remap_index },
-   {  6962, DrawElementsInstancedARB_remap_index },
-   { 13297, BindFramebuffer_remap_index },
-   {  7845, BindRenderbuffer_remap_index },
-   { 32465, BlitFramebuffer_remap_index },
-   {  6031, CheckFramebufferStatus_remap_index },
-   { 19171, DeleteFramebuffers_remap_index },
-   { 35545, DeleteRenderbuffers_remap_index },
-   { 29990, FramebufferRenderbuffer_remap_index },
-   { 32516, FramebufferTexture1D_remap_index },
-   { 22273, FramebufferTexture2D_remap_index },
-   { 25950, FramebufferTexture3D_remap_index },
-   { 35806, FramebufferTextureLayer_remap_index },
-   { 38405, GenFramebuffers_remap_index },
-   { 31971, GenRenderbuffers_remap_index },
-   {  7206, GenerateMipmap_remap_index },
-   {  5004, GetFramebufferAttachmentParameteriv_remap_index },
-   { 41900, GetRenderbufferParameteriv_remap_index },
-   {  6195, IsFramebuffer_remap_index },
-   { 24583, IsRenderbuffer_remap_index },
+   { 25330, VertexAttrib3fvARB_remap_index },
+   { 24212, VertexAttrib4fARB_remap_index },
+   { 13760, VertexAttrib4fvARB_remap_index },
+   { 34321, AttachObjectARB_remap_index },
+   { 21594, CreateProgramObjectARB_remap_index },
+   { 15929, CreateShaderObjectARB_remap_index },
+   { 14808, DeleteObjectARB_remap_index },
+   { 36778, DetachObjectARB_remap_index },
+   { 34660, GetAttachedObjectsARB_remap_index },
+   { 23817, GetHandleARB_remap_index },
+   { 19698, GetInfoLogARB_remap_index },
+   { 20480, GetObjectParameterfvARB_remap_index },
+   { 40337, GetObjectParameterivARB_remap_index },
+   {  5275, DrawArraysInstancedARB_remap_index },
+   {  6953, DrawElementsInstancedARB_remap_index },
+   { 13258, BindFramebuffer_remap_index },
+   {  7836, BindRenderbuffer_remap_index },
+   { 32435, BlitFramebuffer_remap_index },
+   {  5998, CheckFramebufferStatus_remap_index },
+   { 19182, DeleteFramebuffers_remap_index },
+   { 35515, DeleteRenderbuffers_remap_index },
+   { 29935, FramebufferRenderbuffer_remap_index },
+   { 32486, FramebufferTexture1D_remap_index },
+   { 22250, FramebufferTexture2D_remap_index },
+   { 25927, FramebufferTexture3D_remap_index },
+   { 35776, FramebufferTextureLayer_remap_index },
+   { 38375, GenFramebuffers_remap_index },
+   { 31941, GenRenderbuffers_remap_index },
+   {  7197, GenerateMipmap_remap_index },
+   {  4971, GetFramebufferAttachmentParameteriv_remap_index },
+   { 41870, GetRenderbufferParameteriv_remap_index },
+   {  6162, IsFramebuffer_remap_index },
+   { 24560, IsRenderbuffer_remap_index },
    {   629, RenderbufferStorage_remap_index },
-   { 14245, RenderbufferStorageMultisample_remap_index },
-   { 18323, FramebufferTextureFaceARB_remap_index },
-   {  4931, FlushMappedBufferRange_remap_index },
-   { 29846, MapBufferRange_remap_index },
-   { 12676, BindVertexArray_remap_index },
+   { 14206, RenderbufferStorageMultisample_remap_index },
+   { 18334, FramebufferTextureFaceARB_remap_index },
+   {  4898, FlushMappedBufferRange_remap_index },
+   { 29791, MapBufferRange_remap_index },
+   { 12637, BindVertexArray_remap_index },
    {  1102, DeleteVertexArrays_remap_index },
-   { 16748, GenVertexArrays_remap_index },
-   { 37509, IsVertexArray_remap_index },
-   { 12456, GetActiveUniformBlockName_remap_index },
-   { 41674, GetActiveUniformBlockiv_remap_index },
+   { 16759, GenVertexArrays_remap_index },
+   { 37479, IsVertexArray_remap_index },
+   { 12417, GetActiveUniformBlockName_remap_index },
+   { 41644, GetActiveUniformBlockiv_remap_index },
    {  2928, GetActiveUniformName_remap_index },
-   { 13462, GetActiveUniformsiv_remap_index },
-   { 40227, GetUniformBlockIndex_remap_index },
-   {  9921, GetUniformIndices_remap_index },
-   { 33305, UniformBlockBinding_remap_index },
-   { 41136, CopyBufferSubData_remap_index },
-   { 41457, ClientWaitSync_remap_index },
-   { 10764, DeleteSync_remap_index },
-   { 33332, FenceSync_remap_index },
-   { 36788, GetInteger64v_remap_index },
-   { 38875, GetSynciv_remap_index },
-   { 14844, IsSync_remap_index },
-   { 32161, WaitSync_remap_index },
-   { 12491, DrawElementsBaseVertex_remap_index },
-   { 16108, DrawElementsInstancedBaseVertex_remap_index },
-   { 36034, DrawRangeElementsBaseVertex_remap_index },
-   { 39926, MultiDrawElementsBaseVertex_remap_index },
-   { 23380, ProvokingVertex_remap_index },
-   {  5253, GetMultisamplefv_remap_index },
-   { 33801, SampleMaski_remap_index },
+   { 13423, GetActiveUniformsiv_remap_index },
+   { 40197, GetUniformBlockIndex_remap_index },
+   {  9912, GetUniformIndices_remap_index },
+   { 33275, UniformBlockBinding_remap_index },
+   { 41106, CopyBufferSubData_remap_index },
+   { 41427, ClientWaitSync_remap_index },
+   { 10725, DeleteSync_remap_index },
+   { 33302, FenceSync_remap_index },
+   { 36758, GetInteger64v_remap_index },
+   { 38845, GetSynciv_remap_index },
+   { 14829, IsSync_remap_index },
+   { 32131, WaitSync_remap_index },
+   { 12452, DrawElementsBaseVertex_remap_index },
+   { 16119, DrawElementsInstancedBaseVertex_remap_index },
+   { 36004, DrawRangeElementsBaseVertex_remap_index },
+   { 39896, MultiDrawElementsBaseVertex_remap_index },
+   { 23357, ProvokingVertex_remap_index },
+   {  5220, GetMultisamplefv_remap_index },
+   { 33771, SampleMaski_remap_index },
    {  1861, TexImage2DMultisample_remap_index },
-   { 40170, TexImage3DMultisample_remap_index },
-   { 22086, BlendEquationSeparateiARB_remap_index },
-   { 26449, BlendEquationiARB_remap_index },
-   {  3559, BlendFuncSeparateiARB_remap_index },
-   { 23880, BlendFunciARB_remap_index },
+   { 40140, TexImage3DMultisample_remap_index },
+   { 22063, BlendEquationSeparateiARB_remap_index },
+   { 26394, BlendEquationiARB_remap_index },
+   {  3526, BlendFuncSeparateiARB_remap_index },
+   { 23857, BlendFunciARB_remap_index },
    {  1626, BindFragDataLocationIndexed_remap_index },
-   { 27853, GetFragDataIndex_remap_index },
+   { 27798, GetFragDataIndex_remap_index },
    {  2649, BindSampler_remap_index },
-   { 41267, DeleteSamplers_remap_index },
-   { 34312, GenSamplers_remap_index },
+   { 41237, DeleteSamplers_remap_index },
+   { 34282, GenSamplers_remap_index },
    {  2369, GetSamplerParameterIiv_remap_index },
-   {  5497, GetSamplerParameterIuiv_remap_index },
-   { 22355, GetSamplerParameterfv_remap_index },
-   { 24016, GetSamplerParameteriv_remap_index },
-   { 25206, IsSampler_remap_index },
-   { 37040, SamplerParameterIiv_remap_index },
-   { 11800, SamplerParameterIuiv_remap_index },
-   { 41341, SamplerParameterf_remap_index },
-   { 37113, SamplerParameterfv_remap_index },
-   { 41288, SamplerParameteri_remap_index },
-   { 27128, SamplerParameteriv_remap_index },
-   { 22442, GetQueryObjecti64v_remap_index },
-   {  3849, GetQueryObjectui64v_remap_index },
-   { 12386, QueryCounter_remap_index },
-   { 36364, ColorP3ui_remap_index },
-   {  6350, ColorP3uiv_remap_index },
-   { 16868, ColorP4ui_remap_index },
-   { 24948, ColorP4uiv_remap_index },
-   { 13200, MultiTexCoordP1ui_remap_index },
-   { 24718, MultiTexCoordP1uiv_remap_index },
-   { 32689, MultiTexCoordP2ui_remap_index },
-   {  8511, MultiTexCoordP2uiv_remap_index },
-   { 25036, MultiTexCoordP3ui_remap_index },
+   {  5464, GetSamplerParameterIuiv_remap_index },
+   { 22332, GetSamplerParameterfv_remap_index },
+   { 23993, GetSamplerParameteriv_remap_index },
+   { 25183, IsSampler_remap_index },
+   { 37010, SamplerParameterIiv_remap_index },
+   { 11761, SamplerParameterIuiv_remap_index },
+   { 41311, SamplerParameterf_remap_index },
+   { 37083, SamplerParameterfv_remap_index },
+   { 41258, SamplerParameteri_remap_index },
+   { 27073, SamplerParameteriv_remap_index },
+   { 22419, GetQueryObjecti64v_remap_index },
+   {  3816, GetQueryObjectui64v_remap_index },
+   { 12347, QueryCounter_remap_index },
+   { 36334, ColorP3ui_remap_index },
+   {  6317, ColorP3uiv_remap_index },
+   { 16879, ColorP4ui_remap_index },
+   { 24925, ColorP4uiv_remap_index },
+   { 13161, MultiTexCoordP1ui_remap_index },
+   { 24695, MultiTexCoordP1uiv_remap_index },
+   { 32659, MultiTexCoordP2ui_remap_index },
+   {  8502, MultiTexCoordP2uiv_remap_index },
+   { 25013, MultiTexCoordP3ui_remap_index },
    {   391, MultiTexCoordP3uiv_remap_index },
-   { 38680, MultiTexCoordP4ui_remap_index },
-   { 32807, MultiTexCoordP4uiv_remap_index },
-   { 34883, NormalP3ui_remap_index },
-   { 24643, NormalP3uiv_remap_index },
-   { 39543, SecondaryColorP3ui_remap_index },
-   {  5445, SecondaryColorP3uiv_remap_index },
+   { 38650, MultiTexCoordP4ui_remap_index },
+   { 32777, MultiTexCoordP4uiv_remap_index },
+   { 34853, NormalP3ui_remap_index },
+   { 24620, NormalP3uiv_remap_index },
+   { 39513, SecondaryColorP3ui_remap_index },
+   {  5412, SecondaryColorP3uiv_remap_index },
    {   162, TexCoordP1ui_remap_index },
    {   609, TexCoordP1uiv_remap_index },
-   { 25312, TexCoordP2ui_remap_index },
-   { 35199, TexCoordP2uiv_remap_index },
-   { 14120, TexCoordP3ui_remap_index },
-   { 16911, TexCoordP3uiv_remap_index },
-   { 32588, TexCoordP4ui_remap_index },
+   { 25289, TexCoordP2ui_remap_index },
+   { 35169, TexCoordP2uiv_remap_index },
+   { 14081, TexCoordP3ui_remap_index },
+   { 16922, TexCoordP3uiv_remap_index },
+   { 32558, TexCoordP4ui_remap_index },
    {  1709, TexCoordP4uiv_remap_index },
-   { 14189, VertexAttribP1ui_remap_index },
-   {  3901, VertexAttribP1uiv_remap_index },
-   { 28617, VertexAttribP2ui_remap_index },
-   {  4627, VertexAttribP2uiv_remap_index },
+   { 14150, VertexAttribP1ui_remap_index },
+   {  3868, VertexAttribP1uiv_remap_index },
+   { 28562, VertexAttribP2ui_remap_index },
+   {  4594, VertexAttribP2uiv_remap_index },
    {  1456, VertexAttribP3ui_remap_index },
-   { 27154, VertexAttribP3uiv_remap_index },
-   {  4109, VertexAttribP4ui_remap_index },
-   { 15350, VertexAttribP4uiv_remap_index },
-   { 33430, VertexP2ui_remap_index },
-   { 31137, VertexP2uiv_remap_index },
-   { 21600, VertexP3ui_remap_index },
-   {  5742, VertexP3uiv_remap_index },
+   { 27099, VertexAttribP3uiv_remap_index },
+   {  4076, VertexAttribP4ui_remap_index },
+   { 15335, VertexAttribP4uiv_remap_index },
+   { 33400, VertexP2ui_remap_index },
+   { 31107, VertexP2uiv_remap_index },
+   { 21577, VertexP3ui_remap_index },
+   {  5709, VertexP3uiv_remap_index },
    {  2883, VertexP4ui_remap_index },
-   { 41838, VertexP4uiv_remap_index },
+   { 41808, VertexP4uiv_remap_index },
    {   746, DrawArraysIndirect_remap_index },
-   { 22605, DrawElementsIndirect_remap_index },
-   { 10243, BindTransformFeedback_remap_index },
-   { 10115, DeleteTransformFeedbacks_remap_index },
-   { 33963, DrawTransformFeedback_remap_index },
-   {  3695, GenTransformFeedbacks_remap_index },
-   { 31628, IsTransformFeedback_remap_index },
-   { 29418, PauseTransformFeedback_remap_index },
-   { 33629, ResumeTransformFeedback_remap_index },
-   { 21516, BeginQueryIndexed_remap_index },
-   { 39070, DrawTransformFeedbackStream_remap_index },
-   { 18222, EndQueryIndexed_remap_index },
-   { 20786, GetQueryIndexediv_remap_index },
-   { 41804, ClearDepthf_remap_index },
-   { 22946, DepthRangef_remap_index },
-   { 36402, GetShaderPrecisionFormat_remap_index },
-   {  3016, ReleaseShaderCompiler_remap_index },
-   { 24106, ShaderBinary_remap_index },
-   { 18666, GetProgramBinary_remap_index },
-   { 11330, ProgramBinary_remap_index },
-   { 11565, ProgramParameteri_remap_index },
-   { 25671, DepthRangeArrayv_remap_index },
-   { 39992, DepthRangeIndexed_remap_index },
-   { 31608, GetDoublei_v_remap_index },
-   { 33819, GetFloati_v_remap_index },
-   { 40433, ScissorArrayv_remap_index },
-   { 23984, ScissorIndexed_remap_index },
-   { 27180, ScissorIndexedv_remap_index },
-   { 17663, ViewportArrayv_remap_index },
-   { 30269, ViewportIndexedf_remap_index },
-   { 18714, ViewportIndexedfv_remap_index },
-   { 10355, DebugMessageCallbackARB_remap_index },
-   {  2958, DebugMessageControlARB_remap_index },
-   { 26219, DebugMessageInsertARB_remap_index },
-   { 20850, GetDebugMessageLogARB_remap_index },
-   {  8036, GetGraphicsResetStatusARB_remap_index },
-   { 28760, GetnColorTableARB_remap_index },
+   { 22582, DrawElementsIndirect_remap_index },
+   { 10234, BindTransformFeedback_remap_index },
+   { 10106, DeleteTransformFeedbacks_remap_index },
+   { 33933, DrawTransformFeedback_remap_index },
+   {  3662, GenTransformFeedbacks_remap_index },
+   { 31598, IsTransformFeedback_remap_index },
+   { 29363, PauseTransformFeedback_remap_index },
+   { 33599, ResumeTransformFeedback_remap_index },
+   { 21493, BeginQueryIndexed_remap_index },
+   { 39040, DrawTransformFeedbackStream_remap_index },
+   { 18233, EndQueryIndexed_remap_index },
+   { 20797, GetQueryIndexediv_remap_index },
+   { 41774, ClearDepthf_remap_index },
+   { 22923, DepthRangef_remap_index },
+   { 36372, GetShaderPrecisionFormat_remap_index },
+   {  2983, ReleaseShaderCompiler_remap_index },
+   { 24083, ShaderBinary_remap_index },
+   { 18677, GetProgramBinary_remap_index },
+   { 11291, ProgramBinary_remap_index },
+   { 11526, ProgramParameteri_remap_index },
+   { 25648, DepthRangeArrayv_remap_index },
+   { 39962, DepthRangeIndexed_remap_index },
+   { 31578, GetDoublei_v_remap_index },
+   { 33789, GetFloati_v_remap_index },
+   { 40403, ScissorArrayv_remap_index },
+   { 23961, ScissorIndexed_remap_index },
+   { 27125, ScissorIndexedv_remap_index },
+   { 17674, ViewportArrayv_remap_index },
+   { 30214, ViewportIndexedf_remap_index },
+   { 18725, ViewportIndexedfv_remap_index },
+   {  8027, GetGraphicsResetStatusARB_remap_index },
+   { 28705, GetnColorTableARB_remap_index },
    {  2615, GetnCompressedTexImageARB_remap_index },
    {  1202, GetnConvolutionFilterARB_remap_index },
-   {  4501, GetnHistogramARB_remap_index },
-   { 17548, GetnMapdvARB_remap_index },
-   { 11691, GetnMapfvARB_remap_index },
-   { 32714, GetnMapivARB_remap_index },
-   { 37281, GetnMinmaxARB_remap_index },
-   {  3412, GetnPixelMapfvARB_remap_index },
-   {  5471, GetnPixelMapuivARB_remap_index },
-   { 11011, GetnPixelMapusvARB_remap_index },
-   { 21162, GetnPolygonStippleARB_remap_index },
-   { 27621, GetnSeparableFilterARB_remap_index },
-   {  9555, GetnTexImageARB_remap_index },
-   { 26764, GetnUniformdvARB_remap_index },
-   { 32376, GetnUniformfvARB_remap_index },
-   {  2991, GetnUniformivARB_remap_index },
-   { 13060, GetnUniformuivARB_remap_index },
-   { 24279, ReadnPixelsARB_remap_index },
-   { 31310, DrawArraysInstancedBaseInstance_remap_index },
-   {  9706, DrawElementsInstancedBaseInstance_remap_index },
+   {  4468, GetnHistogramARB_remap_index },
+   { 17559, GetnMapdvARB_remap_index },
+   { 11652, GetnMapfvARB_remap_index },
+   { 32684, GetnMapivARB_remap_index },
+   { 37251, GetnMinmaxARB_remap_index },
+   {  3379, GetnPixelMapfvARB_remap_index },
+   {  5438, GetnPixelMapuivARB_remap_index },
+   { 10972, GetnPixelMapusvARB_remap_index },
+   { 21139, GetnPolygonStippleARB_remap_index },
+   { 27566, GetnSeparableFilterARB_remap_index },
+   {  9546, GetnTexImageARB_remap_index },
+   { 26709, GetnUniformdvARB_remap_index },
+   { 32346, GetnUniformfvARB_remap_index },
+   {  2958, GetnUniformivARB_remap_index },
+   { 13021, GetnUniformuivARB_remap_index },
+   { 24256, ReadnPixelsARB_remap_index },
+   { 31280, DrawArraysInstancedBaseInstance_remap_index },
+   {  9697, DrawElementsInstancedBaseInstance_remap_index },
    {  2447, DrawElementsInstancedBaseVertexBaseInstance_remap_index },
-   { 33572, DrawTransformFeedbackInstanced_remap_index },
-   { 12789, DrawTransformFeedbackStreamInstanced_remap_index },
-   { 40454, GetInternalformativ_remap_index },
-   { 18789, GetActiveAtomicCounterBufferiv_remap_index },
-   { 41776, BindImageTexture_remap_index },
-   { 20382, MemoryBarrier_remap_index },
-   { 32444, TexStorage1D_remap_index },
-   { 22215, TexStorage2D_remap_index },
-   { 25927, TexStorage3D_remap_index },
+   { 33542, DrawTransformFeedbackInstanced_remap_index },
+   { 12750, DrawTransformFeedbackStreamInstanced_remap_index },
+   { 40424, GetInternalformativ_remap_index },
+   { 18800, GetActiveAtomicCounterBufferiv_remap_index },
+   { 41746, BindImageTexture_remap_index },
+   { 20393, MemoryBarrier_remap_index },
+   { 32414, TexStorage1D_remap_index },
+   { 22192, TexStorage2D_remap_index },
+   { 25904, TexStorage3D_remap_index },
    {  1379, TextureStorage1DEXT_remap_index },
-   { 33516, TextureStorage2DEXT_remap_index },
-   { 21223, TextureStorage3DEXT_remap_index },
-   { 34223, ClearBufferData_remap_index },
+   { 33486, TextureStorage2DEXT_remap_index },
+   { 21200, TextureStorage3DEXT_remap_index },
+   { 34193, ClearBufferData_remap_index },
    {  2029, ClearBufferSubData_remap_index },
-   { 29889, DispatchCompute_remap_index },
-   {  6115, DispatchComputeIndirect_remap_index },
-   { 38894, TextureView_remap_index },
-   { 20680, BindVertexBuffer_remap_index },
-   { 28322, VertexAttribBinding_remap_index },
-   { 28787, VertexAttribFormat_remap_index },
-   { 31251, VertexAttribIFormat_remap_index },
-   { 34738, VertexAttribLFormat_remap_index },
-   { 33241, VertexBindingDivisor_remap_index },
-   {  3154, MultiDrawArraysIndirect_remap_index },
-   { 17273, MultiDrawElementsIndirect_remap_index },
-   { 17208, TexBufferRange_remap_index },
-   { 36590, TexStorage2DMultisample_remap_index },
-   { 27073, TexStorage3DMultisample_remap_index },
-   {  3186, BufferStorage_remap_index },
-   {  6144, InvalidateBufferData_remap_index },
-   { 36982, InvalidateBufferSubData_remap_index },
-   { 20342, InvalidateFramebuffer_remap_index },
-   { 15112, InvalidateSubFramebuffer_remap_index },
-   { 11371, InvalidateTexImage_remap_index },
-   { 24306, InvalidateTexSubImage_remap_index },
-   { 12138, PolygonOffsetEXT_remap_index },
-   { 34330, DrawTexfOES_remap_index },
-   {  3723, DrawTexfvOES_remap_index },
+   { 29834, DispatchCompute_remap_index },
+   {  6082, DispatchComputeIndirect_remap_index },
+   { 38864, TextureView_remap_index },
+   { 20691, BindVertexBuffer_remap_index },
+   { 28267, VertexAttribBinding_remap_index },
+   { 28732, VertexAttribFormat_remap_index },
+   { 31221, VertexAttribIFormat_remap_index },
+   { 34708, VertexAttribLFormat_remap_index },
+   { 33211, VertexBindingDivisor_remap_index },
+   {  3121, MultiDrawArraysIndirect_remap_index },
+   { 17284, MultiDrawElementsIndirect_remap_index },
+   { 17219, TexBufferRange_remap_index },
+   { 36560, TexStorage2DMultisample_remap_index },
+   { 27018, TexStorage3DMultisample_remap_index },
+   {  3153, BufferStorage_remap_index },
+   {  6111, InvalidateBufferData_remap_index },
+   { 36952, InvalidateBufferSubData_remap_index },
+   { 20353, InvalidateFramebuffer_remap_index },
+   { 15097, InvalidateSubFramebuffer_remap_index },
+   { 11332, InvalidateTexImage_remap_index },
+   { 24283, InvalidateTexSubImage_remap_index },
+   { 12099, PolygonOffsetEXT_remap_index },
+   { 34300, DrawTexfOES_remap_index },
+   {  3690, DrawTexfvOES_remap_index },
    {   955, DrawTexiOES_remap_index },
-   { 28696, DrawTexivOES_remap_index },
-   { 11518, DrawTexsOES_remap_index },
-   { 20536, DrawTexsvOES_remap_index },
-   { 24965, DrawTexxOES_remap_index },
-   { 36230, DrawTexxvOES_remap_index },
-   { 23271, PointSizePointerOES_remap_index },
+   { 28641, DrawTexivOES_remap_index },
+   { 11479, DrawTexsOES_remap_index },
+   { 20547, DrawTexsvOES_remap_index },
+   { 24942, DrawTexxOES_remap_index },
+   { 36200, DrawTexxvOES_remap_index },
+   { 23248, PointSizePointerOES_remap_index },
    {   918, QueryMatrixxOES_remap_index },
-   { 18286, SampleMaskSGIS_remap_index },
-   { 31365, SamplePatternSGIS_remap_index },
-   { 39854, ColorPointerEXT_remap_index },
-   { 26369, EdgeFlagPointerEXT_remap_index },
-   { 12215, IndexPointerEXT_remap_index },
-   { 12405, NormalPointerEXT_remap_index },
-   { 25736, TexCoordPointerEXT_remap_index },
-   { 23088, VertexPointerEXT_remap_index },
-   { 39793, DiscardFramebufferEXT_remap_index },
-   { 10089, ActiveShaderProgram_remap_index },
-   { 15325, BindProgramPipeline_remap_index },
-   { 26421, CreateShaderProgramv_remap_index },
-   {  3338, DeleteProgramPipelines_remap_index },
-   { 24045, GenProgramPipelines_remap_index },
-   {  7557, GetProgramPipelineInfoLog_remap_index },
-   { 28863, GetProgramPipelineiv_remap_index },
-   { 24083, IsProgramPipeline_remap_index },
-   { 41654, LockArraysEXT_remap_index },
-   { 40994, ProgramUniform1f_remap_index },
-   {  8900, ProgramUniform1fv_remap_index },
-   { 40970, ProgramUniform1i_remap_index },
-   { 14021, ProgramUniform1iv_remap_index },
-   { 31784, ProgramUniform1ui_remap_index },
-   { 40842, ProgramUniform1uiv_remap_index },
+   { 18297, SampleMaskSGIS_remap_index },
+   { 31335, SamplePatternSGIS_remap_index },
+   { 39824, ColorPointerEXT_remap_index },
+   { 26314, EdgeFlagPointerEXT_remap_index },
+   { 12176, IndexPointerEXT_remap_index },
+   { 12366, NormalPointerEXT_remap_index },
+   { 25713, TexCoordPointerEXT_remap_index },
+   { 23065, VertexPointerEXT_remap_index },
+   { 39763, DiscardFramebufferEXT_remap_index },
+   { 10080, ActiveShaderProgram_remap_index },
+   { 15310, BindProgramPipeline_remap_index },
+   { 26366, CreateShaderProgramv_remap_index },
+   {  3305, DeleteProgramPipelines_remap_index },
+   { 24022, GenProgramPipelines_remap_index },
+   {  7548, GetProgramPipelineInfoLog_remap_index },
+   { 28808, GetProgramPipelineiv_remap_index },
+   { 24060, IsProgramPipeline_remap_index },
+   { 41624, LockArraysEXT_remap_index },
+   { 40964, ProgramUniform1f_remap_index },
+   {  8891, ProgramUniform1fv_remap_index },
+   { 40940, ProgramUniform1i_remap_index },
+   { 13982, ProgramUniform1iv_remap_index },
+   { 31754, ProgramUniform1ui_remap_index },
+   { 40812, ProgramUniform1uiv_remap_index },
    {  2137, ProgramUniform2f_remap_index },
-   { 16645, ProgramUniform2fv_remap_index },
+   { 16656, ProgramUniform2fv_remap_index },
    {  2198, ProgramUniform2i_remap_index },
-   { 19804, ProgramUniform2iv_remap_index },
-   {  6687, ProgramUniform2ui_remap_index },
-   {  8343, ProgramUniform2uiv_remap_index },
-   {  4231, ProgramUniform3f_remap_index },
-   { 27902, ProgramUniform3fv_remap_index },
-   {  4257, ProgramUniform3i_remap_index },
-   { 12430, ProgramUniform3iv_remap_index },
-   { 14047, ProgramUniform3ui_remap_index },
-   { 16618, ProgramUniform3uiv_remap_index },
-   { 26823, ProgramUniform4f_remap_index },
-   { 30875, ProgramUniform4fv_remap_index },
-   { 26850, ProgramUniform4i_remap_index },
+   { 19815, ProgramUniform2iv_remap_index },
+   {  6678, ProgramUniform2ui_remap_index },
+   {  8334, ProgramUniform2uiv_remap_index },
+   {  4198, ProgramUniform3f_remap_index },
+   { 27847, ProgramUniform3fv_remap_index },
+   {  4224, ProgramUniform3i_remap_index },
+   { 12391, ProgramUniform3iv_remap_index },
+   { 14008, ProgramUniform3ui_remap_index },
+   { 16629, ProgramUniform3uiv_remap_index },
+   { 26768, ProgramUniform4f_remap_index },
+   { 30845, ProgramUniform4fv_remap_index },
+   { 26795, ProgramUniform4i_remap_index },
    {  1788, ProgramUniform4iv_remap_index },
-   { 37590, ProgramUniform4ui_remap_index },
-   { 30698, ProgramUniform4uiv_remap_index },
-   { 18358, ProgramUniformMatrix2fv_remap_index },
-   { 20645, ProgramUniformMatrix2x3fv_remap_index },
-   {  7312, ProgramUniformMatrix2x4fv_remap_index },
-   { 35913, ProgramUniformMatrix3fv_remap_index },
-   { 31573, ProgramUniformMatrix3x2fv_remap_index },
-   { 25396, ProgramUniformMatrix3x4fv_remap_index },
-   { 29936, ProgramUniformMatrix4fv_remap_index },
+   { 37560, ProgramUniform4ui_remap_index },
+   { 30668, ProgramUniform4uiv_remap_index },
+   { 18369, ProgramUniformMatrix2fv_remap_index },
+   { 20656, ProgramUniformMatrix2x3fv_remap_index },
+   {  7303, ProgramUniformMatrix2x4fv_remap_index },
+   { 35883, ProgramUniformMatrix3fv_remap_index },
+   { 31543, ProgramUniformMatrix3x2fv_remap_index },
+   { 25373, ProgramUniformMatrix3x4fv_remap_index },
+   { 29881, ProgramUniformMatrix4fv_remap_index },
    {  2102, ProgramUniformMatrix4x2fv_remap_index },
-   {  6907, ProgramUniformMatrix4x3fv_remap_index },
-   { 36624, UnlockArraysEXT_remap_index },
-   { 29912, UseProgramStages_remap_index },
+   {  6898, ProgramUniformMatrix4x3fv_remap_index },
+   { 36594, UnlockArraysEXT_remap_index },
+   { 29857, UseProgramStages_remap_index },
    {  1597, ValidateProgramPipeline_remap_index },
-   { 15376, DebugMessageCallback_remap_index },
-   { 30362, DebugMessageControl_remap_index },
-   { 14706, DebugMessageInsert_remap_index },
-   {  6514, GetDebugMessageLog_remap_index },
-   {  6305, GetObjectLabel_remap_index },
-   { 11539, GetObjectPtrLabel_remap_index },
-   { 29398, ObjectLabel_remap_index },
-   { 41741, ObjectPtrLabel_remap_index },
-   { 17091, PopDebugGroup_remap_index },
-   { 30989, PushDebugGroup_remap_index },
-   {  7890, SecondaryColor3fEXT_remap_index },
-   {  7435, SecondaryColor3fvEXT_remap_index },
-   { 27571, MultiDrawElementsEXT_remap_index },
-   { 10171, FogCoordfEXT_remap_index },
-   { 17308, FogCoordfvEXT_remap_index },
-   {  3974, ResizeBuffersMESA_remap_index },
-   { 32650, WindowPos4dMESA_remap_index },
-   { 26266, WindowPos4dvMESA_remap_index },
-   {  4059, WindowPos4fMESA_remap_index },
-   { 10780, WindowPos4fvMESA_remap_index },
-   {  8583, WindowPos4iMESA_remap_index },
-   {  3485, WindowPos4ivMESA_remap_index },
-   { 26948, WindowPos4sMESA_remap_index },
+   { 15361, DebugMessageCallback_remap_index },
+   { 30307, DebugMessageControl_remap_index },
+   { 14667, DebugMessageInsert_remap_index },
+   {  6481, GetDebugMessageLog_remap_index },
+   {  6272, GetObjectLabel_remap_index },
+   { 11500, GetObjectPtrLabel_remap_index },
+   { 29343, ObjectLabel_remap_index },
+   { 41711, ObjectPtrLabel_remap_index },
+   { 17102, PopDebugGroup_remap_index },
+   { 30959, PushDebugGroup_remap_index },
+   {  7881, SecondaryColor3fEXT_remap_index },
+   {  7426, SecondaryColor3fvEXT_remap_index },
+   { 27516, MultiDrawElementsEXT_remap_index },
+   { 10162, FogCoordfEXT_remap_index },
+   { 17319, FogCoordfvEXT_remap_index },
+   {  3941, ResizeBuffersMESA_remap_index },
+   { 32620, WindowPos4dMESA_remap_index },
+   { 26211, WindowPos4dvMESA_remap_index },
+   {  4026, WindowPos4fMESA_remap_index },
+   { 10741, WindowPos4fvMESA_remap_index },
+   {  8574, WindowPos4iMESA_remap_index },
+   {  3452, WindowPos4ivMESA_remap_index },
+   { 26893, WindowPos4sMESA_remap_index },
    {  1049, WindowPos4svMESA_remap_index },
-   { 27671, MultiModeDrawArraysIBM_remap_index },
-   { 18977, MultiModeDrawElementsIBM_remap_index },
-   { 31484, AreProgramsResidentNV_remap_index },
-   { 38232, ExecuteProgramNV_remap_index },
-   { 28413, GetProgramParameterdvNV_remap_index },
-   { 34945, GetProgramParameterfvNV_remap_index },
-   { 18426, GetProgramStringNV_remap_index },
-   { 15036, GetProgramivNV_remap_index },
-   { 17593, GetTrackMatrixivNV_remap_index },
-   { 18035, GetVertexAttribdvNV_remap_index },
-   { 16245, GetVertexAttribfvNV_remap_index },
-   { 15218, GetVertexAttribivNV_remap_index },
-   { 34668, LoadProgramNV_remap_index },
-   { 19077, ProgramParameters4dvNV_remap_index },
-   { 19656, ProgramParameters4fvNV_remap_index },
-   {  5926, RequestResidentProgramsNV_remap_index },
-   { 28034, TrackMatrixNV_remap_index },
-   { 13569, VertexAttrib1dNV_remap_index },
-   { 27016, VertexAttrib1dvNV_remap_index },
-   { 27342, VertexAttrib1fNV_remap_index },
-   { 40203, VertexAttrib1fvNV_remap_index },
-   { 20201, VertexAttrib1sNV_remap_index },
-   { 36644, VertexAttrib1svNV_remap_index },
-   { 17569, VertexAttrib2dNV_remap_index },
-   { 32934, VertexAttrib2dvNV_remap_index },
-   { 26118, VertexAttrib2fNV_remap_index },
-   { 24844, VertexAttrib2fvNV_remap_index },
-   { 12311, VertexAttrib2sNV_remap_index },
-   {  5421, VertexAttrib2svNV_remap_index },
-   { 35354, VertexAttrib3dNV_remap_index },
-   { 37243, VertexAttrib3dvNV_remap_index },
-   {  4680, VertexAttrib3fNV_remap_index },
-   { 39477, VertexAttrib3fvNV_remap_index },
-   {  6851, VertexAttrib3sNV_remap_index },
-   { 17620, VertexAttrib3svNV_remap_index },
-   {  8092, VertexAttrib4dNV_remap_index },
-   {  3263, VertexAttrib4dvNV_remap_index },
-   {  8163, VertexAttrib4fNV_remap_index },
-   { 39595, VertexAttrib4fvNV_remap_index },
-   { 16706, VertexAttrib4sNV_remap_index },
-   { 10385, VertexAttrib4svNV_remap_index },
+   { 27616, MultiModeDrawArraysIBM_remap_index },
+   { 18988, MultiModeDrawElementsIBM_remap_index },
+   { 31454, AreProgramsResidentNV_remap_index },
+   { 38202, ExecuteProgramNV_remap_index },
+   { 28358, GetProgramParameterdvNV_remap_index },
+   { 34915, GetProgramParameterfvNV_remap_index },
+   { 18437, GetProgramStringNV_remap_index },
+   { 15021, GetProgramivNV_remap_index },
+   { 17604, GetTrackMatrixivNV_remap_index },
+   { 18046, GetVertexAttribdvNV_remap_index },
+   { 16256, GetVertexAttribfvNV_remap_index },
+   { 15203, GetVertexAttribivNV_remap_index },
+   { 34638, LoadProgramNV_remap_index },
+   { 19088, ProgramParameters4dvNV_remap_index },
+   { 19667, ProgramParameters4fvNV_remap_index },
+   {  5893, RequestResidentProgramsNV_remap_index },
+   { 27979, TrackMatrixNV_remap_index },
+   { 13530, VertexAttrib1dNV_remap_index },
+   { 26961, VertexAttrib1dvNV_remap_index },
+   { 27287, VertexAttrib1fNV_remap_index },
+   { 40173, VertexAttrib1fvNV_remap_index },
+   { 20212, VertexAttrib1sNV_remap_index },
+   { 36614, VertexAttrib1svNV_remap_index },
+   { 17580, VertexAttrib2dNV_remap_index },
+   { 32904, VertexAttrib2dvNV_remap_index },
+   { 26095, VertexAttrib2fNV_remap_index },
+   { 24821, VertexAttrib2fvNV_remap_index },
+   { 12272, VertexAttrib2sNV_remap_index },
+   {  5388, VertexAttrib2svNV_remap_index },
+   { 35324, VertexAttrib3dNV_remap_index },
+   { 37213, VertexAttrib3dvNV_remap_index },
+   {  4647, VertexAttrib3fNV_remap_index },
+   { 39447, VertexAttrib3fvNV_remap_index },
+   {  6842, VertexAttrib3sNV_remap_index },
+   { 17631, VertexAttrib3svNV_remap_index },
+   {  8083, VertexAttrib4dNV_remap_index },
+   {  3230, VertexAttrib4dvNV_remap_index },
+   {  8154, VertexAttrib4fNV_remap_index },
+   { 39565, VertexAttrib4fvNV_remap_index },
+   { 16717, VertexAttrib4sNV_remap_index },
+   { 10346, VertexAttrib4svNV_remap_index },
    {  1570, VertexAttrib4ubNV_remap_index },
-   { 10146, VertexAttrib4ubvNV_remap_index },
-   { 27822, VertexAttribPointerNV_remap_index },
-   { 26317, VertexAttribs1dvNV_remap_index },
-   { 29689, VertexAttribs1fvNV_remap_index },
-   {  5900, VertexAttribs1svNV_remap_index },
-   { 40816, VertexAttribs2dvNV_remap_index },
-   {  4083, VertexAttribs2fvNV_remap_index },
-   { 26395, VertexAttribs2svNV_remap_index },
+   { 10137, VertexAttrib4ubvNV_remap_index },
+   { 27767, VertexAttribPointerNV_remap_index },
+   { 26262, VertexAttribs1dvNV_remap_index },
+   { 29634, VertexAttribs1fvNV_remap_index },
+   {  5867, VertexAttribs1svNV_remap_index },
+   { 40786, VertexAttribs2dvNV_remap_index },
+   {  4050, VertexAttribs2fvNV_remap_index },
+   { 26340, VertexAttribs2svNV_remap_index },
    {  1729, VertexAttribs3dvNV_remap_index },
-   { 33991, VertexAttribs3fvNV_remap_index },
-   { 13436, VertexAttribs3svNV_remap_index },
-   { 18640, VertexAttribs4dvNV_remap_index },
-   { 23422, VertexAttribs4fvNV_remap_index },
-   { 19830, VertexAttribs4svNV_remap_index },
-   { 30830, VertexAttribs4ubvNV_remap_index },
-   { 40081, GetTexBumpParameterfvATI_remap_index },
-   {  9947, GetTexBumpParameterivATI_remap_index },
-   { 34091, TexBumpParameterfvATI_remap_index },
-   {  8135, TexBumpParameterivATI_remap_index },
-   {  8783, AlphaFragmentOp1ATI_remap_index },
-   {  3287, AlphaFragmentOp2ATI_remap_index },
-   {  9216, AlphaFragmentOp3ATI_remap_index },
-   { 31944, BeginFragmentShaderATI_remap_index },
-   {  3532, BindFragmentShaderATI_remap_index },
-   {  6876, ColorFragmentOp1ATI_remap_index },
-   { 12277, ColorFragmentOp2ATI_remap_index },
-   { 23009, ColorFragmentOp3ATI_remap_index },
-   { 16060, DeleteFragmentShaderATI_remap_index },
-   { 42148, EndFragmentShaderATI_remap_index },
-   { 22059, GenFragmentShadersATI_remap_index },
-   { 39677, PassTexCoordATI_remap_index },
-   { 34071, SampleMapATI_remap_index },
-   { 33395, SetFragmentShaderConstantATI_remap_index },
-   {  8066, ActiveStencilFaceEXT_remap_index },
-   {  7692, BindVertexArrayAPPLE_remap_index },
-   { 15590, GenVertexArraysAPPLE_remap_index },
-   { 33657, GetProgramNamedParameterdvNV_remap_index },
-   { 21809, GetProgramNamedParameterfvNV_remap_index },
-   { 40112, ProgramNamedParameter4dNV_remap_index },
-   { 36435, ProgramNamedParameter4dvNV_remap_index },
-   { 39419, ProgramNamedParameter4fNV_remap_index },
-   { 24406, ProgramNamedParameter4fvNV_remap_index },
-   { 23329, PrimitiveRestartNV_remap_index },
-   { 23818, GetTexGenxvOES_remap_index },
-   { 37753, TexGenxOES_remap_index },
-   { 31051, TexGenxvOES_remap_index },
-   {  7616, DepthBoundsEXT_remap_index },
-   {  5670, BindFramebufferEXT_remap_index },
-   { 39735, BindRenderbufferEXT_remap_index },
-   {  4168, BufferParameteriAPPLE_remap_index },
-   { 37834, FlushMappedBufferRangeAPPLE_remap_index },
-   { 26642, VertexAttribI1iEXT_remap_index },
-   { 10719, VertexAttribI1uiEXT_remap_index },
-   { 19377, VertexAttribI2iEXT_remap_index },
-   { 39270, VertexAttribI2ivEXT_remap_index },
-   { 24537, VertexAttribI2uiEXT_remap_index },
-   { 33754, VertexAttribI2uivEXT_remap_index },
-   { 18507, VertexAttribI3iEXT_remap_index },
-   { 41222, VertexAttribI3ivEXT_remap_index },
-   { 21741, VertexAttribI3uiEXT_remap_index },
-   { 20105, VertexAttribI3uivEXT_remap_index },
-   { 36480, VertexAttribI4iEXT_remap_index },
-   {  6421, VertexAttribI4ivEXT_remap_index },
+   { 33961, VertexAttribs3fvNV_remap_index },
+   { 13397, VertexAttribs3svNV_remap_index },
+   { 18651, VertexAttribs4dvNV_remap_index },
+   { 23399, VertexAttribs4fvNV_remap_index },
+   { 19841, VertexAttribs4svNV_remap_index },
+   { 30800, VertexAttribs4ubvNV_remap_index },
+   { 40051, GetTexBumpParameterfvATI_remap_index },
+   {  9938, GetTexBumpParameterivATI_remap_index },
+   { 34061, TexBumpParameterfvATI_remap_index },
+   {  8126, TexBumpParameterivATI_remap_index },
+   {  8774, AlphaFragmentOp1ATI_remap_index },
+   {  3254, AlphaFragmentOp2ATI_remap_index },
+   {  9207, AlphaFragmentOp3ATI_remap_index },
+   { 31914, BeginFragmentShaderATI_remap_index },
+   {  3499, BindFragmentShaderATI_remap_index },
+   {  6867, ColorFragmentOp1ATI_remap_index },
+   { 12238, ColorFragmentOp2ATI_remap_index },
+   { 22986, ColorFragmentOp3ATI_remap_index },
+   { 16071, DeleteFragmentShaderATI_remap_index },
+   { 42118, EndFragmentShaderATI_remap_index },
+   { 22036, GenFragmentShadersATI_remap_index },
+   { 39647, PassTexCoordATI_remap_index },
+   { 34041, SampleMapATI_remap_index },
+   { 33365, SetFragmentShaderConstantATI_remap_index },
+   {  8057, ActiveStencilFaceEXT_remap_index },
+   {  7683, BindVertexArrayAPPLE_remap_index },
+   { 15601, GenVertexArraysAPPLE_remap_index },
+   { 33627, GetProgramNamedParameterdvNV_remap_index },
+   { 21786, GetProgramNamedParameterfvNV_remap_index },
+   { 40082, ProgramNamedParameter4dNV_remap_index },
+   { 36405, ProgramNamedParameter4dvNV_remap_index },
+   { 39389, ProgramNamedParameter4fNV_remap_index },
+   { 24383, ProgramNamedParameter4fvNV_remap_index },
+   { 23306, PrimitiveRestartNV_remap_index },
+   { 23795, GetTexGenxvOES_remap_index },
+   { 37723, TexGenxOES_remap_index },
+   { 31021, TexGenxvOES_remap_index },
+   {  7607, DepthBoundsEXT_remap_index },
+   {  5637, BindFramebufferEXT_remap_index },
+   { 39705, BindRenderbufferEXT_remap_index },
+   {  4135, BufferParameteriAPPLE_remap_index },
+   { 37804, FlushMappedBufferRangeAPPLE_remap_index },
+   { 26587, VertexAttribI1iEXT_remap_index },
+   { 10680, VertexAttribI1uiEXT_remap_index },
+   { 19388, VertexAttribI2iEXT_remap_index },
+   { 39240, VertexAttribI2ivEXT_remap_index },
+   { 24514, VertexAttribI2uiEXT_remap_index },
+   { 33724, VertexAttribI2uivEXT_remap_index },
+   { 18518, VertexAttribI3iEXT_remap_index },
+   { 41192, VertexAttribI3ivEXT_remap_index },
+   { 21718, VertexAttribI3uiEXT_remap_index },
+   { 20116, VertexAttribI3uivEXT_remap_index },
+   { 36450, VertexAttribI4iEXT_remap_index },
+   {  6388, VertexAttribI4ivEXT_remap_index },
    {  2399, VertexAttribI4uiEXT_remap_index },
-   { 26499, VertexAttribI4uivEXT_remap_index },
+   { 26444, VertexAttribI4uivEXT_remap_index },
    {  2805, ClearColorIiEXT_remap_index },
    {  1177, ClearColorIuiEXT_remap_index },
-   { 23352, BindBufferOffsetEXT_remap_index },
-   { 17340, BeginPerfMonitorAMD_remap_index },
-   { 31442, DeletePerfMonitorsAMD_remap_index },
-   {  5173, EndPerfMonitorAMD_remap_index },
-   { 25850, GenPerfMonitorsAMD_remap_index },
-   { 12003, GetPerfMonitorCounterDataAMD_remap_index },
-   { 33268, GetPerfMonitorCounterInfoAMD_remap_index },
-   { 42108, GetPerfMonitorCounterStringAMD_remap_index },
-   { 41706, GetPerfMonitorCountersAMD_remap_index },
-   { 13640, GetPerfMonitorGroupStringAMD_remap_index },
-   { 28566, GetPerfMonitorGroupsAMD_remap_index },
-   { 13259, SelectPerfMonitorCountersAMD_remap_index },
-   { 13737, GetObjectParameterivAPPLE_remap_index },
-   { 41547, ObjectPurgeableAPPLE_remap_index },
+   { 23329, BindBufferOffsetEXT_remap_index },
+   { 17351, BeginPerfMonitorAMD_remap_index },
+   { 31412, DeletePerfMonitorsAMD_remap_index },
+   {  5140, EndPerfMonitorAMD_remap_index },
+   { 25827, GenPerfMonitorsAMD_remap_index },
+   { 11964, GetPerfMonitorCounterDataAMD_remap_index },
+   { 33238, GetPerfMonitorCounterInfoAMD_remap_index },
+   { 42078, GetPerfMonitorCounterStringAMD_remap_index },
+   { 41676, GetPerfMonitorCountersAMD_remap_index },
+   { 13601, GetPerfMonitorGroupStringAMD_remap_index },
+   { 28511, GetPerfMonitorGroupsAMD_remap_index },
+   { 13220, SelectPerfMonitorCountersAMD_remap_index },
+   { 13698, GetObjectParameterivAPPLE_remap_index },
+   { 41517, ObjectPurgeableAPPLE_remap_index },
    {  1814, ObjectUnpurgeableAPPLE_remap_index },
-   { 40604, ActiveProgramEXT_remap_index },
-   { 26288, CreateShaderProgramEXT_remap_index },
-   { 35462, UseShaderProgramEXT_remap_index },
-   { 29281, TextureBarrierNV_remap_index },
+   { 40574, ActiveProgramEXT_remap_index },
+   { 26233, CreateShaderProgramEXT_remap_index },
+   { 35432, UseShaderProgramEXT_remap_index },
+   { 29226, TextureBarrierNV_remap_index },
    {  2059, VDPAUFiniNV_remap_index },
    {   804, VDPAUGetSurfaceivNV_remap_index },
-   { 22880, VDPAUInitNV_remap_index },
-   { 20623, VDPAUIsSurfaceNV_remap_index },
-   {  6170, VDPAUMapSurfacesNV_remap_index },
+   { 22857, VDPAUInitNV_remap_index },
+   { 20634, VDPAUIsSurfaceNV_remap_index },
+   {  6137, VDPAUMapSurfacesNV_remap_index },
    {  2846, VDPAURegisterOutputSurfaceNV_remap_index },
-   { 11872, VDPAURegisterVideoSurfaceNV_remap_index },
-   { 10458, VDPAUSurfaceAccessNV_remap_index },
-   {  4474, VDPAUUnmapSurfacesNV_remap_index },
-   { 36334, VDPAUUnregisterSurfaceNV_remap_index },
-   { 19539, StencilFuncSeparateATI_remap_index },
-   {  5386, ProgramEnvParameters4fvEXT_remap_index },
-   { 29532, ProgramLocalParameters4fvEXT_remap_index },
-   {  3652, EGLImageTargetRenderbufferStorageOES_remap_index },
-   {  3437, EGLImageTargetTexture2DOES_remap_index },
-   { 39237, AlphaFuncx_remap_index },
-   { 18552, ClearColorx_remap_index },
-   { 38502, ClearDepthx_remap_index },
-   { 34436, Color4x_remap_index },
-   { 22818, DepthRangex_remap_index },
+   { 11833, VDPAURegisterVideoSurfaceNV_remap_index },
+   { 10419, VDPAUSurfaceAccessNV_remap_index },
+   {  4441, VDPAUUnmapSurfacesNV_remap_index },
+   { 36304, VDPAUUnregisterSurfaceNV_remap_index },
+   { 19550, StencilFuncSeparateATI_remap_index },
+   {  5353, ProgramEnvParameters4fvEXT_remap_index },
+   { 29477, ProgramLocalParameters4fvEXT_remap_index },
+   {  3619, EGLImageTargetRenderbufferStorageOES_remap_index },
+   {  3404, EGLImageTargetTexture2DOES_remap_index },
+   { 39207, AlphaFuncx_remap_index },
+   { 18563, ClearColorx_remap_index },
+   { 38472, ClearDepthx_remap_index },
+   { 34406, Color4x_remap_index },
+   { 22795, DepthRangex_remap_index },
    {  2223, Fogx_remap_index },
-   { 14139, Fogxv_remap_index },
-   {  8310, Frustumf_remap_index },
-   {  8383, Frustumx_remap_index },
-   { 18472, LightModelx_remap_index },
-   { 30901, LightModelxv_remap_index },
-   { 27876, Lightx_remap_index },
-   { 39964, Lightxv_remap_index },
-   {  3367, LineWidthx_remap_index },
-   { 36000, LoadMatrixx_remap_index },
-   { 40887, Materialx_remap_index },
-   { 24356, Materialxv_remap_index },
-   { 28056, MultMatrixx_remap_index },
-   { 30177, MultiTexCoord4x_remap_index },
-   { 24205, Normal3x_remap_index },
-   { 14735, Orthof_remap_index },
-   { 14916, Orthox_remap_index },
-   { 26546, PointSizex_remap_index },
+   { 14100, Fogxv_remap_index },
+   {  8301, Frustumf_remap_index },
+   {  8374, Frustumx_remap_index },
+   { 18483, LightModelx_remap_index },
+   { 30871, LightModelxv_remap_index },
+   { 27821, Lightx_remap_index },
+   { 39934, Lightxv_remap_index },
+   {  3334, LineWidthx_remap_index },
+   { 35970, LoadMatrixx_remap_index },
+   { 40857, Materialx_remap_index },
+   { 24333, Materialxv_remap_index },
+   { 28001, MultMatrixx_remap_index },
+   { 30122, MultiTexCoord4x_remap_index },
+   { 24182, Normal3x_remap_index },
+   { 14720, Orthof_remap_index },
+   { 14901, Orthox_remap_index },
+   { 26491, PointSizex_remap_index },
    {    70, PolygonOffsetx_remap_index },
-   { 35777, Rotatex_remap_index },
-   { 19128, SampleCoveragex_remap_index },
-   { 12161, Scalex_remap_index },
-   { 36873, TexEnvx_remap_index },
-   { 41498, TexEnvxv_remap_index },
+   { 35747, Rotatex_remap_index },
+   { 19139, SampleCoveragex_remap_index },
+   { 12122, Scalex_remap_index },
+   { 36843, TexEnvx_remap_index },
+   { 41468, TexEnvxv_remap_index },
    {  1893, TexParameterx_remap_index },
-   { 30478, Translatex_remap_index },
-   { 31751, ClipPlanef_remap_index },
-   { 31653, ClipPlanex_remap_index },
+   { 30448, Translatex_remap_index },
+   { 31721, ClipPlanef_remap_index },
+   { 31623, ClipPlanex_remap_index },
    {   707, GetClipPlanef_remap_index },
    {   570, GetClipPlanex_remap_index },
-   { 19046, GetFixedv_remap_index },
+   { 19057, GetFixedv_remap_index },
    {  1236, GetLightxv_remap_index },
-   { 21846, GetMaterialxv_remap_index },
-   { 20500, GetTexEnvxv_remap_index },
-   { 15945, GetTexParameterxv_remap_index },
-   { 28090, PointParameterx_remap_index },
-   {  5528, PointParameterxv_remap_index },
-   { 18244, TexParameterxv_remap_index },
+   { 21823, GetMaterialxv_remap_index },
+   { 20511, GetTexEnvxv_remap_index },
+   { 15956, GetTexParameterxv_remap_index },
+   { 28035, PointParameterx_remap_index },
+   {  5495, PointParameterxv_remap_index },
+   { 18255, TexParameterxv_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 */
-   { 32882, _gloffset_BlendColor },
+   { 32852, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 35297, _gloffset_BlendEquation },
+   { 35267, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   {  5130, _gloffset_ColorSubTable },
-   { 20401, _gloffset_CopyColorSubTable },
+   {  5097, _gloffset_ColorSubTable },
+   { 20412, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
    {  1270, _gloffset_GetConvolutionParameteriv },
-   { 13102, _gloffset_ConvolutionParameterfv },
-   { 15807, _gloffset_CopyConvolutionFilter1D },
-   { 17756, _gloffset_SeparableFilter2D },
-   { 18922, _gloffset_GetConvolutionFilter },
-   { 22550, _gloffset_ConvolutionFilter1D },
-   { 24744, _gloffset_ConvolutionFilter2D },
-   { 27429, _gloffset_GetSeparableFilter },
-   { 28922, _gloffset_ConvolutionParameteri },
-   { 29044, _gloffset_ConvolutionParameterf },
-   { 34465, _gloffset_ConvolutionParameteriv },
-   { 40017, _gloffset_GetConvolutionParameterfv },
-   { 41073, _gloffset_CopyConvolutionFilter2D },
+   { 13063, _gloffset_ConvolutionParameterfv },
+   { 15818, _gloffset_CopyConvolutionFilter1D },
+   { 17767, _gloffset_SeparableFilter2D },
+   { 18933, _gloffset_GetConvolutionFilter },
+   { 22527, _gloffset_ConvolutionFilter1D },
+   { 24721, _gloffset_ConvolutionFilter2D },
+   { 27374, _gloffset_GetSeparableFilter },
+   { 28867, _gloffset_ConvolutionParameteri },
+   { 28989, _gloffset_ConvolutionParameterf },
+   { 34435, _gloffset_ConvolutionParameteriv },
+   { 39987, _gloffset_GetConvolutionParameterfv },
+   { 41043, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 26172, _gloffset_CopyTexImage2D },
-   { 28714, _gloffset_CopyTexImage1D },
-   { 30938, _gloffset_CopyTexSubImage1D },
-   { 36711, _gloffset_CopyTexSubImage3D },
-   { 40273, _gloffset_CopyTexSubImage2D },
+   { 26149, _gloffset_CopyTexImage2D },
+   { 28659, _gloffset_CopyTexImage1D },
+   { 30908, _gloffset_CopyTexSubImage1D },
+   { 36681, _gloffset_CopyTexSubImage3D },
+   { 40243, _gloffset_CopyTexSubImage2D },
    /* from GL_EXT_draw_range_elements */
-   { 23767, _gloffset_DrawRangeElements },
+   { 23744, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
-   {  4373, _gloffset_GetHistogramParameterfv },
-   {  7718, _gloffset_GetHistogramParameteriv },
-   {  9000, _gloffset_Minmax },
-   { 13376, _gloffset_GetMinmax },
-   { 20997, _gloffset_Histogram },
-   { 28642, _gloffset_GetMinmaxParameteriv },
-   { 29569, _gloffset_ResetMinmax },
-   { 30438, _gloffset_GetHistogram },
-   { 32038, _gloffset_GetMinmaxParameterfv },
-   { 32958, _gloffset_ResetHistogram },
+   {  4340, _gloffset_GetHistogramParameterfv },
+   {  7709, _gloffset_GetHistogramParameteriv },
+   {  8991, _gloffset_Minmax },
+   { 13337, _gloffset_GetMinmax },
+   { 20974, _gloffset_Histogram },
+   { 28587, _gloffset_GetMinmaxParameteriv },
+   { 29514, _gloffset_ResetMinmax },
+   { 30408, _gloffset_GetHistogram },
+   { 32008, _gloffset_GetMinmaxParameterfv },
+   { 32928, _gloffset_ResetHistogram },
    /* from GL_EXT_paletted_texture */
-   { 12964, _gloffset_ColorTable },
-   { 17365, _gloffset_GetColorTableParameterfv },
-   { 25495, _gloffset_GetColorTable },
-   { 29100, _gloffset_GetColorTableParameteriv },
+   { 12925, _gloffset_ColorTable },
+   { 17376, _gloffset_GetColorTableParameterfv },
+   { 25472, _gloffset_GetColorTable },
+   { 29045, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
    {  2255, _gloffset_TexSubImage1D },
-   { 35012, _gloffset_TexSubImage2D },
+   { 34982, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
-   { 21371, _gloffset_TexImage3D },
-   { 38934, _gloffset_TexSubImage3D },
+   { 21348, _gloffset_TexImage3D },
+   { 38904, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
-   {  3996, _gloffset_GenTextures },
-   {  8430, _gloffset_BindTexture },
-   { 16588, _gloffset_IsTexture },
-   { 21691, _gloffset_PrioritizeTextures },
-   { 25695, _gloffset_DeleteTextures },
-   { 39367, _gloffset_AreTexturesResident },
+   {  3963, _gloffset_GenTextures },
+   {  8421, _gloffset_BindTexture },
+   { 16599, _gloffset_IsTexture },
+   { 21668, _gloffset_PrioritizeTextures },
+   { 25672, _gloffset_DeleteTextures },
+   { 39337, _gloffset_AreTexturesResident },
    /* from GL_EXT_vertex_array */
-   { 17854, _gloffset_ArrayElement },
-   { 28133, _gloffset_DrawArrays },
-   { 37326, _gloffset_GetPointerv },
+   { 17865, _gloffset_ArrayElement },
+   { 28078, _gloffset_DrawArrays },
+   { 37296, _gloffset_GetPointerv },
    /* from GL_NV_read_buffer */
-   { 28891, _gloffset_ReadBuffer },
+   { 28836, _gloffset_ReadBuffer },
    /* from GL_OES_blend_subtract */
-   { 35297, _gloffset_BlendEquation },
+   { 35267, _gloffset_BlendEquation },
    /* from GL_OES_texture_3D */
-   { 21371, _gloffset_TexImage3D },
-   { 36711, _gloffset_CopyTexSubImage3D },
-   { 38934, _gloffset_TexSubImage3D },
+   { 21348, _gloffset_TexImage3D },
+   { 36681, _gloffset_CopyTexSubImage3D },
+   { 38904, _gloffset_TexSubImage3D },
    /* from GL_OES_texture_cube_map */
-   { 16174, _gloffset_TexGeni },
-   { 16202, _gloffset_TexGenf },
-   { 19455, _gloffset_GetTexGenfv },
-   { 32833, _gloffset_TexGeniv },
-   { 35121, _gloffset_TexGenfv },
-   { 40568, _gloffset_GetTexGeniv },
+   { 16185, _gloffset_TexGeni },
+   { 16213, _gloffset_TexGenf },
+   { 19466, _gloffset_GetTexGenfv },
+   { 32803, _gloffset_TexGeniv },
+   { 35091, _gloffset_TexGenfv },
+   { 40538, _gloffset_GetTexGeniv },
    /* from GL_SGI_color_table */
    {  2559, _gloffset_ColorTableParameteriv },
-   { 12964, _gloffset_ColorTable },
-   { 16532, _gloffset_ColorTableParameterfv },
-   { 17365, _gloffset_GetColorTableParameterfv },
-   { 25495, _gloffset_GetColorTable },
-   { 25573, _gloffset_CopyColorTable },
-   { 29100, _gloffset_GetColorTableParameteriv },
+   { 12925, _gloffset_ColorTable },
+   { 16543, _gloffset_ColorTableParameterfv },
+   { 17376, _gloffset_GetColorTableParameterfv },
+   { 25472, _gloffset_GetColorTable },
+   { 25550, _gloffset_CopyColorTable },
+   { 29045, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };