mesa: regenerate API files related to GL_EXT_draw_buffers2

author: Brian Paul <[email protected]> 2009-12-29 22:55:57 -0700
committer: Brian Paul <[email protected]> 2009-12-29 22:55:57 -0700
commit: 285d3f9ed84343b91e501d870a9ef6c61d9cc8f4 (patch)
tree: 5fbcf2ad5f62c669722323370a4e1c7c994ac5a5
parent: ca3a8538b6981d7a47193605968f7adc6f3346b8 (diff)
11 files changed, 2138 insertions, 1747 deletions
diff --git a/src/mesa/glapi/Makefile b/src/mesa/glapi/Makefile
index 71bef68ea5f..2eba48a3a63 100644
--- a/src/mesa/glapi/Makefile
+++ b/src/mesa/glapi/Makefile
@@ -56,6 +56,7 @@ API_XML = gl_API.xml \
 	ARB_sync.xml \
 	ARB_vertex_array_object.xml \
 	APPLE_vertex_array_object.xml \
+	EXT_draw_buffers2.xml \
 	EXT_framebuffer_object.xml \
 	EXT_packed_depth_stencil.xml \
 	EXT_provoking_vertex.xml \
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml
index 34c7746e1ba..a30f5409e62 100644
--- a/src/mesa/glapi/gl_API.xml
+++ b/src/mesa/glapi/gl_API.xml
@@ -12242,6 +12242,9 @@
 
 <xi:include href="EXT_provoking_vertex.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="EXT_draw_buffers2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+
 <category name="GL_APPLE_flush_buffer_range" number="321">
     <enum name="BUFFER_SERIALIZED_MODIFY_APPLE" count="1" value="0x8A12">
         <size name="GetBufferParameteriv" mode="get"/>
diff --git a/src/mesa/glapi/glapidispatch.h b/src/mesa/glapi/glapidispatch.h
index d6ba92824a1..91ae8fac25f 100644
--- a/src/mesa/glapi/glapidispatch.h
+++ b/src/mesa/glapi/glapidispatch.h
@@ -2422,6 +2422,24 @@
 #define CALL_FramebufferTextureLayerEXT(disp, parameters) (*((disp)->FramebufferTextureLayerEXT)) parameters
 #define GET_FramebufferTextureLayerEXT(disp) ((disp)->FramebufferTextureLayerEXT)
 #define SET_FramebufferTextureLayerEXT(disp, fn) ((disp)->FramebufferTextureLayerEXT = fn)
+#define CALL_ColorMaskIndexedEXT(disp, parameters) (*((disp)->ColorMaskIndexedEXT)) parameters
+#define GET_ColorMaskIndexedEXT(disp) ((disp)->ColorMaskIndexedEXT)
+#define SET_ColorMaskIndexedEXT(disp, fn) ((disp)->ColorMaskIndexedEXT = fn)
+#define CALL_DisableIndexedEXT(disp, parameters) (*((disp)->DisableIndexedEXT)) parameters
+#define GET_DisableIndexedEXT(disp) ((disp)->DisableIndexedEXT)
+#define SET_DisableIndexedEXT(disp, fn) ((disp)->DisableIndexedEXT = fn)
+#define CALL_EnableIndexedEXT(disp, parameters) (*((disp)->EnableIndexedEXT)) parameters
+#define GET_EnableIndexedEXT(disp) ((disp)->EnableIndexedEXT)
+#define SET_EnableIndexedEXT(disp, fn) ((disp)->EnableIndexedEXT = fn)
+#define CALL_GetBooleanIndexedvEXT(disp, parameters) (*((disp)->GetBooleanIndexedvEXT)) parameters
+#define GET_GetBooleanIndexedvEXT(disp) ((disp)->GetBooleanIndexedvEXT)
+#define SET_GetBooleanIndexedvEXT(disp, fn) ((disp)->GetBooleanIndexedvEXT = fn)
+#define CALL_GetIntegerIndexedvEXT(disp, parameters) (*((disp)->GetIntegerIndexedvEXT)) parameters
+#define GET_GetIntegerIndexedvEXT(disp) ((disp)->GetIntegerIndexedvEXT)
+#define SET_GetIntegerIndexedvEXT(disp, fn) ((disp)->GetIntegerIndexedvEXT = fn)
+#define CALL_IsEnabledIndexedEXT(disp, parameters) (*((disp)->IsEnabledIndexedEXT)) parameters
+#define GET_IsEnabledIndexedEXT(disp) ((disp)->IsEnabledIndexedEXT)
+#define SET_IsEnabledIndexedEXT(disp, fn) ((disp)->IsEnabledIndexedEXT = fn)
 #define CALL_ProvokingVertexEXT(disp, parameters) (*((disp)->ProvokingVertexEXT)) parameters
 #define GET_ProvokingVertexEXT(disp) ((disp)->ProvokingVertexEXT)
 #define SET_ProvokingVertexEXT(disp, fn) ((disp)->ProvokingVertexEXT = fn)
@@ -2449,7 +2467,7 @@
 
 #else
 
-#define driDispatchRemapTable_size 387
+#define driDispatchRemapTable_size 393
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -2831,14 +2849,20 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define BufferParameteriAPPLE_remap_index 376
 #define FlushMappedBufferRangeAPPLE_remap_index 377
 #define FramebufferTextureLayerEXT_remap_index 378
-#define ProvokingVertexEXT_remap_index 379
-#define GetTexParameterPointervAPPLE_remap_index 380
-#define TextureRangeAPPLE_remap_index 381
-#define StencilFuncSeparateATI_remap_index 382
-#define ProgramEnvParameters4fvEXT_remap_index 383
-#define ProgramLocalParameters4fvEXT_remap_index 384
-#define GetQueryObjecti64vEXT_remap_index 385
-#define GetQueryObjectui64vEXT_remap_index 386
+#define ColorMaskIndexedEXT_remap_index 379
+#define DisableIndexedEXT_remap_index 380
+#define EnableIndexedEXT_remap_index 381
+#define GetBooleanIndexedvEXT_remap_index 382
+#define GetIntegerIndexedvEXT_remap_index 383
+#define IsEnabledIndexedEXT_remap_index 384
+#define ProvokingVertexEXT_remap_index 385
+#define GetTexParameterPointervAPPLE_remap_index 386
+#define TextureRangeAPPLE_remap_index 387
+#define StencilFuncSeparateATI_remap_index 388
+#define ProgramEnvParameters4fvEXT_remap_index 389
+#define ProgramLocalParameters4fvEXT_remap_index 390
+#define GetQueryObjecti64vEXT_remap_index 391
+#define GetQueryObjectui64vEXT_remap_index 392
 
 #define CALL_AttachShader(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLuint)), driDispatchRemapTable[AttachShader_remap_index], parameters)
 #define GET_AttachShader(disp) GET_by_offset(disp, driDispatchRemapTable[AttachShader_remap_index])
@@ -3977,6 +4001,24 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_FramebufferTextureLayerEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLuint, GLint, GLint)), driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index], parameters)
 #define GET_FramebufferTextureLayerEXT(disp) GET_by_offset(disp, driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index])
 #define SET_FramebufferTextureLayerEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index], fn)
+#define CALL_ColorMaskIndexedEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLboolean, GLboolean, GLboolean, GLboolean)), driDispatchRemapTable[ColorMaskIndexedEXT_remap_index], parameters)
+#define GET_ColorMaskIndexedEXT(disp) GET_by_offset(disp, driDispatchRemapTable[ColorMaskIndexedEXT_remap_index])
+#define SET_ColorMaskIndexedEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[ColorMaskIndexedEXT_remap_index], fn)
+#define CALL_DisableIndexedEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint)), driDispatchRemapTable[DisableIndexedEXT_remap_index], parameters)
+#define GET_DisableIndexedEXT(disp) GET_by_offset(disp, driDispatchRemapTable[DisableIndexedEXT_remap_index])
+#define SET_DisableIndexedEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[DisableIndexedEXT_remap_index], fn)
+#define CALL_EnableIndexedEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint)), driDispatchRemapTable[EnableIndexedEXT_remap_index], parameters)
+#define GET_EnableIndexedEXT(disp) GET_by_offset(disp, driDispatchRemapTable[EnableIndexedEXT_remap_index])
+#define SET_EnableIndexedEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[EnableIndexedEXT_remap_index], fn)
+#define CALL_GetBooleanIndexedvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLboolean *)), driDispatchRemapTable[GetBooleanIndexedvEXT_remap_index], parameters)
+#define GET_GetBooleanIndexedvEXT(disp) GET_by_offset(disp, driDispatchRemapTable[GetBooleanIndexedvEXT_remap_index])
+#define SET_GetBooleanIndexedvEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[GetBooleanIndexedvEXT_remap_index], fn)
+#define CALL_GetIntegerIndexedvEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLint *)), driDispatchRemapTable[GetIntegerIndexedvEXT_remap_index], parameters)
+#define GET_GetIntegerIndexedvEXT(disp) GET_by_offset(disp, driDispatchRemapTable[GetIntegerIndexedvEXT_remap_index])
+#define SET_GetIntegerIndexedvEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[GetIntegerIndexedvEXT_remap_index], fn)
+#define CALL_IsEnabledIndexedEXT(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLenum, GLuint)), driDispatchRemapTable[IsEnabledIndexedEXT_remap_index], parameters)
+#define GET_IsEnabledIndexedEXT(disp) GET_by_offset(disp, driDispatchRemapTable[IsEnabledIndexedEXT_remap_index])
+#define SET_IsEnabledIndexedEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[IsEnabledIndexedEXT_remap_index], fn)
 #define CALL_ProvokingVertexEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum)), driDispatchRemapTable[ProvokingVertexEXT_remap_index], parameters)
 #define GET_ProvokingVertexEXT(disp) GET_by_offset(disp, driDispatchRemapTable[ProvokingVertexEXT_remap_index])
 #define SET_ProvokingVertexEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[ProvokingVertexEXT_remap_index], fn)
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index 3d10260a057..9ebff8b40b8 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -821,15 +821,21 @@
 #define _gloffset_BufferParameteriAPPLE 784
 #define _gloffset_FlushMappedBufferRangeAPPLE 785
 #define _gloffset_FramebufferTextureLayerEXT 786
-#define _gloffset_ProvokingVertexEXT 787
-#define _gloffset_GetTexParameterPointervAPPLE 788
-#define _gloffset_TextureRangeAPPLE 789
-#define _gloffset_StencilFuncSeparateATI 790
-#define _gloffset_ProgramEnvParameters4fvEXT 791
-#define _gloffset_ProgramLocalParameters4fvEXT 792
-#define _gloffset_GetQueryObjecti64vEXT 793
-#define _gloffset_GetQueryObjectui64vEXT 794
-#define _gloffset_FIRST_DYNAMIC 795
+#define _gloffset_ColorMaskIndexedEXT 787
+#define _gloffset_DisableIndexedEXT 788
+#define _gloffset_EnableIndexedEXT 789
+#define _gloffset_GetBooleanIndexedvEXT 790
+#define _gloffset_GetIntegerIndexedvEXT 791
+#define _gloffset_IsEnabledIndexedEXT 792
+#define _gloffset_ProvokingVertexEXT 793
+#define _gloffset_GetTexParameterPointervAPPLE 794
+#define _gloffset_TextureRangeAPPLE 795
+#define _gloffset_StencilFuncSeparateATI 796
+#define _gloffset_ProgramEnvParameters4fvEXT 797
+#define _gloffset_ProgramLocalParameters4fvEXT 798
+#define _gloffset_GetQueryObjecti64vEXT 799
+#define _gloffset_GetQueryObjectui64vEXT 800
+#define _gloffset_FIRST_DYNAMIC 801
 
 #else
 
@@ -1212,6 +1218,12 @@
 #define _gloffset_BufferParameteriAPPLE driDispatchRemapTable[BufferParameteriAPPLE_remap_index]
 #define _gloffset_FlushMappedBufferRangeAPPLE driDispatchRemapTable[FlushMappedBufferRangeAPPLE_remap_index]
 #define _gloffset_FramebufferTextureLayerEXT driDispatchRemapTable[FramebufferTextureLayerEXT_remap_index]
+#define _gloffset_ColorMaskIndexedEXT driDispatchRemapTable[ColorMaskIndexedEXT_remap_index]
+#define _gloffset_DisableIndexedEXT driDispatchRemapTable[DisableIndexedEXT_remap_index]
+#define _gloffset_EnableIndexedEXT driDispatchRemapTable[EnableIndexedEXT_remap_index]
+#define _gloffset_GetBooleanIndexedvEXT driDispatchRemapTable[GetBooleanIndexedvEXT_remap_index]
+#define _gloffset_GetIntegerIndexedvEXT driDispatchRemapTable[GetIntegerIndexedvEXT_remap_index]
+#define _gloffset_IsEnabledIndexedEXT driDispatchRemapTable[IsEnabledIndexedEXT_remap_index]
 #define _gloffset_ProvokingVertexEXT driDispatchRemapTable[ProvokingVertexEXT_remap_index]
 #define _gloffset_GetTexParameterPointervAPPLE driDispatchRemapTable[GetTexParameterPointervAPPLE_remap_index]
 #define _gloffset_TextureRangeAPPLE driDispatchRemapTable[TextureRangeAPPLE_remap_index]
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 4f9e53b62d6..29d2a518c89 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -827,14 +827,20 @@ struct _glapi_table
    void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 784 */
    void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 785 */
    void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 786 */
-   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 787 */
-   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 788 */
-   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 789 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 790 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 791 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 792 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 793 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 794 */
+   void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 787 */
+   void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 788 */
+   void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 789 */
+   void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 790 */
+   void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 791 */
+   GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 792 */
+   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 793 */
+   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 794 */
+   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 795 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 796 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 797 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 798 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 799 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 800 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 319a4ab55bd..58dfc16a24b 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -5677,6 +5677,36 @@ KEYWORD1 void KEYWORD2 NAME(FramebufferTextureLayerEXT)(GLenum target, GLenum at
    DISPATCH(FramebufferTextureLayerEXT, (target, attachment, texture, level, layer), (F, "glFramebufferTextureLayerEXT(0x%x, 0x%x, %d, %d, %d);\n", target, attachment, texture, level, layer));
 }
 
+KEYWORD1 void KEYWORD2 NAME(ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
+{
+   DISPATCH(ColorMaskIndexedEXT, (buf, r, g, b, a), (F, "glColorMaskIndexedEXT(%d, %d, %d, %d, %d);\n", buf, r, g, b, a));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DisableIndexedEXT)(GLenum target, GLuint index)
+{
+   DISPATCH(DisableIndexedEXT, (target, index), (F, "glDisableIndexedEXT(0x%x, %d);\n", target, index));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EnableIndexedEXT)(GLenum target, GLuint index)
+{
+   DISPATCH(EnableIndexedEXT, (target, index), (F, "glEnableIndexedEXT(0x%x, %d);\n", target, index));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data)
+{
+   DISPATCH(GetBooleanIndexedvEXT, (value, index, data), (F, "glGetBooleanIndexedvEXT(0x%x, %d, %p);\n", value, index, (const void *) data));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data)
+{
+   DISPATCH(GetIntegerIndexedvEXT, (value, index, data), (F, "glGetIntegerIndexedvEXT(0x%x, %d, %p);\n", value, index, (const void *) data));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsEnabledIndexedEXT)(GLenum target, GLuint index)
+{
+   RETURN_DISPATCH(IsEnabledIndexedEXT, (target, index), (F, "glIsEnabledIndexedEXT(0x%x, %d);\n", target, index));
+}
+
 KEYWORD1 void KEYWORD2 NAME(ProvokingVertexEXT)(GLenum mode)
 {
    DISPATCH(ProvokingVertexEXT, (mode), (F, "glProvokingVertexEXT(0x%x);\n", mode));
@@ -5687,51 +5717,51 @@ KEYWORD1 void KEYWORD2 NAME(ProvokingVertex)(GLenum mode)
    DISPATCH(ProvokingVertexEXT, (mode), (F, "glProvokingVertex(0x%x);\n", mode));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_788)(GLenum target, GLenum pname, GLvoid ** params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_794)(GLenum target, GLenum pname, GLvoid ** params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_788)(GLenum target, GLenum pname, GLvoid ** params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_794)(GLenum target, GLenum pname, GLvoid ** params)
 {
    DISPATCH(GetTexParameterPointervAPPLE, (target, pname, params), (F, "glGetTexParameterPointervAPPLE(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_789)(GLenum target, GLsizei length, GLvoid * pointer);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_795)(GLenum target, GLsizei length, GLvoid * pointer);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_789)(GLenum target, GLsizei length, GLvoid * pointer)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_795)(GLenum target, GLsizei length, GLvoid * pointer)
 {
    DISPATCH(TextureRangeAPPLE, (target, length, pointer), (F, "glTextureRangeAPPLE(0x%x, %d, %p);\n", target, length, (const void *) pointer));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_790)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_796)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_790)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_796)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
 {
    DISPATCH(StencilFuncSeparateATI, (frontfunc, backfunc, ref, mask), (F, "glStencilFuncSeparateATI(0x%x, 0x%x, %d, %d);\n", frontfunc, backfunc, ref, mask));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_791)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_797)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_791)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_797)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramEnvParameters4fvEXT, (target, index, count, params), (F, "glProgramEnvParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_792)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_798)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_792)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_798)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
    DISPATCH(ProgramLocalParameters4fvEXT, (target, index, count, params), (F, "glProgramLocalParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_793)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_799)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_793)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_799)(GLuint id, GLenum pname, GLint64EXT * params)
 {
    DISPATCH(GetQueryObjecti64vEXT, (id, pname, params), (F, "glGetQueryObjecti64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_794)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_800)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_794)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_800)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
@@ -6537,14 +6567,20 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(_dispatch_stub_784),
    TABLE_ENTRY(_dispatch_stub_785),
    TABLE_ENTRY(FramebufferTextureLayerEXT),
+   TABLE_ENTRY(ColorMaskIndexedEXT),
+   TABLE_ENTRY(DisableIndexedEXT),
+   TABLE_ENTRY(EnableIndexedEXT),
+   TABLE_ENTRY(GetBooleanIndexedvEXT),
+   TABLE_ENTRY(GetIntegerIndexedvEXT),
+   TABLE_ENTRY(IsEnabledIndexedEXT),
    TABLE_ENTRY(ProvokingVertexEXT),
-   TABLE_ENTRY(_dispatch_stub_788),
-   TABLE_ENTRY(_dispatch_stub_789),
-   TABLE_ENTRY(_dispatch_stub_790),
-   TABLE_ENTRY(_dispatch_stub_791),
-   TABLE_ENTRY(_dispatch_stub_792),
-   TABLE_ENTRY(_dispatch_stub_793),
    TABLE_ENTRY(_dispatch_stub_794),
+   TABLE_ENTRY(_dispatch_stub_795),
+   TABLE_ENTRY(_dispatch_stub_796),
+   TABLE_ENTRY(_dispatch_stub_797),
+   TABLE_ENTRY(_dispatch_stub_798),
+   TABLE_ENTRY(_dispatch_stub_799),
+   TABLE_ENTRY(_dispatch_stub_800),
    /* A whole bunch of no-op functions.  These might be called
     * when someone tries to call a dynamically-registered
     * extension function without a current rendering context.
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index 1ad7e843370..b2ba0522fc9 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -839,6 +839,12 @@ static const char gl_string_table[] =
     "glBufferParameteriAPPLE\0"
     "glFlushMappedBufferRangeAPPLE\0"
     "glFramebufferTextureLayerEXT\0"
+    "glColorMaskIndexedEXT\0"
+    "glDisableIndexedEXT\0"
+    "glEnableIndexedEXT\0"
+    "glGetBooleanIndexedvEXT\0"
+    "glGetIntegerIndexedvEXT\0"
+    "glIsEnabledIndexedEXT\0"
     "glProvokingVertexEXT\0"
     "glGetTexParameterPointervAPPLE\0"
     "glTextureRangeAPPLE\0"
@@ -1196,13 +1202,13 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_783 mgl_dispatch_stub_783
 #define gl_dispatch_stub_784 mgl_dispatch_stub_784
 #define gl_dispatch_stub_785 mgl_dispatch_stub_785
-#define gl_dispatch_stub_788 mgl_dispatch_stub_788
-#define gl_dispatch_stub_789 mgl_dispatch_stub_789
-#define gl_dispatch_stub_790 mgl_dispatch_stub_790
-#define gl_dispatch_stub_791 mgl_dispatch_stub_791
-#define gl_dispatch_stub_792 mgl_dispatch_stub_792
-#define gl_dispatch_stub_793 mgl_dispatch_stub_793
 #define gl_dispatch_stub_794 mgl_dispatch_stub_794
+#define gl_dispatch_stub_795 mgl_dispatch_stub_795
+#define gl_dispatch_stub_796 mgl_dispatch_stub_796
+#define gl_dispatch_stub_797 mgl_dispatch_stub_797
+#define gl_dispatch_stub_798 mgl_dispatch_stub_798
+#define gl_dispatch_stub_799 mgl_dispatch_stub_799
+#define gl_dispatch_stub_800 mgl_dispatch_stub_800
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1250,13 +1256,13 @@ void GLAPIENTRY gl_dispatch_stub_765(GLenum modeRGB, GLenum modeA);
 void GLAPIENTRY gl_dispatch_stub_783(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 void GLAPIENTRY gl_dispatch_stub_784(GLenum target, GLenum pname, GLint param);
 void GLAPIENTRY gl_dispatch_stub_785(GLenum target, GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_788(GLenum target, GLenum pname, GLvoid ** params);
-void GLAPIENTRY gl_dispatch_stub_789(GLenum target, GLsizei length, GLvoid * pointer);
-void GLAPIENTRY gl_dispatch_stub_790(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_791(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_792(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_793(GLuint id, GLenum pname, GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_794(GLuint id, GLenum pname, GLuint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_794(GLenum target, GLenum pname, GLvoid ** params);
+void GLAPIENTRY gl_dispatch_stub_795(GLenum target, GLsizei length, GLvoid * pointer);
+void GLAPIENTRY gl_dispatch_stub_796(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_797(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_798(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_799(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_800(GLuint id, GLenum pname, GLuint64EXT * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -2047,316 +2053,322 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET(13784, gl_dispatch_stub_784, gl_dispatch_stub_784, NULL, _gloffset_BufferParameteriAPPLE),
     NAME_FUNC_OFFSET(13808, gl_dispatch_stub_785, gl_dispatch_stub_785, NULL, _gloffset_FlushMappedBufferRangeAPPLE),
     NAME_FUNC_OFFSET(13838, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
-    NAME_FUNC_OFFSET(13867, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
-    NAME_FUNC_OFFSET(13888, gl_dispatch_stub_788, gl_dispatch_stub_788, NULL, _gloffset_GetTexParameterPointervAPPLE),
-    NAME_FUNC_OFFSET(13919, gl_dispatch_stub_789, gl_dispatch_stub_789, NULL, _gloffset_TextureRangeAPPLE),
-    NAME_FUNC_OFFSET(13939, gl_dispatch_stub_790, gl_dispatch_stub_790, NULL, _gloffset_StencilFuncSeparateATI),
-    NAME_FUNC_OFFSET(13964, gl_dispatch_stub_791, gl_dispatch_stub_791, NULL, _gloffset_ProgramEnvParameters4fvEXT),
-    NAME_FUNC_OFFSET(13993, gl_dispatch_stub_792, gl_dispatch_stub_792, NULL, _gloffset_ProgramLocalParameters4fvEXT),
-    NAME_FUNC_OFFSET(14024, gl_dispatch_stub_793, gl_dispatch_stub_793, NULL, _gloffset_GetQueryObjecti64vEXT),
-    NAME_FUNC_OFFSET(14048, gl_dispatch_stub_794, gl_dispatch_stub_794, NULL, _gloffset_GetQueryObjectui64vEXT),
-    NAME_FUNC_OFFSET(14073, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
-    NAME_FUNC_OFFSET(14091, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
-    NAME_FUNC_OFFSET(14108, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
-    NAME_FUNC_OFFSET(14124, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
-    NAME_FUNC_OFFSET(14149, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
-    NAME_FUNC_OFFSET(14169, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
-    NAME_FUNC_OFFSET(14189, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
-    NAME_FUNC_OFFSET(14212, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
-    NAME_FUNC_OFFSET(14235, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
-    NAME_FUNC_OFFSET(14255, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
-    NAME_FUNC_OFFSET(14272, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
-    NAME_FUNC_OFFSET(14289, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
-    NAME_FUNC_OFFSET(14304, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
-    NAME_FUNC_OFFSET(14328, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
-    NAME_FUNC_OFFSET(14347, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
-    NAME_FUNC_OFFSET(14366, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
-    NAME_FUNC_OFFSET(14382, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
-    NAME_FUNC_OFFSET(14401, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
-    NAME_FUNC_OFFSET(14424, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14440, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14456, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
-    NAME_FUNC_OFFSET(14483, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
-    NAME_FUNC_OFFSET(14510, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
-    NAME_FUNC_OFFSET(14530, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14549, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14568, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14598, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14628, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14658, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14688, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
-    NAME_FUNC_OFFSET(14707, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
-    NAME_FUNC_OFFSET(14730, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14755, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14780, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
-    NAME_FUNC_OFFSET(14807, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14835, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
-    NAME_FUNC_OFFSET(14862, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14890, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14919, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14948, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
-    NAME_FUNC_OFFSET(14974, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
-    NAME_FUNC_OFFSET(15005, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
-    NAME_FUNC_OFFSET(15036, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
-    NAME_FUNC_OFFSET(15060, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
-    NAME_FUNC_OFFSET(15083, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
-    NAME_FUNC_OFFSET(15101, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
-    NAME_FUNC_OFFSET(15130, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
-    NAME_FUNC_OFFSET(15159, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
-    NAME_FUNC_OFFSET(15174, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
-    NAME_FUNC_OFFSET(15200, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
-    NAME_FUNC_OFFSET(15226, glHistogram, glHistogram, NULL, _gloffset_Histogram),
-    NAME_FUNC_OFFSET(15241, glMinmax, glMinmax, NULL, _gloffset_Minmax),
-    NAME_FUNC_OFFSET(15253, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
-    NAME_FUNC_OFFSET(15273, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
-    NAME_FUNC_OFFSET(15290, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
-    NAME_FUNC_OFFSET(15306, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
-    NAME_FUNC_OFFSET(15325, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
-    NAME_FUNC_OFFSET(15348, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
-    NAME_FUNC_OFFSET(15364, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
-    NAME_FUNC_OFFSET(15386, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
-    NAME_FUNC_OFFSET(15404, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
-    NAME_FUNC_OFFSET(15423, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
-    NAME_FUNC_OFFSET(15441, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
-    NAME_FUNC_OFFSET(15460, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
-    NAME_FUNC_OFFSET(15478, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
-    NAME_FUNC_OFFSET(15497, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
-    NAME_FUNC_OFFSET(15515, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
-    NAME_FUNC_OFFSET(15534, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
-    NAME_FUNC_OFFSET(15552, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
-    NAME_FUNC_OFFSET(15571, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
-    NAME_FUNC_OFFSET(15589, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
-    NAME_FUNC_OFFSET(15608, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
-    NAME_FUNC_OFFSET(15626, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
-    NAME_FUNC_OFFSET(15645, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
-    NAME_FUNC_OFFSET(15663, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
-    NAME_FUNC_OFFSET(15682, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
-    NAME_FUNC_OFFSET(15700, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
-    NAME_FUNC_OFFSET(15719, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
-    NAME_FUNC_OFFSET(15737, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
-    NAME_FUNC_OFFSET(15756, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
-    NAME_FUNC_OFFSET(15774, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
-    NAME_FUNC_OFFSET(15793, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
-    NAME_FUNC_OFFSET(15811, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
-    NAME_FUNC_OFFSET(15830, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
-    NAME_FUNC_OFFSET(15848, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
-    NAME_FUNC_OFFSET(15867, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
-    NAME_FUNC_OFFSET(15885, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
-    NAME_FUNC_OFFSET(15904, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
-    NAME_FUNC_OFFSET(15922, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
-    NAME_FUNC_OFFSET(15941, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
-    NAME_FUNC_OFFSET(15959, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
-    NAME_FUNC_OFFSET(15978, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
-    NAME_FUNC_OFFSET(16001, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(16024, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(16047, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(16070, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(16093, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
-    NAME_FUNC_OFFSET(16110, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
-    NAME_FUNC_OFFSET(16133, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
-    NAME_FUNC_OFFSET(16156, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
-    NAME_FUNC_OFFSET(16179, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
-    NAME_FUNC_OFFSET(16205, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
-    NAME_FUNC_OFFSET(16231, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
-    NAME_FUNC_OFFSET(16257, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
-    NAME_FUNC_OFFSET(16281, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(16308, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(16334, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
-    NAME_FUNC_OFFSET(16354, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
-    NAME_FUNC_OFFSET(16374, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
-    NAME_FUNC_OFFSET(16394, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
-    NAME_FUNC_OFFSET(16417, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
-    NAME_FUNC_OFFSET(16441, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
-    NAME_FUNC_OFFSET(16464, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
-    NAME_FUNC_OFFSET(16488, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
-    NAME_FUNC_OFFSET(16505, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
-    NAME_FUNC_OFFSET(16523, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
-    NAME_FUNC_OFFSET(16540, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
-    NAME_FUNC_OFFSET(16558, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
-    NAME_FUNC_OFFSET(16575, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
-    NAME_FUNC_OFFSET(16593, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
-    NAME_FUNC_OFFSET(16610, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
-    NAME_FUNC_OFFSET(16628, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
-    NAME_FUNC_OFFSET(16645, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
-    NAME_FUNC_OFFSET(16663, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
-    NAME_FUNC_OFFSET(16680, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
-    NAME_FUNC_OFFSET(16698, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
-    NAME_FUNC_OFFSET(16715, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
-    NAME_FUNC_OFFSET(16733, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
-    NAME_FUNC_OFFSET(16750, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
-    NAME_FUNC_OFFSET(16768, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
-    NAME_FUNC_OFFSET(16785, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
-    NAME_FUNC_OFFSET(16803, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
-    NAME_FUNC_OFFSET(16822, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
-    NAME_FUNC_OFFSET(16841, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
-    NAME_FUNC_OFFSET(16860, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
-    NAME_FUNC_OFFSET(16879, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
-    NAME_FUNC_OFFSET(16899, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
-    NAME_FUNC_OFFSET(16919, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(16939, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
-    NAME_FUNC_OFFSET(16957, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(16974, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(16992, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(17009, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(17027, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
-    NAME_FUNC_OFFSET(17045, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(17062, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(17080, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
-    NAME_FUNC_OFFSET(17099, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
-    NAME_FUNC_OFFSET(17118, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
-    NAME_FUNC_OFFSET(17137, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(17159, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(17172, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(17185, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(17201, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(17217, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(17230, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(17253, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(17273, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(17292, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(17303, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(17315, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(17329, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(17342, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(17358, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(17369, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(17382, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(17401, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(17421, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(17434, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(17444, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(17460, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(17479, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(17497, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(17518, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(17533, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(17548, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(17562, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(17577, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(17589, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(17602, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(17614, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(17627, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(17639, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(17652, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(17664, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(17677, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(17689, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(17702, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(17714, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(17727, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(17739, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(17752, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(17764, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(17777, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(17796, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(17815, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(17834, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(17847, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(17865, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(17886, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(17904, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(17924, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17938, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17955, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, _gloffset_RenderbufferStorageMultisample),
-    NAME_FUNC_OFFSET(17991, gl_dispatch_stub_584, gl_dispatch_stub_584, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(18007, gl_dispatch_stub_585, gl_dispatch_stub_585, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(18026, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(18044, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(18065, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(18087, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(18106, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(18128, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(18151, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(18170, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(18190, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(18209, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(18229, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(18248, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(18268, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(18287, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(18307, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(18326, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(18346, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(18366, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(18387, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(18407, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(18428, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(18448, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(18469, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(18493, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(18511, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(18531, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(18549, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(18561, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(18574, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(18586, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(18599, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18619, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18643, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18657, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18674, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18689, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18707, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18721, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18738, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18753, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18771, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18785, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18802, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18817, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18835, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18849, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18866, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18881, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18899, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18913, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18930, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18945, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18963, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18977, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18994, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(19009, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(19027, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(19041, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(19058, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(19073, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(19091, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(19105, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(19122, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(19137, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(19155, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(19172, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(19192, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(19209, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(19235, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(19264, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(19279, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(19297, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(19316, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_DeleteVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(19337, gl_dispatch_stub_757, gl_dispatch_stub_757, NULL, _gloffset_IsVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(19353, gl_dispatch_stub_765, gl_dispatch_stub_765, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(19377, gl_dispatch_stub_765, gl_dispatch_stub_765, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(19404, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(19422, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(19441, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(19466, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(19487, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19509, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(19535, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(19558, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(19581, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(19604, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(19622, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19641, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(19658, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(19696, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(19725, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(19741, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(19758, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(19780, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(19798, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
-    NAME_FUNC_OFFSET(19824, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
+    NAME_FUNC_OFFSET(13867, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, _gloffset_ColorMaskIndexedEXT),
+    NAME_FUNC_OFFSET(13889, glDisableIndexedEXT, glDisableIndexedEXT, NULL, _gloffset_DisableIndexedEXT),
+    NAME_FUNC_OFFSET(13909, glEnableIndexedEXT, glEnableIndexedEXT, NULL, _gloffset_EnableIndexedEXT),
+    NAME_FUNC_OFFSET(13928, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, _gloffset_GetBooleanIndexedvEXT),
+    NAME_FUNC_OFFSET(13952, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, _gloffset_GetIntegerIndexedvEXT),
+    NAME_FUNC_OFFSET(13976, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, _gloffset_IsEnabledIndexedEXT),
+    NAME_FUNC_OFFSET(13998, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
+    NAME_FUNC_OFFSET(14019, gl_dispatch_stub_794, gl_dispatch_stub_794, NULL, _gloffset_GetTexParameterPointervAPPLE),
+    NAME_FUNC_OFFSET(14050, gl_dispatch_stub_795, gl_dispatch_stub_795, NULL, _gloffset_TextureRangeAPPLE),
+    NAME_FUNC_OFFSET(14070, gl_dispatch_stub_796, gl_dispatch_stub_796, NULL, _gloffset_StencilFuncSeparateATI),
+    NAME_FUNC_OFFSET(14095, gl_dispatch_stub_797, gl_dispatch_stub_797, NULL, _gloffset_ProgramEnvParameters4fvEXT),
+    NAME_FUNC_OFFSET(14124, gl_dispatch_stub_798, gl_dispatch_stub_798, NULL, _gloffset_ProgramLocalParameters4fvEXT),
+    NAME_FUNC_OFFSET(14155, gl_dispatch_stub_799, gl_dispatch_stub_799, NULL, _gloffset_GetQueryObjecti64vEXT),
+    NAME_FUNC_OFFSET(14179, gl_dispatch_stub_800, gl_dispatch_stub_800, NULL, _gloffset_GetQueryObjectui64vEXT),
+    NAME_FUNC_OFFSET(14204, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
+    NAME_FUNC_OFFSET(14222, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
+    NAME_FUNC_OFFSET(14239, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
+    NAME_FUNC_OFFSET(14255, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
+    NAME_FUNC_OFFSET(14280, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
+    NAME_FUNC_OFFSET(14300, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
+    NAME_FUNC_OFFSET(14320, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
+    NAME_FUNC_OFFSET(14343, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
+    NAME_FUNC_OFFSET(14366, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
+    NAME_FUNC_OFFSET(14386, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
+    NAME_FUNC_OFFSET(14403, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
+    NAME_FUNC_OFFSET(14420, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
+    NAME_FUNC_OFFSET(14435, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
+    NAME_FUNC_OFFSET(14459, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
+    NAME_FUNC_OFFSET(14478, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
+    NAME_FUNC_OFFSET(14497, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
+    NAME_FUNC_OFFSET(14513, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
+    NAME_FUNC_OFFSET(14532, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
+    NAME_FUNC_OFFSET(14555, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14571, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14587, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
+    NAME_FUNC_OFFSET(14614, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
+    NAME_FUNC_OFFSET(14641, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
+    NAME_FUNC_OFFSET(14661, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14680, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14699, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14729, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14759, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14789, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14819, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
+    NAME_FUNC_OFFSET(14838, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
+    NAME_FUNC_OFFSET(14861, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14886, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14911, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
+    NAME_FUNC_OFFSET(14938, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14966, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
+    NAME_FUNC_OFFSET(14993, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
+    NAME_FUNC_OFFSET(15021, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
+    NAME_FUNC_OFFSET(15050, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
+    NAME_FUNC_OFFSET(15079, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
+    NAME_FUNC_OFFSET(15105, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
+    NAME_FUNC_OFFSET(15136, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
+    NAME_FUNC_OFFSET(15167, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
+    NAME_FUNC_OFFSET(15191, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
+    NAME_FUNC_OFFSET(15214, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
+    NAME_FUNC_OFFSET(15232, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
+    NAME_FUNC_OFFSET(15261, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
+    NAME_FUNC_OFFSET(15290, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
+    NAME_FUNC_OFFSET(15305, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
+    NAME_FUNC_OFFSET(15331, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
+    NAME_FUNC_OFFSET(15357, glHistogram, glHistogram, NULL, _gloffset_Histogram),
+    NAME_FUNC_OFFSET(15372, glMinmax, glMinmax, NULL, _gloffset_Minmax),
+    NAME_FUNC_OFFSET(15384, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
+    NAME_FUNC_OFFSET(15404, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
+    NAME_FUNC_OFFSET(15421, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
+    NAME_FUNC_OFFSET(15437, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
+    NAME_FUNC_OFFSET(15456, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
+    NAME_FUNC_OFFSET(15479, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
+    NAME_FUNC_OFFSET(15495, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
+    NAME_FUNC_OFFSET(15517, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
+    NAME_FUNC_OFFSET(15535, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
+    NAME_FUNC_OFFSET(15554, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
+    NAME_FUNC_OFFSET(15572, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
+    NAME_FUNC_OFFSET(15591, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
+    NAME_FUNC_OFFSET(15609, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
+    NAME_FUNC_OFFSET(15628, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
+    NAME_FUNC_OFFSET(15646, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
+    NAME_FUNC_OFFSET(15665, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
+    NAME_FUNC_OFFSET(15683, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
+    NAME_FUNC_OFFSET(15702, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
+    NAME_FUNC_OFFSET(15720, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
+    NAME_FUNC_OFFSET(15739, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
+    NAME_FUNC_OFFSET(15757, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
+    NAME_FUNC_OFFSET(15776, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
+    NAME_FUNC_OFFSET(15794, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
+    NAME_FUNC_OFFSET(15813, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
+    NAME_FUNC_OFFSET(15831, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
+    NAME_FUNC_OFFSET(15850, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
+    NAME_FUNC_OFFSET(15868, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
+    NAME_FUNC_OFFSET(15887, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
+    NAME_FUNC_OFFSET(15905, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
+    NAME_FUNC_OFFSET(15924, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
+    NAME_FUNC_OFFSET(15942, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
+    NAME_FUNC_OFFSET(15961, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
+    NAME_FUNC_OFFSET(15979, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
+    NAME_FUNC_OFFSET(15998, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
+    NAME_FUNC_OFFSET(16016, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
+    NAME_FUNC_OFFSET(16035, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
+    NAME_FUNC_OFFSET(16053, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
+    NAME_FUNC_OFFSET(16072, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
+    NAME_FUNC_OFFSET(16090, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
+    NAME_FUNC_OFFSET(16109, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
+    NAME_FUNC_OFFSET(16132, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(16155, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(16178, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(16201, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(16224, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
+    NAME_FUNC_OFFSET(16241, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
+    NAME_FUNC_OFFSET(16264, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
+    NAME_FUNC_OFFSET(16287, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
+    NAME_FUNC_OFFSET(16310, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
+    NAME_FUNC_OFFSET(16336, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
+    NAME_FUNC_OFFSET(16362, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
+    NAME_FUNC_OFFSET(16388, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
+    NAME_FUNC_OFFSET(16412, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(16439, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(16465, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
+    NAME_FUNC_OFFSET(16485, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
+    NAME_FUNC_OFFSET(16505, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
+    NAME_FUNC_OFFSET(16525, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
+    NAME_FUNC_OFFSET(16548, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
+    NAME_FUNC_OFFSET(16572, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
+    NAME_FUNC_OFFSET(16595, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
+    NAME_FUNC_OFFSET(16619, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
+    NAME_FUNC_OFFSET(16636, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
+    NAME_FUNC_OFFSET(16654, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
+    NAME_FUNC_OFFSET(16671, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
+    NAME_FUNC_OFFSET(16689, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
+    NAME_FUNC_OFFSET(16706, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
+    NAME_FUNC_OFFSET(16724, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
+    NAME_FUNC_OFFSET(16741, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
+    NAME_FUNC_OFFSET(16759, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
+    NAME_FUNC_OFFSET(16776, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
+    NAME_FUNC_OFFSET(16794, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
+    NAME_FUNC_OFFSET(16811, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
+    NAME_FUNC_OFFSET(16829, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
+    NAME_FUNC_OFFSET(16846, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
+    NAME_FUNC_OFFSET(16864, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
+    NAME_FUNC_OFFSET(16881, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
+    NAME_FUNC_OFFSET(16899, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
+    NAME_FUNC_OFFSET(16916, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
+    NAME_FUNC_OFFSET(16934, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
+    NAME_FUNC_OFFSET(16953, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
+    NAME_FUNC_OFFSET(16972, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
+    NAME_FUNC_OFFSET(16991, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
+    NAME_FUNC_OFFSET(17010, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
+    NAME_FUNC_OFFSET(17030, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
+    NAME_FUNC_OFFSET(17050, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
+    NAME_FUNC_OFFSET(17070, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
+    NAME_FUNC_OFFSET(17088, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
+    NAME_FUNC_OFFSET(17105, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
+    NAME_FUNC_OFFSET(17123, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
+    NAME_FUNC_OFFSET(17140, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
+    NAME_FUNC_OFFSET(17158, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
+    NAME_FUNC_OFFSET(17176, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
+    NAME_FUNC_OFFSET(17193, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
+    NAME_FUNC_OFFSET(17211, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
+    NAME_FUNC_OFFSET(17230, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
+    NAME_FUNC_OFFSET(17249, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
+    NAME_FUNC_OFFSET(17268, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
+    NAME_FUNC_OFFSET(17290, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
+    NAME_FUNC_OFFSET(17303, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
+    NAME_FUNC_OFFSET(17316, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
+    NAME_FUNC_OFFSET(17332, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
+    NAME_FUNC_OFFSET(17348, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
+    NAME_FUNC_OFFSET(17361, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
+    NAME_FUNC_OFFSET(17384, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
+    NAME_FUNC_OFFSET(17404, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
+    NAME_FUNC_OFFSET(17423, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
+    NAME_FUNC_OFFSET(17434, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
+    NAME_FUNC_OFFSET(17446, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
+    NAME_FUNC_OFFSET(17460, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
+    NAME_FUNC_OFFSET(17473, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
+    NAME_FUNC_OFFSET(17489, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
+    NAME_FUNC_OFFSET(17500, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
+    NAME_FUNC_OFFSET(17513, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
+    NAME_FUNC_OFFSET(17532, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
+    NAME_FUNC_OFFSET(17552, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
+    NAME_FUNC_OFFSET(17565, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
+    NAME_FUNC_OFFSET(17575, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
+    NAME_FUNC_OFFSET(17591, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
+    NAME_FUNC_OFFSET(17610, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
+    NAME_FUNC_OFFSET(17628, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
+    NAME_FUNC_OFFSET(17649, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
+    NAME_FUNC_OFFSET(17664, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
+    NAME_FUNC_OFFSET(17679, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
+    NAME_FUNC_OFFSET(17693, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
+    NAME_FUNC_OFFSET(17708, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
+    NAME_FUNC_OFFSET(17720, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
+    NAME_FUNC_OFFSET(17733, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
+    NAME_FUNC_OFFSET(17745, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
+    NAME_FUNC_OFFSET(17758, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
+    NAME_FUNC_OFFSET(17770, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
+    NAME_FUNC_OFFSET(17783, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
+    NAME_FUNC_OFFSET(17795, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
+    NAME_FUNC_OFFSET(17808, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
+    NAME_FUNC_OFFSET(17820, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
+    NAME_FUNC_OFFSET(17833, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
+    NAME_FUNC_OFFSET(17845, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
+    NAME_FUNC_OFFSET(17858, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
+    NAME_FUNC_OFFSET(17870, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
+    NAME_FUNC_OFFSET(17883, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
+    NAME_FUNC_OFFSET(17895, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
+    NAME_FUNC_OFFSET(17908, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
+    NAME_FUNC_OFFSET(17927, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
+    NAME_FUNC_OFFSET(17946, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
+    NAME_FUNC_OFFSET(17965, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
+    NAME_FUNC_OFFSET(17978, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
+    NAME_FUNC_OFFSET(17996, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
+    NAME_FUNC_OFFSET(18017, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
+    NAME_FUNC_OFFSET(18035, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
+    NAME_FUNC_OFFSET(18055, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(18069, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(18086, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, _gloffset_RenderbufferStorageMultisample),
+    NAME_FUNC_OFFSET(18122, gl_dispatch_stub_584, gl_dispatch_stub_584, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET(18138, gl_dispatch_stub_585, gl_dispatch_stub_585, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET(18157, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(18175, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(18196, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(18218, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(18237, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(18259, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(18282, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET(18301, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET(18321, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET(18340, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET(18360, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET(18379, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET(18399, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET(18418, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET(18438, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET(18457, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET(18477, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET(18497, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET(18518, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET(18538, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET(18559, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET(18579, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(18600, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(18624, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(18642, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(18662, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(18680, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(18692, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(18705, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(18717, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(18730, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18750, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18774, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18788, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18805, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18820, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18838, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18852, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18869, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18884, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18902, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18916, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18933, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18948, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18966, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18980, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18997, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(19012, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(19030, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(19044, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(19061, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(19076, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(19094, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(19108, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(19125, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(19140, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(19158, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(19172, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(19189, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(19204, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(19222, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(19236, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(19253, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(19268, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(19286, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(19303, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(19323, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(19340, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(19366, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(19395, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(19410, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(19428, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(19447, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_DeleteVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(19468, gl_dispatch_stub_757, gl_dispatch_stub_757, NULL, _gloffset_IsVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(19484, gl_dispatch_stub_765, gl_dispatch_stub_765, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(19508, gl_dispatch_stub_765, gl_dispatch_stub_765, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(19535, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(19553, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(19572, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(19597, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(19618, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19640, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(19666, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(19689, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(19712, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(19735, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(19753, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19772, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(19789, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(19827, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(19856, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(19872, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(19889, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(19911, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(19929, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(19955, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/src/mesa/main/remap_helper.h b/src/mesa/main/remap_helper.h
index c80a524b4f0..c3d2b6d526b 100644
--- a/src/mesa/main/remap_helper.h
+++ b/src/mesa/main/remap_helper.h
@@ -1234,3093 +1234,3117 @@ static const char _mesa_function_pool[] =
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[8246]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[8246]: ColorMaskIndexedEXT (will be remapped) */
+   "iiiii\0"
+   "glColorMaskIndexedEXT\0"
+   "\0"
+   /* _mesa_function_pool[8275]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[8268]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[8297]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[8284]: EndList (offset 1) */
+   /* _mesa_function_pool[8313]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[8296]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[8325]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[8320]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[8349]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[8350]: Uniform3fvARB (will be remapped) */
+   /* _mesa_function_pool[8379]: Uniform3fvARB (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[8384]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[8413]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[8402]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[8431]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[8453]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[8482]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[8472]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[8501]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[8487]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[8516]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[8515]: CheckFramebufferStatusEXT (will be remapped) */
+   /* _mesa_function_pool[8544]: CheckFramebufferStatusEXT (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "\0"
-   /* _mesa_function_pool[8571]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[8600]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[8599]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[8628]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[8617]: GetVertexAttribivARB (will be remapped) */
+   /* _mesa_function_pool[8646]: GetVertexAttribivARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[8665]: GetCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[8694]: GetCombinerInputParameterfvNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[8704]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[8733]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[8722]: LoadTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[8751]: LoadTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[8774]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[8803]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[8808]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[8837]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[8836]: SecondaryColor3sEXT (will be remapped) */
+   /* _mesa_function_pool[8865]: SecondaryColor3sEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[8882]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[8911]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[8908]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[8937]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[8923]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[8952]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[8950]: Color3us (offset 23) */
+   /* _mesa_function_pool[8979]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[8966]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[8995]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[9001]: VertexAttrib4ivARB (will be remapped) */
+   /* _mesa_function_pool[9030]: VertexAttrib4ivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[9044]: End (offset 43) */
+   /* _mesa_function_pool[9073]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[9052]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[9081]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[9077]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[9106]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[9103]: GetQueryObjectui64vEXT (will be remapped) */
+   /* _mesa_function_pool[9132]: GetQueryObjectui64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[9133]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[9162]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[9178]: SecondaryColor3dEXT (will be remapped) */
+   /* _mesa_function_pool[9207]: SecondaryColor3dEXT (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[9224]: Color3ub (offset 19) */
+   /* _mesa_function_pool[9253]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[9240]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[9269]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9272]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[9301]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[9297]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[9326]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[9332]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[9361]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[9355]: Color3ui (offset 21) */
+   /* _mesa_function_pool[9384]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[9371]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[9400]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[9388]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[9417]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[9434]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[9463]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[9461]: GetTexParameterPointervAPPLE (will be remapped) */
+   /* _mesa_function_pool[9490]: GetTexParameterPointervAPPLE (will be remapped) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[9497]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[9526]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[9513]: PixelTransformParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[9542]: PixelTransformParameterfvEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[9549]: VertexAttrib4bvARB (will be remapped) */
+   /* _mesa_function_pool[9578]: VertexAttrib4bvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[9592]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[9621]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[9625]: MultiTexCoord4sARB (offset 406) */
+   /* _mesa_function_pool[9654]: GetIntegerIndexedvEXT (will be remapped) */
+   "iip\0"
+   "glGetIntegerIndexedvEXT\0"
+   "\0"
+   /* _mesa_function_pool[9683]: MultiTexCoord4sARB (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[9671]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[9729]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[9704]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[9762]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[9728]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[9786]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "\0"
-   /* _mesa_function_pool[9753]: WindowPos2dMESA (will be remapped) */
+   /* _mesa_function_pool[9811]: WindowPos2dMESA (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[9806]: FramebufferTexture3DEXT (will be remapped) */
+   /* _mesa_function_pool[9864]: FramebufferTexture3DEXT (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "\0"
-   /* _mesa_function_pool[9863]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[9921]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "\0"
-   /* _mesa_function_pool[9901]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[9959]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[9926]: VertexAttrib3dARB (will be remapped) */
+   /* _mesa_function_pool[9984]: VertexAttrib3dARB (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[9969]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10027]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10033]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[10091]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[10077]: GetError (offset 261) */
+   /* _mesa_function_pool[10135]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[10090]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[10148]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[10109]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[10167]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[10126]: Indexdv (offset 45) */
+   /* _mesa_function_pool[10184]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[10139]: FramebufferTexture2DEXT (will be remapped) */
+   /* _mesa_function_pool[10197]: FramebufferTexture2DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "\0"
-   /* _mesa_function_pool[10195]: Normal3s (offset 60) */
+   /* _mesa_function_pool[10253]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[10211]: PushName (offset 201) */
+   /* _mesa_function_pool[10269]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[10225]: MultiTexCoord2dvARB (offset 385) */
+   /* _mesa_function_pool[10283]: MultiTexCoord2dvARB (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[10270]: CullParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[10328]: CullParameterfvEXT (will be remapped) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[10295]: Normal3i (offset 58) */
+   /* _mesa_function_pool[10353]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[10311]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[10369]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[10346]: SecondaryColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[10404]: SecondaryColorPointerEXT (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[10403]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[10461]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[10446]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[10504]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[10475]: GetActiveUniformARB (will be remapped) */
+   /* _mesa_function_pool[10533]: GetActiveUniformARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[10525]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[10583]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[10559]: Normal3b (offset 52) */
+   /* _mesa_function_pool[10617]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[10575]: Normal3d (offset 54) */
+   /* _mesa_function_pool[10633]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[10591]: Normal3f (offset 56) */
+   /* _mesa_function_pool[10649]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[10607]: MultiTexCoord1svARB (offset 383) */
+   /* _mesa_function_pool[10665]: MultiTexCoord1svARB (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[10652]: Indexi (offset 48) */
+   /* _mesa_function_pool[10710]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[10664]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[10722]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[10692]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[10750]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[10713]: DeformationMap3dSGIX (dynamic) */
+   /* _mesa_function_pool[10771]: DeformationMap3dSGIX (dynamic) */
    "iddiiddiiddiip\0"
    "glDeformationMap3dSGIX\0"
    "\0"
-   /* _mesa_function_pool[10752]: DepthMask (offset 211) */
+   /* _mesa_function_pool[10810]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[10767]: IsShader (will be remapped) */
+   /* _mesa_function_pool[10825]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[10781]: Indexf (offset 46) */
+   /* _mesa_function_pool[10839]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[10793]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[10851]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[10831]: Indexd (offset 44) */
+   /* _mesa_function_pool[10889]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[10843]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[10901]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[10864]: StencilOp (offset 244) */
+   /* _mesa_function_pool[10922]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[10881]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[10939]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[10903]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[10961]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[10948]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[11006]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[10964]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[11022]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[11010]: Indexs (offset 50) */
+   /* _mesa_function_pool[11068]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[11022]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[11080]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[11042]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[11100]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[11064]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[11122]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[11102]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[11160]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[11134]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[11192]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[11161]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[11219]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[11176]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[11234]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[11193]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[11251]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[11208]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11266]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11261]: Color4bv (offset 26) */
+   /* _mesa_function_pool[11319]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[11275]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[11333]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[11297]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[11355]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[11345]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[11403]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[11370]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[11428]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[11418]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[11476]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[11442]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[11500]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[11477]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[11535]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[11495]: LogicOp (offset 242) */
+   /* _mesa_function_pool[11553]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[11508]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[11566]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[11532]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[11590]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[11547]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[11605]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[11623]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[11681]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[11640]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[11698]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[11660]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[11718]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[11687]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[11745]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[11732]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[11790]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[11747]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[11805]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[11779]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[11837]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[11807]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[11865]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[11831]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[11889]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[11892]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[11950]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[11916]: GenTextures (offset 328) */
+   /* _mesa_function_pool[11974]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[11951]: SetFenceNV (will be remapped) */
+   /* _mesa_function_pool[12009]: SetFenceNV (will be remapped) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[11968]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[12026]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[12024]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[12082]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[12063]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[12121]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[12096]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[12154]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[12118]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12176]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12146]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[12204]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[12164]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[12222]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[12182]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[12240]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[12197]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[12255]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[12213]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[12271]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[12230]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[12288]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[12254]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[12312]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[12271]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[12329]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[12326]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[12384]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[12341]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[12399]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[12360]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[12418]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[12389]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[12447]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[12432]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[12490]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[12476]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[12534]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[12492]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[12550]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[12526]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[12584]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[12555]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[12613]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[12600]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[12658]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[12656]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[12714]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[12677]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[12735]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[12707]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[12765]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[12742]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[12800]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[12761]: Flush (offset 217) */
+   /* _mesa_function_pool[12819]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[12771]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[12829]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[12786]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[12844]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[12808]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[12866]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[12826]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[12884]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[12869]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[12927]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[12893]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[12951]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[12909]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[12967]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[12927]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[12985]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[12969]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[13027]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[12991]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[13049]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[13011]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[13069]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[13052]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[13110]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[13107]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[13165]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[13125]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[13183]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[13149]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[13207]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[13167]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[13225]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[13185]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[13243]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[13239]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[13297]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[13281]: Color4ub (offset 35) */
+   /* _mesa_function_pool[13339]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[13298]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[13356]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[13318]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[13376]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[13347]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[13405]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[13365]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[13423]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[13425]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[13483]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[13444]: Indexiv (offset 49) */
+   /* _mesa_function_pool[13502]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[13457]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[13515]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[13475]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[13533]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[13519]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[13577]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[13579]: Frustum (offset 289) */
+   /* _mesa_function_pool[13637]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[13597]: GetString (offset 275) */
+   /* _mesa_function_pool[13655]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[13612]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[13670]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[13638]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[13696]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[13653]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[13711]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[13671]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[13729]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[13701]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[13759]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[13719]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[13777]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[13764]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[13822]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[13808]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[13866]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[13851]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[13909]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[13892]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[13950]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[13920]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[13978]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[13955]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[14013]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[13973]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[14031]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[14004]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[14062]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[14038]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[14096]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[14063]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[14121]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[14119]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[14177]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[14138]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[14196]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[14154]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[14212]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[14202]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[14260]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[14248]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[14306]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[14265]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[14323]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[14292]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[14350]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[14319]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[14377]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[14356]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[14414]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[14376]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[14434]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[14397]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[14455]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[14424]: Rectd (offset 86) */
+   /* _mesa_function_pool[14482]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[14438]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[14496]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[14464]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[14522]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[14501]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[14559]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[14548]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[14606]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[14567]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[14625]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[14612]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[14670]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[14637]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[14695]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[14667]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[14725]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[14714]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[14772]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[14762]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[14820]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[14820]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[14878]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[14854]: Lightfv (offset 160) */
+   /* _mesa_function_pool[14912]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[14869]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[14927]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[14885]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[14943]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[14905]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[14963]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[14927]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[14985]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[14970]: Color4fv (offset 30) */
+   /* _mesa_function_pool[15028]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[14984]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[15042]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[15029]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[15087]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[15066]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[15124]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[15087]: Rects (offset 92) */
+   /* _mesa_function_pool[15145]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[15101]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[15159]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[15135]: Lightiv (offset 162) */
+   /* _mesa_function_pool[15193]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[15150]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[15208]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[15194]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[15252]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[15242]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[15300]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[15267]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[15325]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[15291]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[15349]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[15336]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[15394]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[15379]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[15437]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[15405]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[15463]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[15431]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[15489]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[15449]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[15507]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[15492]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[15550]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[15546]: Rectdv (offset 87) */
+   /* _mesa_function_pool[15604]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[15559]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[15617]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[15585]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[15643]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[15644]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[15702]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[15672]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[15730]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[15717]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[15775]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[15744]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[15802]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[15771]: Materialiv (offset 172) */
+   /* _mesa_function_pool[15829]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[15789]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[15847]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[15811]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[15869]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[15846]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[15904]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[15892]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[15950]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[15945]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[16003]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[15991]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[16049]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[16009]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[16067]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[16073]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[16131]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[16100]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[16158]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[16127]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[16185]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[16155]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[16213]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[16193]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[16251]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[16211]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[16269]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[16235]: TexGeni (offset 192) */
+   /* _mesa_function_pool[16293]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[16250]: TexGenf (offset 190) */
+   /* _mesa_function_pool[16308]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[16265]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[16323]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[16298]: TexGend (offset 188) */
+   /* _mesa_function_pool[16356]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[16313]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[16371]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[16340]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[16398]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[16363]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[16421]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[16382]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[16440]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[16409]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[16467]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[16463]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[16521]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[16487]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[16545]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[16513]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[16571]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[16542]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[16600]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[16566]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[16624]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[16613]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[16671]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[16663]: PixelTexGenSGIX (will be remapped) */
+   /* _mesa_function_pool[16721]: PixelTexGenSGIX (will be remapped) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[16684]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[16742]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[16711]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[16769]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[16745]: Color4sv (offset 34) */
+   /* _mesa_function_pool[16803]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[16759]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[16817]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[16789]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[16847]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[16821]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[16879]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[16856]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[16914]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[16872]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[16930]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[16905]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[16963]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[16963]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[17021]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[17019]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[17077]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[17049]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[17107]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[17069]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[17127]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[17088]: Color3dv (offset 12) */
+   /* _mesa_function_pool[17146]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[17102]: IsTexture (offset 330) */
+   /* _mesa_function_pool[17160]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[17132]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[17190]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[17155]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[17213]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[17196]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[17254]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[17231]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[17289]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[17250]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[17308]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[17289]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[17347]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[17319]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[17377]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[17351]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[17409]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[17380]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[17438]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[17396]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[17454]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[17438]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[17496]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[17456]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[17514]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[17482]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[17540]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[17531]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[17589]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[17549]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[17607]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[17594]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[17652]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[17628]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[17686]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[17652]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[17710]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[17691]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[17749]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[17720]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[17778]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[17738]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[17796]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[17781]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[17839]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[17801]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[17859]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[17869]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[17927]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[17924]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[17982]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[17962]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[18020]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[17996]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[18054]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[18044]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[18102]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[18072]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[18130]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[18125]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[18183]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[18146]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[18204]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[18173]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[18231]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[18205]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[18263]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[18229]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[18287]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[18255]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[18313]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[18277]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[18335]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[18295]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[18353]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[18318]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[18376]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[18345]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[18403]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[18395]: Color3s (offset 17) */
+   /* _mesa_function_pool[18453]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[18410]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[18468]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[18444]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[18502]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[18497]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[18555]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[18516]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[18574]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[18540]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[18598]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[18584]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[18642]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[18607]: Color3i (offset 15) */
+   /* _mesa_function_pool[18665]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[18622]: FrontFace (offset 157) */
+   /* _mesa_function_pool[18680]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[18637]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[18695]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[18655]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[18713]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[18703]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[18761]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[18721]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[18779]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[18764]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[18822]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[18814]: Color3b (offset 9) */
+   /* _mesa_function_pool[18872]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[18829]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[18887]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[18873]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[18931]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[18897]: Color3f (offset 13) */
+   /* _mesa_function_pool[18955]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[18912]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[18970]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[18932]: Color3d (offset 11) */
+   /* _mesa_function_pool[18990]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[18947]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[19005]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[18962]: Lightf (offset 159) */
+   /* _mesa_function_pool[19020]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[18976]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[19034]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[19002]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[19060]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[19018]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[19076]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[19039]: Lighti (offset 161) */
+   /* _mesa_function_pool[19097]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[19053]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[19111]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[19084]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[19142]: GetBooleanIndexedvEXT (will be remapped) */
+   "iip\0"
+   "glGetBooleanIndexedvEXT\0"
+   "\0"
+   /* _mesa_function_pool[19171]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[19169]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[19256]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[19204]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[19291]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[19249]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[19336]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[19284]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[19371]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[19301]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[19388]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[19318]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[19405]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[19335]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19422]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19378]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[19465]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[19409]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[19496]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[19464]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[19551]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[19490]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[19577]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[19535]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[19622]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[19562]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[19649]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[19584]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[19671]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[19611]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[19698]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[19640]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[19727]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[19663]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[19750]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[19682]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[19769]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[19709]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[19796]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[19727]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[19814]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[19772]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[19859]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[19815]: ClearColor (offset 206) */
+   /* _mesa_function_pool[19902]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[19834]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[19921]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[19853]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[19940]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[19902]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[19989]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[19929]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[20016]: IsEnabledIndexedEXT (will be remapped) */
+   "ii\0"
+   "glIsEnabledIndexedEXT\0"
+   "\0"
+   /* _mesa_function_pool[20042]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[19945]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[20058]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[19993]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[20106]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[20013]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[20126]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[20061]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[20174]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[20085]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[20198]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[20126]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[20239]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[20158]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[20271]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[20176]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[20289]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[20268]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[20381]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[20299]: Bitmap (offset 8) */
+   /* _mesa_function_pool[20412]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[20317]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[20430]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[20362]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[20475]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[20393]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[20506]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[20429]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[20542]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[20472]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[20585]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[20504]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[20617]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[20519]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[20632]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[20537]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[20650]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[20577]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[20690]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[20604]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[20717]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[20623]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[20736]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[20671]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[20784]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[20706]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[20819]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[20733]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[20846]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[20757]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[20870]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[20791]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[20904]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[20843]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[20956]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[20862]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[20975]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[20893]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[21006]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[20931]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[21044]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[20951]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[21064]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[21022]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[21135]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[21044]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[21157]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[21064]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[21177]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[21118]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[21231]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[21171]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[21284]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[21216]: Map1d (offset 220) */
+   /* _mesa_function_pool[21329]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[21232]: Map1f (offset 221) */
+   /* _mesa_function_pool[21345]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[21248]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[21361]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[21307]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[21420]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[21343]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[21456]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[21367]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[21480]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[21388]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[21501]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[21419]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[21532]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[21458]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[21571]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[21480]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[21593]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[21534]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[21647]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[21555]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[21668]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[21601]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[21714]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[21616]: Fogiv (offset 156) */
+   /* _mesa_function_pool[21729]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[21628]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[21741]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[21645]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[21758]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[21681]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[21794]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[21702]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[21815]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[21729]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[21842]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[21753]: Rotatef (offset 300) */
+   /* _mesa_function_pool[21866]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[21769]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[21882]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[21811]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[21924]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[21827]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[21940]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[21843]: Clear (offset 203) */
+   /* _mesa_function_pool[21956]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[21854]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[21967]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[21870]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[21983]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[21897]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[22010]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[21931]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[22044]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[21947]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[22060]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[22003]: Ortho (offset 296) */
+   /* _mesa_function_pool[22116]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[22019]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[22132]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[22040]: ListBase (offset 6) */
+   /* _mesa_function_pool[22153]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[22054]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[22167]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[22070]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[22183]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[22126]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[22239]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[22218]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[22331]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[22275]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[22388]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[22291]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[22404]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[22317]: Rectiv (offset 91) */
+   /* _mesa_function_pool[22430]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[22330]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[22443]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[22368]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[22481]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[22395]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[22508]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[22418]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[22531]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[22437]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[22550]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[22456]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[22569]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[22476]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[22589]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[22522]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[22635]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[22537]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[22650]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[22582]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[22695]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[22627]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[22740]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[22673]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[22786]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[22688]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[22801]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[22736]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[22849]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[22771]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[22884]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[22814]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[22927]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[22831]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[22944]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[22874]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[22987]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[22921]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[23034]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[23009]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[23122]: DisableIndexedEXT (will be remapped) */
+   "ii\0"
+   "glDisableIndexedEXT\0"
+   "\0"
+   /* _mesa_function_pool[23146]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[23054]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[23191]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[23086]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[23223]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[23101]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[23238]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[23127]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[23264]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[23152]: LineWidth (offset 168) */
+   /* _mesa_function_pool[23289]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[23167]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[23304]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[23198]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[23335]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[23236]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[23373]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[23256]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[23393]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[23277]: TexGendv (offset 189) */
+   /* _mesa_function_pool[23414]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[23293]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[23430]: EnableIndexedEXT (will be remapped) */
+   "ii\0"
+   "glEnableIndexedEXT\0"
+   "\0"
+   /* _mesa_function_pool[23453]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[23318]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[23478]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[23339]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[23499]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[23373]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[23533]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[23400]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[23560]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[23423]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[23583]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[23449]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[23609]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[23513]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[23673]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[23539]: MultiModeDrawArraysIBM (will be remapped) */
+   /* _mesa_function_pool[23699]: MultiModeDrawArraysIBM (will be remapped) */
    "pppii\0"
    "glMultiModeDrawArraysIBM\0"
    "\0"
-   /* _mesa_function_pool[23571]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[23731]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[23615]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[23775]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[23646]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[23806]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[23683]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[23843]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[23704]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[23864]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[23726]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[23886]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[23747]: CallList (offset 2) */
+   /* _mesa_function_pool[23907]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[23761]: Materialfv (offset 170) */
+   /* _mesa_function_pool[23921]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[23779]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[23939]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[23796]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[23956]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[23828]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[23988]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[23873]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[24033]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[23921]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[24081]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[23966]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[24126]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[23984]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[24144]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[24037]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[24197]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[24068]: Color3iv (offset 16) */
+   /* _mesa_function_pool[24228]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[24082]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[24242]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[24116]: DrawElements (offset 311) */
+   /* _mesa_function_pool[24276]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[24137]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[24297]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[24163]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[24323]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[24200]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[24360]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[24260]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[24420]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[24303]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[24463]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[24358]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[24518]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[24381]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[24541]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[24454]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[24614]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[24477]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[24637]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[24508]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[24668]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[24545]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[24705]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[24562]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[24722]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[24578]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[24738]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[24598]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[24758]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[24612]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[24772]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[24631]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[24791]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[24651]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[24811]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[24700]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[24860]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[24746]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[24906]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[24765]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[24925]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[24791]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[24951]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[24834]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[24994]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[24879]: Map2d (offset 222) */
+   /* _mesa_function_pool[25039]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[24899]: Map2f (offset 223) */
+   /* _mesa_function_pool[25059]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[24919]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[25079]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[24944]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[25104]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[24961]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[25121]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[24990]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[25150]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[25015]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[25175]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[25038]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[25198]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[25055]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[25215]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[25072]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[25232]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[25089]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[25249]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[25107]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[25267]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[25133]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[25293]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[25189]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[25349]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[25208]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[25368]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[25225]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[25385]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[25256]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[25416]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[25296]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[25456]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[25322]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[25482]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[25353]: Materialf (offset 169) */
+   /* _mesa_function_pool[25513]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[25370]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[25530]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[25415]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[25575]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[25440]: Materiali (offset 171) */
+   /* _mesa_function_pool[25600]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[25457]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[25617]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[25483]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[25643]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[25518]: Indexsv (offset 51) */
+   /* _mesa_function_pool[25678]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[25531]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[25691]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[25576]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[25736]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[25595]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[25755]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[25612]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[25772]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[25645]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[25805]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[25663]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[25823]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[25700]: Translated (offset 303) */
+   /* _mesa_function_pool[25860]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[25718]: Translatef (offset 304) */
+   /* _mesa_function_pool[25878]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[25736]: StencilMask (offset 209) */
+   /* _mesa_function_pool[25896]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[25753]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[25913]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[25773]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[25933]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[25791]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[25951]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[25817]: IsList (offset 287) */
+   /* _mesa_function_pool[25977]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[25829]: IsSync (will be remapped) */
+   /* _mesa_function_pool[25989]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[25841]: RenderMode (offset 196) */
+   /* _mesa_function_pool[26001]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[25857]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[26017]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[25890]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[26050]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "\0"
-   /* _mesa_function_pool[25942]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[26102]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[25979]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[26139]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[26007]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[26167]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[26049]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[26209]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[26092]: LoadName (offset 198) */
+   /* _mesa_function_pool[26252]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[26106]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[26266]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[26133]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[26293]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[26151]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[26311]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[26185]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[26345]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[26236]: CullFace (offset 152) */
+   /* _mesa_function_pool[26396]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[26250]: BindTexture (offset 307) */
+   /* _mesa_function_pool[26410]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[26285]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[26445]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[26312]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[26472]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[26358]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[26518]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[26384]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[26544]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[26403]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[26563]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[26423]: Rectsv (offset 93) */
+   /* _mesa_function_pool[26583]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[26436]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[26596]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[26463]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[26623]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[26521]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[26681]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[26547]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[26707]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[26610]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[26770]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[26665]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[26825]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[26692]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[26852]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[26713]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[26873]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[26735]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[26895]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[26763]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[26923]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[26787]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[26947]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[26832]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[26992]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[26851]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[27011]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[26878]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[27038]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[26894]: Recti (offset 90) */
+   /* _mesa_function_pool[27054]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[26908]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[27068]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[26947]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[27107]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[26976]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[27136]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[27015]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[27175]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[27037]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[27197]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[27058]: Rectf (offset 88) */
+   /* _mesa_function_pool[27218]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[27072]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[27232]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[27095]: Indexfv (offset 47) */
+   /* _mesa_function_pool[27255]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[27108]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[27268]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[27154]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[27314]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[27206]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[27366]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[27241]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[27401]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[27261]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[27421]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[27288]: IndexMask (offset 212) */
+   /* _mesa_function_pool[27448]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[27303]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[27463]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[27340]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[27500]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[27383]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[27543]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[27399]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[27559]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[27425]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[27585]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[27444]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[27604]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[27466]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[27626]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[27485]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[27645]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[27502]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[27662]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[27529]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[27689]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[27543]: Fogfv (offset 154) */
+   /* _mesa_function_pool[27703]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[27555]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[27715]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[27589]: InitNames (offset 197) */
+   /* _mesa_function_pool[27749]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[27603]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[27763]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[27618]: Minmax (offset 368) */
+   /* _mesa_function_pool[27778]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[27644]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[27804]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[27663]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[27823]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[27682]: FogCoorddvEXT (will be remapped) */
+   /* _mesa_function_pool[27842]: FogCoorddvEXT (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[27714]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[27874]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[27736]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[27896]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[27766]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[27926]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[27786]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[27946]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[27804]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[27964]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[27841]: Hint (offset 158) */
+   /* _mesa_function_pool[28001]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[27852]: Color4dv (offset 28) */
+   /* _mesa_function_pool[28012]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[27866]: VertexAttrib2svARB (will be remapped) */
+   /* _mesa_function_pool[28026]: VertexAttrib2svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[27909]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[28069]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[27938]: WindowPos3svMESA (will be remapped) */
+   /* _mesa_function_pool[28098]: WindowPos3svMESA (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[27993]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[28153]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[28043]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[28203]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[28061]: DeleteRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[28221]: DeleteRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[28112]: VertexAttrib4NubvARB (will be remapped) */
+   /* _mesa_function_pool[28272]: VertexAttrib4NubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[28159]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[28319]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[28183]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[28343]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[28214]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[28374]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[28229]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[28389]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[28264]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[28424]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[28281]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[28441]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[28301]: Begin (offset 7) */
+   /* _mesa_function_pool[28461]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[28312]: LightModeli (offset 165) */
+   /* _mesa_function_pool[28472]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[28330]: Rectfv (offset 89) */
+   /* _mesa_function_pool[28490]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[28343]: LightModelf (offset 163) */
+   /* _mesa_function_pool[28503]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[28361]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[28521]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[28386]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[28546]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[28404]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[28564]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[28440]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[28600]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[28466]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[28626]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[28489]: GetCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[28649]: GetCombinerInputParameterivNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[28528]: Disable (offset 214) */
+   /* _mesa_function_pool[28688]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[28541]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[28701]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[28586]: GetRenderbufferParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[28746]: GetRenderbufferParameterivEXT (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[28652]: CombinerParameterivNV (will be remapped) */
+   /* _mesa_function_pool[28812]: CombinerParameterivNV (will be remapped) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[28680]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[28840]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[28707]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[28867]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[28741]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[28901]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[28760]: VertexAttrib2sARB (will be remapped) */
+   /* _mesa_function_pool[28920]: VertexAttrib2sARB (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[28802]: ColorMask (offset 210) */
+   /* _mesa_function_pool[28962]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[28820]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[28980]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[28845]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[29005]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[28864]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[29024]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[28894]: BindBufferARB (will be remapped) */
+   /* _mesa_function_pool[29054]: BindBufferARB (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[28927]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[29087]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[28949]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[29109]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[28967]: Enable (offset 215) */
+   /* _mesa_function_pool[29127]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[28979]: LineStipple (offset 167) */
+   /* _mesa_function_pool[29139]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[28997]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[29157]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[29023]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[29183]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[29053]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[29213]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[29080]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[29240]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[29134]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[29294]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[29177]: GenBuffersARB (will be remapped) */
+   /* _mesa_function_pool[29337]: GenBuffersARB (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[29210]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[29370]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[29236]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[29396]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[29251]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[29411]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[29282]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[29442]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[29303]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[29463]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[29333]: IsRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[29493]: IsRenderbufferEXT (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[29373]: GenProgramsNV (will be remapped) */
+   /* _mesa_function_pool[29533]: GenProgramsNV (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[29410]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[29570]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[29434]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[29594]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[29459]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[29619]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[29480]: WindowPos2fMESA (will be remapped) */
+   /* _mesa_function_pool[29640]: WindowPos2fMESA (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
@@ -4334,392 +4358,398 @@ static const struct {
    GLint remap_index;
 } MESA_remap_table_functions[] = {
    {  1461, AttachShader_remap_index },
-   {  8704, CreateProgram_remap_index },
-   { 20158, CreateShader_remap_index },
-   { 22418, DeleteProgram_remap_index },
-   { 16193, DeleteShader_remap_index },
-   { 20604, DetachShader_remap_index },
-   { 15717, GetAttachedShaders_remap_index },
+   {  8733, CreateProgram_remap_index },
+   { 20271, CreateShader_remap_index },
+   { 22531, DeleteProgram_remap_index },
+   { 16251, DeleteShader_remap_index },
+   { 20717, DetachShader_remap_index },
+   { 15775, GetAttachedShaders_remap_index },
    {  4244, GetProgramInfoLog_remap_index },
    {   361, GetProgramiv_remap_index },
    {  5547, GetShaderInfoLog_remap_index },
-   { 27425, GetShaderiv_remap_index },
-   { 11732, IsProgram_remap_index },
-   { 10767, IsShader_remap_index },
-   {  8808, StencilFuncSeparate_remap_index },
+   { 27585, GetShaderiv_remap_index },
+   { 11790, IsProgram_remap_index },
+   { 10825, IsShader_remap_index },
+   {  8837, StencilFuncSeparate_remap_index },
    {  3487, StencilMaskSeparate_remap_index },
    {  6623, StencilOpSeparate_remap_index },
-   { 19535, UniformMatrix2x3fv_remap_index },
+   { 19622, UniformMatrix2x3fv_remap_index },
    {  2615, UniformMatrix2x4fv_remap_index },
-   { 29053, UniformMatrix3x2fv_remap_index },
-   { 26851, UniformMatrix3x4fv_remap_index },
-   { 14265, UniformMatrix4x2fv_remap_index },
+   { 29213, UniformMatrix3x2fv_remap_index },
+   { 27011, UniformMatrix3x4fv_remap_index },
+   { 14323, UniformMatrix4x2fv_remap_index },
    {  2937, UniformMatrix4x3fv_remap_index },
-   {  8722, LoadTransposeMatrixdARB_remap_index },
-   { 27154, LoadTransposeMatrixfARB_remap_index },
+   {  8751, LoadTransposeMatrixdARB_remap_index },
+   { 27314, LoadTransposeMatrixfARB_remap_index },
    {  4817, MultTransposeMatrixdARB_remap_index },
-   { 20791, MultTransposeMatrixfARB_remap_index },
+   { 20904, MultTransposeMatrixfARB_remap_index },
    {   172, SampleCoverageARB_remap_index },
    {  4971, CompressedTexImage1DARB_remap_index },
-   { 21248, CompressedTexImage2DARB_remap_index },
+   { 21361, CompressedTexImage2DARB_remap_index },
    {  3550, CompressedTexImage3DARB_remap_index },
-   { 16009, CompressedTexSubImage1DARB_remap_index },
+   { 16067, CompressedTexSubImage1DARB_remap_index },
    {  1880, CompressedTexSubImage2DARB_remap_index },
-   { 17801, CompressedTexSubImage3DARB_remap_index },
-   { 25133, GetCompressedTexImageARB_remap_index },
+   { 17859, CompressedTexSubImage3DARB_remap_index },
+   { 25293, GetCompressedTexImageARB_remap_index },
    {  3395, DisableVertexAttribArrayARB_remap_index },
-   { 26463, EnableVertexAttribArrayARB_remap_index },
-   { 28229, GetProgramEnvParameterdvARB_remap_index },
-   { 20671, GetProgramEnvParameterfvARB_remap_index },
-   { 24163, GetProgramLocalParameterdvARB_remap_index },
+   { 26623, EnableVertexAttribArrayARB_remap_index },
+   { 28389, GetProgramEnvParameterdvARB_remap_index },
+   { 20784, GetProgramEnvParameterfvARB_remap_index },
+   { 24323, GetProgramLocalParameterdvARB_remap_index },
    {  7065, GetProgramLocalParameterfvARB_remap_index },
-   { 16100, GetProgramStringARB_remap_index },
-   { 24358, GetProgramivARB_remap_index },
-   { 17996, GetVertexAttribdvARB_remap_index },
-   { 14154, GetVertexAttribfvARB_remap_index },
-   {  8617, GetVertexAttribivARB_remap_index },
-   { 16905, ProgramEnvParameter4dARB_remap_index },
-   { 22218, ProgramEnvParameter4dvARB_remap_index },
-   { 14762, ProgramEnvParameter4fARB_remap_index },
+   { 16158, GetProgramStringARB_remap_index },
+   { 24518, GetProgramivARB_remap_index },
+   { 18054, GetVertexAttribdvARB_remap_index },
+   { 14212, GetVertexAttribfvARB_remap_index },
+   {  8646, GetVertexAttribivARB_remap_index },
+   { 16963, ProgramEnvParameter4dARB_remap_index },
+   { 22331, ProgramEnvParameter4dvARB_remap_index },
+   { 14820, ProgramEnvParameter4fARB_remap_index },
    {  7928, ProgramEnvParameter4fvARB_remap_index },
    {  3513, ProgramLocalParameter4dARB_remap_index },
-   { 11442, ProgramLocalParameter4dvARB_remap_index },
-   { 25942, ProgramLocalParameter4fARB_remap_index },
-   { 22736, ProgramLocalParameter4fvARB_remap_index },
-   { 24919, ProgramStringARB_remap_index },
-   { 17155, VertexAttrib1dARB_remap_index },
-   { 13808, VertexAttrib1dvARB_remap_index },
+   { 11500, ProgramLocalParameter4dvARB_remap_index },
+   { 26102, ProgramLocalParameter4fARB_remap_index },
+   { 22849, ProgramLocalParameter4fvARB_remap_index },
+   { 25079, ProgramStringARB_remap_index },
+   { 17213, VertexAttrib1dARB_remap_index },
+   { 13866, VertexAttrib1dvARB_remap_index },
    {  3688, VertexAttrib1fARB_remap_index },
-   { 29134, VertexAttrib1fvARB_remap_index },
+   { 29294, VertexAttrib1fvARB_remap_index },
    {  6149, VertexAttrib1sARB_remap_index },
    {  2054, VertexAttrib1svARB_remap_index },
-   { 13239, VertexAttrib2dARB_remap_index },
-   { 15336, VertexAttrib2dvARB_remap_index },
+   { 13297, VertexAttrib2dARB_remap_index },
+   { 15394, VertexAttrib2dvARB_remap_index },
    {  1480, VertexAttrib2fARB_remap_index },
-   { 15449, VertexAttrib2fvARB_remap_index },
-   { 28760, VertexAttrib2sARB_remap_index },
-   { 27866, VertexAttrib2svARB_remap_index },
-   {  9926, VertexAttrib3dARB_remap_index },
+   { 15507, VertexAttrib2fvARB_remap_index },
+   { 28920, VertexAttrib2sARB_remap_index },
+   { 28026, VertexAttrib2svARB_remap_index },
+   {  9984, VertexAttrib3dARB_remap_index },
    {  7631, VertexAttrib3dvARB_remap_index },
    {  1567, VertexAttrib3fARB_remap_index },
-   { 19772, VertexAttrib3fvARB_remap_index },
-   { 24791, VertexAttrib3sARB_remap_index },
-   { 17738, VertexAttrib3svARB_remap_index },
+   { 19859, VertexAttrib3fvARB_remap_index },
+   { 24951, VertexAttrib3sARB_remap_index },
+   { 17796, VertexAttrib3svARB_remap_index },
    {  4270, VertexAttrib4NbvARB_remap_index },
-   { 15672, VertexAttrib4NivARB_remap_index },
-   { 19727, VertexAttrib4NsvARB_remap_index },
-   { 20623, VertexAttrib4NubARB_remap_index },
-   { 28112, VertexAttrib4NubvARB_remap_index },
-   { 16566, VertexAttrib4NuivARB_remap_index },
+   { 15730, VertexAttrib4NivARB_remap_index },
+   { 19814, VertexAttrib4NsvARB_remap_index },
+   { 20736, VertexAttrib4NubARB_remap_index },
+   { 28272, VertexAttrib4NubvARB_remap_index },
+   { 16624, VertexAttrib4NuivARB_remap_index },
    {  2810, VertexAttrib4NusvARB_remap_index },
-   {  9549, VertexAttrib4bvARB_remap_index },
-   { 23571, VertexAttrib4dARB_remap_index },
-   { 18721, VertexAttrib4dvARB_remap_index },
-   { 10033, VertexAttrib4fARB_remap_index },
-   { 10403, VertexAttrib4fvARB_remap_index },
-   {  9001, VertexAttrib4ivARB_remap_index },
-   { 15150, VertexAttrib4sARB_remap_index },
-   { 27340, VertexAttrib4svARB_remap_index },
-   { 14567, VertexAttrib4ubvARB_remap_index },
-   { 26787, VertexAttrib4uivARB_remap_index },
-   { 17549, VertexAttrib4usvARB_remap_index },
-   { 19409, VertexAttribPointerARB_remap_index },
-   { 28894, BindBufferARB_remap_index },
+   {  9578, VertexAttrib4bvARB_remap_index },
+   { 23731, VertexAttrib4dARB_remap_index },
+   { 18779, VertexAttrib4dvARB_remap_index },
+   { 10091, VertexAttrib4fARB_remap_index },
+   { 10461, VertexAttrib4fvARB_remap_index },
+   {  9030, VertexAttrib4ivARB_remap_index },
+   { 15208, VertexAttrib4sARB_remap_index },
+   { 27500, VertexAttrib4svARB_remap_index },
+   { 14625, VertexAttrib4ubvARB_remap_index },
+   { 26947, VertexAttrib4uivARB_remap_index },
+   { 17607, VertexAttrib4usvARB_remap_index },
+   { 19496, VertexAttribPointerARB_remap_index },
+   { 29054, BindBufferARB_remap_index },
    {  5862, BufferDataARB_remap_index },
    {  1382, BufferSubDataARB_remap_index },
-   { 26976, DeleteBuffersARB_remap_index },
-   { 29177, GenBuffersARB_remap_index },
-   { 15492, GetBufferParameterivARB_remap_index },
-   { 14714, GetBufferPointervARB_remap_index },
+   { 27136, DeleteBuffersARB_remap_index },
+   { 29337, GenBuffersARB_remap_index },
+   { 15550, GetBufferParameterivARB_remap_index },
+   { 14772, GetBufferPointervARB_remap_index },
    {  1335, GetBufferSubDataARB_remap_index },
-   { 26735, IsBufferARB_remap_index },
-   { 23167, MapBufferARB_remap_index },
-   { 27555, UnmapBufferARB_remap_index },
+   { 26895, IsBufferARB_remap_index },
+   { 23304, MapBufferARB_remap_index },
+   { 27715, UnmapBufferARB_remap_index },
    {   268, BeginQueryARB_remap_index },
-   { 17250, DeleteQueriesARB_remap_index },
-   { 10664, EndQueryARB_remap_index },
-   { 25612, GenQueriesARB_remap_index },
+   { 17308, DeleteQueriesARB_remap_index },
+   { 10722, EndQueryARB_remap_index },
+   { 25772, GenQueriesARB_remap_index },
    {  1772, GetQueryObjectivARB_remap_index },
-   { 15194, GetQueryObjectuivARB_remap_index },
+   { 15252, GetQueryObjectuivARB_remap_index },
    {  1624, GetQueryivARB_remap_index },
-   { 17456, IsQueryARB_remap_index },
+   { 17514, IsQueryARB_remap_index },
    {  7241, AttachObjectARB_remap_index },
-   { 16155, CompileShaderARB_remap_index },
+   { 16213, CompileShaderARB_remap_index },
    {  2879, CreateProgramObjectARB_remap_index },
    {  5807, CreateShaderObjectARB_remap_index },
-   { 12656, DeleteObjectARB_remap_index },
-   { 21022, DetachObjectARB_remap_index },
-   { 10475, GetActiveUniformARB_remap_index },
-   {  8320, GetAttachedObjectsARB_remap_index },
-   {  8599, GetHandleARB_remap_index },
-   { 28927, GetInfoLogARB_remap_index },
-   { 28183, GetObjectParameterfvARB_remap_index },
-   { 24037, GetObjectParameterivARB_remap_index },
-   { 25370, GetShaderSourceARB_remap_index },
-   { 24651, GetUniformLocationARB_remap_index },
-   { 20893, GetUniformfvARB_remap_index },
-   { 11064, GetUniformivARB_remap_index },
-   { 17594, LinkProgramARB_remap_index },
-   { 17652, ShaderSourceARB_remap_index },
+   { 12714, DeleteObjectARB_remap_index },
+   { 21135, DetachObjectARB_remap_index },
+   { 10533, GetActiveUniformARB_remap_index },
+   {  8349, GetAttachedObjectsARB_remap_index },
+   {  8628, GetHandleARB_remap_index },
+   { 29087, GetInfoLogARB_remap_index },
+   { 28343, GetObjectParameterfvARB_remap_index },
+   { 24197, GetObjectParameterivARB_remap_index },
+   { 25530, GetShaderSourceARB_remap_index },
+   { 24811, GetUniformLocationARB_remap_index },
+   { 21006, GetUniformfvARB_remap_index },
+   { 11122, GetUniformivARB_remap_index },
+   { 17652, LinkProgramARB_remap_index },
+   { 17710, ShaderSourceARB_remap_index },
    {  6523, Uniform1fARB_remap_index },
-   { 26151, Uniform1fvARB_remap_index },
-   { 19378, Uniform1iARB_remap_index },
-   { 18410, Uniform1ivARB_remap_index },
+   { 26311, Uniform1fvARB_remap_index },
+   { 19465, Uniform1iARB_remap_index },
+   { 18468, Uniform1ivARB_remap_index },
    {  2003, Uniform2fARB_remap_index },
-   { 12492, Uniform2fvARB_remap_index },
-   { 23054, Uniform2iARB_remap_index },
+   { 12550, Uniform2fvARB_remap_index },
+   { 23191, Uniform2iARB_remap_index },
    {  2123, Uniform2ivARB_remap_index },
-   { 16265, Uniform3fARB_remap_index },
-   {  8350, Uniform3fvARB_remap_index },
+   { 16323, Uniform3fARB_remap_index },
+   {  8379, Uniform3fvARB_remap_index },
    {  5481, Uniform3iARB_remap_index },
-   { 14820, Uniform3ivARB_remap_index },
-   { 16711, Uniform4fARB_remap_index },
-   { 20757, Uniform4fvARB_remap_index },
-   { 21897, Uniform4iARB_remap_index },
-   { 17962, Uniform4ivARB_remap_index },
+   { 14878, Uniform3ivARB_remap_index },
+   { 16769, Uniform4fARB_remap_index },
+   { 20870, Uniform4fvARB_remap_index },
+   { 22010, Uniform4iARB_remap_index },
+   { 18020, Uniform4ivARB_remap_index },
    {  7293, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
    {  2475, UniformMatrix4fvARB_remap_index },
-   { 22330, UseProgramObjectARB_remap_index },
-   { 12927, ValidateProgramARB_remap_index },
-   { 18764, BindAttribLocationARB_remap_index },
+   { 22443, UseProgramObjectARB_remap_index },
+   { 12985, ValidateProgramARB_remap_index },
+   { 18822, BindAttribLocationARB_remap_index },
    {  4315, GetActiveAttribARB_remap_index },
-   { 14501, GetAttribLocationARB_remap_index },
-   { 25890, DrawBuffersARB_remap_index },
-   { 11547, RenderbufferStorageMultisample_remap_index },
-   { 16759, FlushMappedBufferRange_remap_index },
-   { 24454, MapBufferRange_remap_index },
-   { 14376, BindVertexArray_remap_index },
-   { 12786, GenVertexArrays_remap_index },
-   { 26665, CopyBufferSubData_remap_index },
-   { 27444, ClientWaitSync_remap_index },
+   { 14559, GetAttribLocationARB_remap_index },
+   { 26050, DrawBuffersARB_remap_index },
+   { 11605, RenderbufferStorageMultisample_remap_index },
+   { 16817, FlushMappedBufferRange_remap_index },
+   { 24614, MapBufferRange_remap_index },
+   { 14434, BindVertexArray_remap_index },
+   { 12844, GenVertexArrays_remap_index },
+   { 26825, CopyBufferSubData_remap_index },
+   { 27604, ClientWaitSync_remap_index },
    {  2394, DeleteSync_remap_index },
    {  6190, FenceSync_remap_index },
-   { 13298, GetInteger64v_remap_index },
-   { 19834, GetSynciv_remap_index },
-   { 25829, IsSync_remap_index },
-   {  8268, WaitSync_remap_index },
+   { 13356, GetInteger64v_remap_index },
+   { 19921, GetSynciv_remap_index },
+   { 25989, IsSync_remap_index },
+   {  8297, WaitSync_remap_index },
    {  3363, DrawElementsBaseVertex_remap_index },
-   { 26908, DrawRangeElementsBaseVertex_remap_index },
-   { 23198, MultiDrawElementsBaseVertex_remap_index },
+   { 27068, DrawRangeElementsBaseVertex_remap_index },
+   { 23335, MultiDrawElementsBaseVertex_remap_index },
    {  4680, PolygonOffsetEXT_remap_index },
-   { 20393, GetPixelTexGenParameterfvSGIS_remap_index },
+   { 20506, GetPixelTexGenParameterfvSGIS_remap_index },
    {  3895, GetPixelTexGenParameterivSGIS_remap_index },
-   { 20126, PixelTexGenParameterfSGIS_remap_index },
+   { 20239, PixelTexGenParameterfSGIS_remap_index },
    {   580, PixelTexGenParameterfvSGIS_remap_index },
-   { 11102, PixelTexGenParameteriSGIS_remap_index },
-   { 12063, PixelTexGenParameterivSGIS_remap_index },
-   { 14464, SampleMaskSGIS_remap_index },
-   { 17396, SamplePatternSGIS_remap_index },
-   { 23127, ColorPointerEXT_remap_index },
-   { 15379, EdgeFlagPointerEXT_remap_index },
+   { 11160, PixelTexGenParameteriSGIS_remap_index },
+   { 12121, PixelTexGenParameterivSGIS_remap_index },
+   { 14522, SampleMaskSGIS_remap_index },
+   { 17454, SamplePatternSGIS_remap_index },
+   { 23264, ColorPointerEXT_remap_index },
+   { 15437, EdgeFlagPointerEXT_remap_index },
    {  5135, IndexPointerEXT_remap_index },
    {  5215, NormalPointerEXT_remap_index },
-   { 13892, TexCoordPointerEXT_remap_index },
+   { 13950, TexCoordPointerEXT_remap_index },
    {  5985, VertexPointerEXT_remap_index },
    {  3165, PointParameterfEXT_remap_index },
    {  6830, PointParameterfvEXT_remap_index },
-   { 28281, LockArraysEXT_remap_index },
-   { 12991, UnlockArraysEXT_remap_index },
+   { 28441, LockArraysEXT_remap_index },
+   { 13049, UnlockArraysEXT_remap_index },
    {  7837, CullParameterdvEXT_remap_index },
-   { 10270, CullParameterfvEXT_remap_index },
+   { 10328, CullParameterfvEXT_remap_index },
    {  1151, SecondaryColor3bEXT_remap_index },
    {  6989, SecondaryColor3bvEXT_remap_index },
-   {  9178, SecondaryColor3dEXT_remap_index },
-   { 22476, SecondaryColor3dvEXT_remap_index },
-   { 24700, SecondaryColor3fEXT_remap_index },
-   { 15945, SecondaryColor3fvEXT_remap_index },
+   {  9207, SecondaryColor3dEXT_remap_index },
+   { 22589, SecondaryColor3dvEXT_remap_index },
+   { 24860, SecondaryColor3fEXT_remap_index },
+   { 16003, SecondaryColor3fvEXT_remap_index },
    {   426, SecondaryColor3iEXT_remap_index },
-   { 14202, SecondaryColor3ivEXT_remap_index },
-   {  8836, SecondaryColor3sEXT_remap_index },
-   { 27108, SecondaryColor3svEXT_remap_index },
-   { 23873, SecondaryColor3ubEXT_remap_index },
-   { 18655, SecondaryColor3ubvEXT_remap_index },
-   { 11297, SecondaryColor3uiEXT_remap_index },
-   { 20013, SecondaryColor3uivEXT_remap_index },
-   { 22688, SecondaryColor3usEXT_remap_index },
-   { 11370, SecondaryColor3usvEXT_remap_index },
-   { 10346, SecondaryColorPointerEXT_remap_index },
-   { 22537, MultiDrawArraysEXT_remap_index },
-   { 18345, MultiDrawElementsEXT_remap_index },
-   { 18540, FogCoordPointerEXT_remap_index },
+   { 14260, SecondaryColor3ivEXT_remap_index },
+   {  8865, SecondaryColor3sEXT_remap_index },
+   { 27268, SecondaryColor3svEXT_remap_index },
+   { 24033, SecondaryColor3ubEXT_remap_index },
+   { 18713, SecondaryColor3ubvEXT_remap_index },
+   { 11355, SecondaryColor3uiEXT_remap_index },
+   { 20126, SecondaryColor3uivEXT_remap_index },
+   { 22801, SecondaryColor3usEXT_remap_index },
+   { 11428, SecondaryColor3usvEXT_remap_index },
+   { 10404, SecondaryColorPointerEXT_remap_index },
+   { 22650, MultiDrawArraysEXT_remap_index },
+   { 18403, MultiDrawElementsEXT_remap_index },
+   { 18598, FogCoordPointerEXT_remap_index },
    {  4044, FogCoorddEXT_remap_index },
-   { 27682, FogCoorddvEXT_remap_index },
+   { 27842, FogCoorddvEXT_remap_index },
    {  4105, FogCoordfEXT_remap_index },
-   { 23796, FogCoordfvEXT_remap_index },
-   { 16663, PixelTexGenSGIX_remap_index },
-   { 24381, BlendFuncSeparateEXT_remap_index },
+   { 23956, FogCoordfvEXT_remap_index },
+   { 16721, PixelTexGenSGIX_remap_index },
+   { 24541, BlendFuncSeparateEXT_remap_index },
    {  5897, FlushVertexArrayRangeNV_remap_index },
    {  4629, VertexArrayRangeNV_remap_index },
-   { 24765, CombinerInputNV_remap_index },
+   { 24925, CombinerInputNV_remap_index },
    {  1946, CombinerOutputNV_remap_index },
-   { 27261, CombinerParameterfNV_remap_index },
+   { 27421, CombinerParameterfNV_remap_index },
    {  4549, CombinerParameterfvNV_remap_index },
-   { 19584, CombinerParameteriNV_remap_index },
-   { 28652, CombinerParameterivNV_remap_index },
+   { 19671, CombinerParameteriNV_remap_index },
+   { 28812, CombinerParameterivNV_remap_index },
    {  6267, FinalCombinerInputNV_remap_index },
-   {  8665, GetCombinerInputParameterfvNV_remap_index },
-   { 28489, GetCombinerInputParameterivNV_remap_index },
+   {  8694, GetCombinerInputParameterfvNV_remap_index },
+   { 28649, GetCombinerInputParameterivNV_remap_index },
    {  6066, GetCombinerOutputParameterfvNV_remap_index },
-   { 12024, GetCombinerOutputParameterivNV_remap_index },
+   { 12082, GetCombinerOutputParameterivNV_remap_index },
    {  5642, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 21769, GetFinalCombinerInputParameterivNV_remap_index },
-   { 11042, ResizeBuffersMESA_remap_index },
-   {  9753, WindowPos2dMESA_remap_index },
+   { 21882, GetFinalCombinerInputParameterivNV_remap_index },
+   { 11100, ResizeBuffersMESA_remap_index },
+   {  9811, WindowPos2dMESA_remap_index },
    {   944, WindowPos2dvMESA_remap_index },
-   { 29480, WindowPos2fMESA_remap_index },
+   { 29640, WindowPos2fMESA_remap_index },
    {  6934, WindowPos2fvMESA_remap_index },
-   { 15892, WindowPos2iMESA_remap_index },
-   { 17869, WindowPos2ivMESA_remap_index },
-   { 18444, WindowPos2sMESA_remap_index },
+   { 15950, WindowPos2iMESA_remap_index },
+   { 17927, WindowPos2ivMESA_remap_index },
+   { 18502, WindowPos2sMESA_remap_index },
    {  4885, WindowPos2svMESA_remap_index },
    {  6759, WindowPos3dMESA_remap_index },
-   { 12271, WindowPos3dvMESA_remap_index },
+   { 12329, WindowPos3dvMESA_remap_index },
    {   472, WindowPos3fMESA_remap_index },
-   { 13052, WindowPos3fvMESA_remap_index },
-   { 21064, WindowPos3iMESA_remap_index },
-   { 26610, WindowPos3ivMESA_remap_index },
-   { 16409, WindowPos3sMESA_remap_index },
-   { 27938, WindowPos3svMESA_remap_index },
-   {  9704, WindowPos4dMESA_remap_index },
-   { 14905, WindowPos4dvMESA_remap_index },
-   { 12230, WindowPos4fMESA_remap_index },
-   { 27015, WindowPos4fvMESA_remap_index },
-   { 26763, WindowPos4iMESA_remap_index },
-   { 10881, WindowPos4ivMESA_remap_index },
-   { 16542, WindowPos4sMESA_remap_index },
+   { 13110, WindowPos3fvMESA_remap_index },
+   { 21177, WindowPos3iMESA_remap_index },
+   { 26770, WindowPos3ivMESA_remap_index },
+   { 16467, WindowPos3sMESA_remap_index },
+   { 28098, WindowPos3svMESA_remap_index },
+   {  9762, WindowPos4dMESA_remap_index },
+   { 14963, WindowPos4dvMESA_remap_index },
+   { 12288, WindowPos4fMESA_remap_index },
+   { 27175, WindowPos4fvMESA_remap_index },
+   { 26923, WindowPos4iMESA_remap_index },
+   { 10939, WindowPos4ivMESA_remap_index },
+   { 16600, WindowPos4sMESA_remap_index },
    {  2857, WindowPos4svMESA_remap_index },
-   { 23539, MultiModeDrawArraysIBM_remap_index },
-   { 25483, MultiModeDrawElementsIBM_remap_index },
-   { 10692, DeleteFencesNV_remap_index },
-   { 24612, FinishFenceNV_remap_index },
+   { 23699, MultiModeDrawArraysIBM_remap_index },
+   { 25643, MultiModeDrawElementsIBM_remap_index },
+   { 10750, DeleteFencesNV_remap_index },
+   { 24772, FinishFenceNV_remap_index },
    {  3287, GenFencesNV_remap_index },
-   { 14885, GetFenceivNV_remap_index },
+   { 14943, GetFenceivNV_remap_index },
    {  7226, IsFenceNV_remap_index },
-   { 11951, SetFenceNV_remap_index },
+   { 12009, SetFenceNV_remap_index },
    {  3744, TestFenceNV_remap_index },
-   { 27909, AreProgramsResidentNV_remap_index },
-   { 27303, BindProgramNV_remap_index },
-   { 22771, DeleteProgramsNV_remap_index },
-   { 18873, ExecuteProgramNV_remap_index },
-   { 29373, GenProgramsNV_remap_index },
-   { 20472, GetProgramParameterdvNV_remap_index },
-   {  9240, GetProgramParameterfvNV_remap_index },
-   { 23101, GetProgramStringNV_remap_index },
-   { 21458, GetProgramivNV_remap_index },
-   { 20706, GetTrackMatrixivNV_remap_index },
-   { 22921, GetVertexAttribPointervNV_remap_index },
-   { 21702, GetVertexAttribdvNV_remap_index },
-   { 16382, GetVertexAttribfvNV_remap_index },
-   { 16073, GetVertexAttribivNV_remap_index },
-   { 16789, IsProgramNV_remap_index },
-   {  8246, LoadProgramNV_remap_index },
-   { 24477, ProgramParameters4dvNV_remap_index },
-   { 21388, ProgramParameters4fvNV_remap_index },
-   { 18173, RequestResidentProgramsNV_remap_index },
-   { 19562, TrackMatrixNV_remap_index },
-   { 28466, VertexAttrib1dNV_remap_index },
-   { 11892, VertexAttrib1dvNV_remap_index },
-   { 25015, VertexAttrib1fNV_remap_index },
+   { 28069, AreProgramsResidentNV_remap_index },
+   { 27463, BindProgramNV_remap_index },
+   { 22884, DeleteProgramsNV_remap_index },
+   { 18931, ExecuteProgramNV_remap_index },
+   { 29533, GenProgramsNV_remap_index },
+   { 20585, GetProgramParameterdvNV_remap_index },
+   {  9269, GetProgramParameterfvNV_remap_index },
+   { 23238, GetProgramStringNV_remap_index },
+   { 21571, GetProgramivNV_remap_index },
+   { 20819, GetTrackMatrixivNV_remap_index },
+   { 23034, GetVertexAttribPointervNV_remap_index },
+   { 21815, GetVertexAttribdvNV_remap_index },
+   { 16440, GetVertexAttribfvNV_remap_index },
+   { 16131, GetVertexAttribivNV_remap_index },
+   { 16847, IsProgramNV_remap_index },
+   {  8275, LoadProgramNV_remap_index },
+   { 24637, ProgramParameters4dvNV_remap_index },
+   { 21501, ProgramParameters4fvNV_remap_index },
+   { 18231, RequestResidentProgramsNV_remap_index },
+   { 19649, TrackMatrixNV_remap_index },
+   { 28626, VertexAttrib1dNV_remap_index },
+   { 11950, VertexAttrib1dvNV_remap_index },
+   { 25175, VertexAttrib1fNV_remap_index },
    {  2245, VertexAttrib1fvNV_remap_index },
-   { 27072, VertexAttrib1sNV_remap_index },
-   { 13125, VertexAttrib1svNV_remap_index },
+   { 27232, VertexAttrib1sNV_remap_index },
+   { 13183, VertexAttrib1svNV_remap_index },
    {  4220, VertexAttrib2dNV_remap_index },
-   { 11807, VertexAttrib2dvNV_remap_index },
-   { 17628, VertexAttrib2fNV_remap_index },
-   { 11418, VertexAttrib2fvNV_remap_index },
+   { 11865, VertexAttrib2dvNV_remap_index },
+   { 17686, VertexAttrib2fNV_remap_index },
+   { 11476, VertexAttrib2fvNV_remap_index },
    {  5045, VertexAttrib2sNV_remap_index },
-   { 16463, VertexAttrib2svNV_remap_index },
-   {  9901, VertexAttrib3dNV_remap_index },
-   { 28159, VertexAttrib3dvNV_remap_index },
-   {  9052, VertexAttrib3fNV_remap_index },
-   { 21729, VertexAttrib3fvNV_remap_index },
-   { 24990, VertexAttrib3sNV_remap_index },
-   { 20733, VertexAttrib3svNV_remap_index },
-   { 25457, VertexAttrib4dNV_remap_index },
-   { 29410, VertexAttrib4dvNV_remap_index },
+   { 16521, VertexAttrib2svNV_remap_index },
+   {  9959, VertexAttrib3dNV_remap_index },
+   { 28319, VertexAttrib3dvNV_remap_index },
+   {  9081, VertexAttrib3fNV_remap_index },
+   { 21842, VertexAttrib3fvNV_remap_index },
+   { 25150, VertexAttrib3sNV_remap_index },
+   { 20846, VertexAttrib3svNV_remap_index },
+   { 25617, VertexAttrib4dNV_remap_index },
+   { 29570, VertexAttrib4dvNV_remap_index },
    {  3945, VertexAttrib4fNV_remap_index },
-   {  8296, VertexAttrib4fvNV_remap_index },
-   { 23423, VertexAttrib4sNV_remap_index },
+   {  8325, VertexAttrib4fvNV_remap_index },
+   { 23583, VertexAttrib4sNV_remap_index },
    {  1293, VertexAttrib4svNV_remap_index },
    {  4378, VertexAttrib4ubNV_remap_index },
    {   734, VertexAttrib4ubvNV_remap_index },
-   { 19053, VertexAttribPointerNV_remap_index },
+   { 19111, VertexAttribPointerNV_remap_index },
    {  2097, VertexAttribs1dvNV_remap_index },
-   { 16487, VertexAttribs1fvNV_remap_index },
-   { 29210, VertexAttribs1svNV_remap_index },
-   {  9077, VertexAttribs2dvNV_remap_index },
-   { 22291, VertexAttribs2fvNV_remap_index },
-   { 15405, VertexAttribs2svNV_remap_index },
+   { 16545, VertexAttribs1fvNV_remap_index },
+   { 29370, VertexAttribs1svNV_remap_index },
+   {  9106, VertexAttribs2dvNV_remap_index },
+   { 22404, VertexAttribs2fvNV_remap_index },
+   { 15463, VertexAttribs2svNV_remap_index },
    {  4577, VertexAttribs3dvNV_remap_index },
    {  1977, VertexAttribs3fvNV_remap_index },
-   { 26358, VertexAttribs3svNV_remap_index },
-   { 23513, VertexAttribs4dvNV_remap_index },
+   { 26518, VertexAttribs3svNV_remap_index },
+   { 23673, VertexAttribs4dvNV_remap_index },
    {  4603, VertexAttribs4fvNV_remap_index },
-   { 28997, VertexAttribs4svNV_remap_index },
-   { 26106, VertexAttribs4ubvNV_remap_index },
-   { 23615, GetTexBumpParameterfvATI_remap_index },
-   { 29251, GetTexBumpParameterivATI_remap_index },
-   { 16127, TexBumpParameterfvATI_remap_index },
-   { 18044, TexBumpParameterivATI_remap_index },
-   { 13671, AlphaFragmentOp1ATI_remap_index },
-   {  9592, AlphaFragmentOp2ATI_remap_index },
-   { 21645, AlphaFragmentOp3ATI_remap_index },
-   { 26285, BeginFragmentShaderATI_remap_index },
-   { 27502, BindFragmentShaderATI_remap_index },
-   { 20862, ColorFragmentOp1ATI_remap_index },
+   { 29157, VertexAttribs4svNV_remap_index },
+   { 26266, VertexAttribs4ubvNV_remap_index },
+   { 23775, GetTexBumpParameterfvATI_remap_index },
+   { 29411, GetTexBumpParameterivATI_remap_index },
+   { 16185, TexBumpParameterfvATI_remap_index },
+   { 18102, TexBumpParameterivATI_remap_index },
+   { 13729, AlphaFragmentOp1ATI_remap_index },
+   {  9621, AlphaFragmentOp2ATI_remap_index },
+   { 21758, AlphaFragmentOp3ATI_remap_index },
+   { 26445, BeginFragmentShaderATI_remap_index },
+   { 27662, BindFragmentShaderATI_remap_index },
+   { 20975, ColorFragmentOp1ATI_remap_index },
    {  3823, ColorFragmentOp2ATI_remap_index },
-   { 27804, ColorFragmentOp3ATI_remap_index },
+   { 27964, ColorFragmentOp3ATI_remap_index },
    {  4722, DeleteFragmentShaderATI_remap_index },
-   { 29434, EndFragmentShaderATI_remap_index },
-   { 28680, GenFragmentShadersATI_remap_index },
-   { 22395, PassTexCoordATI_remap_index },
+   { 29594, EndFragmentShaderATI_remap_index },
+   { 28840, GenFragmentShadersATI_remap_index },
+   { 22508, PassTexCoordATI_remap_index },
    {  5965, SampleMapATI_remap_index },
    {  5738, SetFragmentShaderConstantATI_remap_index },
    {   319, PointParameteriNV_remap_index },
-   { 12432, PointParameterivNV_remap_index },
-   { 25296, ActiveStencilFaceEXT_remap_index },
-   { 24137, BindVertexArrayAPPLE_remap_index },
+   { 12490, PointParameterivNV_remap_index },
+   { 25456, ActiveStencilFaceEXT_remap_index },
+   { 24297, BindVertexArrayAPPLE_remap_index },
    {  2522, DeleteVertexArraysAPPLE_remap_index },
-   { 15744, GenVertexArraysAPPLE_remap_index },
-   { 20537, IsVertexArrayAPPLE_remap_index },
+   { 15802, GenVertexArraysAPPLE_remap_index },
+   { 20650, IsVertexArrayAPPLE_remap_index },
    {   775, GetProgramNamedParameterdvNV_remap_index },
    {  3128, GetProgramNamedParameterfvNV_remap_index },
-   { 23646, ProgramNamedParameter4dNV_remap_index },
-   { 12707, ProgramNamedParameter4dvNV_remap_index },
+   { 23806, ProgramNamedParameter4dNV_remap_index },
+   { 12765, ProgramNamedParameter4dvNV_remap_index },
    {  7862, ProgramNamedParameter4fNV_remap_index },
-   { 10311, ProgramNamedParameter4fvNV_remap_index },
-   { 21367, DepthBoundsEXT_remap_index },
+   { 10369, ProgramNamedParameter4fvNV_remap_index },
+   { 21480, DepthBoundsEXT_remap_index },
    {  1043, BlendEquationSeparateEXT_remap_index },
-   { 12826, BindFramebufferEXT_remap_index },
-   { 22582, BindRenderbufferEXT_remap_index },
-   {  8515, CheckFramebufferStatusEXT_remap_index },
-   { 19853, DeleteFramebuffersEXT_remap_index },
-   { 28061, DeleteRenderbuffersEXT_remap_index },
-   { 11831, FramebufferRenderbufferEXT_remap_index },
-   { 11968, FramebufferTexture1DEXT_remap_index },
-   { 10139, FramebufferTexture2DEXT_remap_index },
-   {  9806, FramebufferTexture3DEXT_remap_index },
-   { 20429, GenFramebuffersEXT_remap_index },
-   { 15291, GenRenderbuffersEXT_remap_index },
+   { 12884, BindFramebufferEXT_remap_index },
+   { 22695, BindRenderbufferEXT_remap_index },
+   {  8544, CheckFramebufferStatusEXT_remap_index },
+   { 19940, DeleteFramebuffersEXT_remap_index },
+   { 28221, DeleteRenderbuffersEXT_remap_index },
+   { 11889, FramebufferRenderbufferEXT_remap_index },
+   { 12026, FramebufferTexture1DEXT_remap_index },
+   { 10197, FramebufferTexture2DEXT_remap_index },
+   {  9864, FramebufferTexture3DEXT_remap_index },
+   { 20542, GenFramebuffersEXT_remap_index },
+   { 15349, GenRenderbuffersEXT_remap_index },
    {  5684, GenerateMipmapEXT_remap_index },
-   { 19084, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 28586, GetRenderbufferParameterivEXT_remap_index },
-   { 17924, IsFramebufferEXT_remap_index },
-   { 29333, IsRenderbufferEXT_remap_index },
+   { 19171, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 28746, GetRenderbufferParameterivEXT_remap_index },
+   { 17982, IsFramebufferEXT_remap_index },
+   { 29493, IsRenderbufferEXT_remap_index },
    {  7173, RenderbufferStorageEXT_remap_index },
    {   651, BlitFramebufferEXT_remap_index },
-   { 12526, BufferParameteriAPPLE_remap_index },
-   { 16821, FlushMappedBufferRangeAPPLE_remap_index },
+   { 12584, BufferParameteriAPPLE_remap_index },
+   { 16879, FlushMappedBufferRangeAPPLE_remap_index },
    {  2701, FramebufferTextureLayerEXT_remap_index },
-   { 26007, ProvokingVertexEXT_remap_index },
-   {  9461, GetTexParameterPointervAPPLE_remap_index },
+   {  8246, ColorMaskIndexedEXT_remap_index },
+   { 23122, DisableIndexedEXT_remap_index },
+   { 23430, EnableIndexedEXT_remap_index },
+   { 19142, GetBooleanIndexedvEXT_remap_index },
+   {  9654, GetIntegerIndexedvEXT_remap_index },
+   { 20016, IsEnabledIndexedEXT_remap_index },
+   { 26167, ProvokingVertexEXT_remap_index },
+   {  9490, GetTexParameterPointervAPPLE_remap_index },
    {  4405, TextureRangeAPPLE_remap_index },
-   { 25322, StencilFuncSeparateATI_remap_index },
-   { 15811, ProgramEnvParameters4fvEXT_remap_index },
-   { 15029, ProgramLocalParameters4fvEXT_remap_index },
-   { 12360, GetQueryObjecti64vEXT_remap_index },
-   {  9103, GetQueryObjectui64vEXT_remap_index },
+   { 25482, StencilFuncSeparateATI_remap_index },
+   { 15869, ProgramEnvParameters4fvEXT_remap_index },
+   { 15087, ProgramLocalParameters4fvEXT_remap_index },
+   { 12418, GetQueryObjecti64vEXT_remap_index },
+   {  9132, GetQueryObjectui64vEXT_remap_index },
    {    -1, -1 }
 };
 
@@ -4728,10 +4758,10 @@ static const struct gl_function_remap MESA_alt_functions[] = {
    /* from GL_EXT_blend_color */
    {  2440, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   {  9863, _gloffset_BlendEquation },
+   {  9921, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 14927, _gloffset_ColorSubTable },
-   { 27993, _gloffset_CopyColorSubTable },
+   { 14985, _gloffset_ColorSubTable },
+   { 28153, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
    {   213, _gloffset_ConvolutionFilter1D },
    {  2284, _gloffset_CopyConvolutionFilter1D },
@@ -4739,62 +4769,62 @@ static const struct gl_function_remap MESA_alt_functions[] = {
    {  7522, _gloffset_ConvolutionFilter2D },
    {  7688, _gloffset_ConvolutionParameteriv },
    {  8148, _gloffset_ConvolutionParameterfv },
-   { 18072, _gloffset_GetSeparableFilter },
-   { 21118, _gloffset_SeparableFilter2D },
-   { 21947, _gloffset_ConvolutionParameteri },
-   { 22070, _gloffset_ConvolutionParameterf },
-   { 23449, _gloffset_GetConvolutionParameterfv },
-   { 24303, _gloffset_GetConvolutionFilter },
-   { 26547, _gloffset_CopyConvolutionFilter2D },
+   { 18130, _gloffset_GetSeparableFilter },
+   { 21231, _gloffset_SeparableFilter2D },
+   { 22060, _gloffset_ConvolutionParameteri },
+   { 22183, _gloffset_ConvolutionParameterf },
+   { 23609, _gloffset_GetConvolutionParameterfv },
+   { 24463, _gloffset_GetConvolutionFilter },
+   { 26707, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 13185, _gloffset_CopyTexSubImage3D },
-   { 14667, _gloffset_CopyTexImage2D },
-   { 21555, _gloffset_CopyTexImage1D },
-   { 23984, _gloffset_CopyTexSubImage2D },
-   { 26185, _gloffset_CopyTexSubImage1D },
+   { 13243, _gloffset_CopyTexSubImage3D },
+   { 14725, _gloffset_CopyTexImage2D },
+   { 21668, _gloffset_CopyTexImage1D },
+   { 24144, _gloffset_CopyTexSubImage2D },
+   { 26345, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
-   {  8402, _gloffset_DrawRangeElements },
+   {  8431, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
    {   812, _gloffset_Histogram },
    {  3088, _gloffset_ResetHistogram },
-   {  8774, _gloffset_GetMinmax },
-   { 13519, _gloffset_GetHistogramParameterfv },
-   { 21480, _gloffset_GetMinmaxParameteriv },
-   { 23339, _gloffset_ResetMinmax },
-   { 24200, _gloffset_GetHistogramParameteriv },
-   { 25256, _gloffset_GetHistogram },
-   { 27618, _gloffset_Minmax },
-   { 29080, _gloffset_GetMinmaxParameterfv },
+   {  8803, _gloffset_GetMinmax },
+   { 13577, _gloffset_GetHistogramParameterfv },
+   { 21593, _gloffset_GetMinmaxParameteriv },
+   { 23499, _gloffset_ResetMinmax },
+   { 24360, _gloffset_GetHistogramParameteriv },
+   { 25416, _gloffset_GetHistogram },
+   { 27778, _gloffset_Minmax },
+   { 29240, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
    {  7384, _gloffset_ColorTable },
-   { 13365, _gloffset_GetColorTable },
-   { 20176, _gloffset_GetColorTableParameterfv },
-   { 22126, _gloffset_GetColorTableParameteriv },
+   { 13423, _gloffset_GetColorTable },
+   { 20289, _gloffset_GetColorTableParameterfv },
+   { 22239, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
    {  6105, _gloffset_TexSubImage1D },
-   {  9388, _gloffset_TexSubImage2D },
+   {  9417, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
    {  1658, _gloffset_TexImage3D },
-   { 19945, _gloffset_TexSubImage3D },
+   { 20058, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
    {  2964, _gloffset_PrioritizeTextures },
    {  6554, _gloffset_AreTexturesResident },
-   { 11916, _gloffset_GenTextures },
-   { 13851, _gloffset_DeleteTextures },
-   { 17102, _gloffset_IsTexture },
-   { 26250, _gloffset_BindTexture },
+   { 11974, _gloffset_GenTextures },
+   { 13909, _gloffset_DeleteTextures },
+   { 17160, _gloffset_IsTexture },
+   { 26410, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 21307, _gloffset_ArrayElement },
-   { 27206, _gloffset_GetPointerv },
-   { 28707, _gloffset_DrawArrays },
+   { 21420, _gloffset_ArrayElement },
+   { 27366, _gloffset_GetPointerv },
+   { 28867, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
    {  6672, _gloffset_ColorTableParameteriv },
    {  7384, _gloffset_ColorTable },
-   { 13365, _gloffset_GetColorTable },
-   { 13475, _gloffset_CopyColorTable },
-   { 16963, _gloffset_ColorTableParameterfv },
-   { 20176, _gloffset_GetColorTableParameterfv },
-   { 22126, _gloffset_GetColorTableParameteriv },
+   { 13423, _gloffset_GetColorTable },
+   { 13533, _gloffset_CopyColorTable },
+   { 17021, _gloffset_ColorTableParameterfv },
+   { 20289, _gloffset_GetColorTableParameterfv },
+   { 22239, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
    {   381, _gloffset_MultiTexCoord3sARB },
    {   613, _gloffset_ActiveTextureARB },
@@ -4803,33 +4833,33 @@ static const struct gl_function_remap MESA_alt_functions[] = {
    {  5285, _gloffset_MultiTexCoord2iARB },
    {  5409, _gloffset_MultiTexCoord2svARB },
    {  7340, _gloffset_MultiTexCoord2fARB },
-   {  9133, _gloffset_MultiTexCoord3fvARB },
-   {  9625, _gloffset_MultiTexCoord4sARB },
-   { 10225, _gloffset_MultiTexCoord2dvARB },
-   { 10607, _gloffset_MultiTexCoord1svARB },
-   { 10903, _gloffset_MultiTexCoord3svARB },
-   { 10964, _gloffset_MultiTexCoord4iARB },
-   { 11687, _gloffset_MultiTexCoord3iARB },
-   { 12389, _gloffset_MultiTexCoord1dARB },
-   { 12555, _gloffset_MultiTexCoord3dvARB },
-   { 13719, _gloffset_MultiTexCoord3ivARB },
-   { 13764, _gloffset_MultiTexCoord2sARB },
-   { 14984, _gloffset_MultiTexCoord4ivARB },
-   { 16613, _gloffset_ClientActiveTextureARB },
-   { 18829, _gloffset_MultiTexCoord2dARB },
-   { 19204, _gloffset_MultiTexCoord4dvARB },
-   { 19490, _gloffset_MultiTexCoord4fvARB },
-   { 20317, _gloffset_MultiTexCoord3fARB },
-   { 22627, _gloffset_MultiTexCoord4dARB },
-   { 22831, _gloffset_MultiTexCoord1sARB },
-   { 23009, _gloffset_MultiTexCoord1dvARB },
-   { 23828, _gloffset_MultiTexCoord1ivARB },
-   { 23921, _gloffset_MultiTexCoord2ivARB },
-   { 24260, _gloffset_MultiTexCoord1iARB },
-   { 25531, _gloffset_MultiTexCoord4svARB },
-   { 26049, _gloffset_MultiTexCoord1fARB },
-   { 26312, _gloffset_MultiTexCoord4fARB },
-   { 28541, _gloffset_MultiTexCoord2fvARB },
+   {  9162, _gloffset_MultiTexCoord3fvARB },
+   {  9683, _gloffset_MultiTexCoord4sARB },
+   { 10283, _gloffset_MultiTexCoord2dvARB },
+   { 10665, _gloffset_MultiTexCoord1svARB },
+   { 10961, _gloffset_MultiTexCoord3svARB },
+   { 11022, _gloffset_MultiTexCoord4iARB },
+   { 11745, _gloffset_MultiTexCoord3iARB },
+   { 12447, _gloffset_MultiTexCoord1dARB },
+   { 12613, _gloffset_MultiTexCoord3dvARB },
+   { 13777, _gloffset_MultiTexCoord3ivARB },
+   { 13822, _gloffset_MultiTexCoord2sARB },
+   { 15042, _gloffset_MultiTexCoord4ivARB },
+   { 16671, _gloffset_ClientActiveTextureARB },
+   { 18887, _gloffset_MultiTexCoord2dARB },
+   { 19291, _gloffset_MultiTexCoord4dvARB },
+   { 19577, _gloffset_MultiTexCoord4fvARB },
+   { 20430, _gloffset_MultiTexCoord3fARB },
+   { 22740, _gloffset_MultiTexCoord4dARB },
+   { 22944, _gloffset_MultiTexCoord1sARB },
+   { 23146, _gloffset_MultiTexCoord1dvARB },
+   { 23988, _gloffset_MultiTexCoord1ivARB },
+   { 24081, _gloffset_MultiTexCoord2ivARB },
+   { 24420, _gloffset_MultiTexCoord1iARB },
+   { 25691, _gloffset_MultiTexCoord4svARB },
+   { 26209, _gloffset_MultiTexCoord1fARB },
+   { 26472, _gloffset_MultiTexCoord4fARB },
+   { 28701, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 
@@ -4901,10 +4931,10 @@ static const struct gl_function_remap GL_ARB_map_buffer_range_functions[] = {
 #if defined(need_GL_ARB_matrix_palette)
 static const struct gl_function_remap GL_ARB_matrix_palette_functions[] = {
    {  3339, -1 }, /* MatrixIndexusvARB */
-   { 11508, -1 }, /* MatrixIndexuivARB */
-   { 12677, -1 }, /* MatrixIndexPointerARB */
-   { 17351, -1 }, /* CurrentPaletteMatrixARB */
-   { 20061, -1 }, /* MatrixIndexubvARB */
+   { 11566, -1 }, /* MatrixIndexuivARB */
+   { 12735, -1 }, /* MatrixIndexPointerARB */
+   { 17409, -1 }, /* CurrentPaletteMatrixARB */
+   { 20174, -1 }, /* MatrixIndexubvARB */
    {    -1, -1 }
 };
 #endif
@@ -4976,14 +5006,14 @@ static const struct gl_function_remap GL_ARB_vertex_array_object_functions[] = {
 static const struct gl_function_remap GL_ARB_vertex_blend_functions[] = {
    {  2226, -1 }, /* WeightubvARB */
    {  5572, -1 }, /* WeightivARB */
-   {  9728, -1 }, /* WeightPointerARB */
-   { 12146, -1 }, /* WeightfvARB */
-   { 15431, -1 }, /* WeightbvARB */
-   { 18497, -1 }, /* WeightusvARB */
-   { 21044, -1 }, /* VertexBlendARB */
-   { 26133, -1 }, /* WeightsvARB */
-   { 28043, -1 }, /* WeightdvARB */
-   { 28741, -1 }, /* WeightuivARB */
+   {  9786, -1 }, /* WeightPointerARB */
+   { 12204, -1 }, /* WeightfvARB */
+   { 15489, -1 }, /* WeightbvARB */
+   { 18555, -1 }, /* WeightusvARB */
+   { 21157, -1 }, /* VertexBlendARB */
+   { 26293, -1 }, /* WeightsvARB */
+   { 28203, -1 }, /* WeightdvARB */
+   { 28901, -1 }, /* WeightuivARB */
    {    -1, -1 }
 };
 #endif
@@ -5074,15 +5104,15 @@ static const struct gl_function_remap GL_EXT_blend_func_separate_functions[] = {
 
 #if defined(need_GL_EXT_blend_minmax)
 static const struct gl_function_remap GL_EXT_blend_minmax_functions[] = {
-   {  9863, _gloffset_BlendEquation },
+   {  9921, _gloffset_BlendEquation },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_color_subtable)
 static const struct gl_function_remap GL_EXT_color_subtable_functions[] = {
-   { 14927, _gloffset_ColorSubTable },
-   { 27993, _gloffset_CopyColorSubTable },
+   { 14985, _gloffset_ColorSubTable },
+   { 28153, _gloffset_CopyColorSubTable },
    {    -1, -1 }
 };
 #endif
@@ -5102,52 +5132,52 @@ static const struct gl_function_remap GL_EXT_convolution_functions[] = {
    {  7522, _gloffset_ConvolutionFilter2D },
    {  7688, _gloffset_ConvolutionParameteriv },
    {  8148, _gloffset_ConvolutionParameterfv },
-   { 18072, _gloffset_GetSeparableFilter },
-   { 21118, _gloffset_SeparableFilter2D },
-   { 21947, _gloffset_ConvolutionParameteri },
-   { 22070, _gloffset_ConvolutionParameterf },
-   { 23449, _gloffset_GetConvolutionParameterfv },
-   { 24303, _gloffset_GetConvolutionFilter },
-   { 26547, _gloffset_CopyConvolutionFilter2D },
+   { 18130, _gloffset_GetSeparableFilter },
+   { 21231, _gloffset_SeparableFilter2D },
+   { 22060, _gloffset_ConvolutionParameteri },
+   { 22183, _gloffset_ConvolutionParameterf },
+   { 23609, _gloffset_GetConvolutionParameterfv },
+   { 24463, _gloffset_GetConvolutionFilter },
+   { 26707, _gloffset_CopyConvolutionFilter2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_coordinate_frame)
 static const struct gl_function_remap GL_EXT_coordinate_frame_functions[] = {
-   {  9272, -1 }, /* TangentPointerEXT */
-   { 11022, -1 }, /* Binormal3ivEXT */
-   { 11640, -1 }, /* Tangent3sEXT */
-   { 12742, -1 }, /* Tangent3fvEXT */
-   { 16363, -1 }, /* Tangent3dvEXT */
-   { 17049, -1 }, /* Binormal3bvEXT */
-   { 18125, -1 }, /* Binormal3dEXT */
-   { 19993, -1 }, /* Tangent3fEXT */
-   { 22019, -1 }, /* Binormal3sEXT */
-   { 22437, -1 }, /* Tangent3ivEXT */
-   { 22456, -1 }, /* Tangent3dEXT */
-   { 23236, -1 }, /* Binormal3svEXT */
-   { 23726, -1 }, /* Binormal3fEXT */
-   { 24578, -1 }, /* Binormal3dvEXT */
-   { 25753, -1 }, /* Tangent3iEXT */
-   { 26832, -1 }, /* Tangent3bvEXT */
-   { 27241, -1 }, /* Tangent3bEXT */
-   { 27766, -1 }, /* Binormal3fvEXT */
-   { 28440, -1 }, /* BinormalPointerEXT */
-   { 28845, -1 }, /* Tangent3svEXT */
-   { 29282, -1 }, /* Binormal3bEXT */
-   { 29459, -1 }, /* Binormal3iEXT */
+   {  9301, -1 }, /* TangentPointerEXT */
+   { 11080, -1 }, /* Binormal3ivEXT */
+   { 11698, -1 }, /* Tangent3sEXT */
+   { 12800, -1 }, /* Tangent3fvEXT */
+   { 16421, -1 }, /* Tangent3dvEXT */
+   { 17107, -1 }, /* Binormal3bvEXT */
+   { 18183, -1 }, /* Binormal3dEXT */
+   { 20106, -1 }, /* Tangent3fEXT */
+   { 22132, -1 }, /* Binormal3sEXT */
+   { 22550, -1 }, /* Tangent3ivEXT */
+   { 22569, -1 }, /* Tangent3dEXT */
+   { 23373, -1 }, /* Binormal3svEXT */
+   { 23886, -1 }, /* Binormal3fEXT */
+   { 24738, -1 }, /* Binormal3dvEXT */
+   { 25913, -1 }, /* Tangent3iEXT */
+   { 26992, -1 }, /* Tangent3bvEXT */
+   { 27401, -1 }, /* Tangent3bEXT */
+   { 27926, -1 }, /* Binormal3fvEXT */
+   { 28600, -1 }, /* BinormalPointerEXT */
+   { 29005, -1 }, /* Tangent3svEXT */
+   { 29442, -1 }, /* Binormal3bEXT */
+   { 29619, -1 }, /* Binormal3iEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_copy_texture)
 static const struct gl_function_remap GL_EXT_copy_texture_functions[] = {
-   { 13185, _gloffset_CopyTexSubImage3D },
-   { 14667, _gloffset_CopyTexImage2D },
-   { 21555, _gloffset_CopyTexImage1D },
-   { 23984, _gloffset_CopyTexSubImage2D },
-   { 26185, _gloffset_CopyTexSubImage1D },
+   { 13243, _gloffset_CopyTexSubImage3D },
+   { 14725, _gloffset_CopyTexImage2D },
+   { 21668, _gloffset_CopyTexImage1D },
+   { 24144, _gloffset_CopyTexSubImage2D },
+   { 26345, _gloffset_CopyTexSubImage1D },
    {    -1, -1 }
 };
 #endif
@@ -5166,9 +5196,16 @@ static const struct gl_function_remap GL_EXT_depth_bounds_test_functions[] = {
 };
 #endif
 
+#if defined(need_GL_EXT_draw_buffers2)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_EXT_draw_buffers2_functions[] = {
+   {    -1, -1 }
+};
+#endif
+
 #if defined(need_GL_EXT_draw_range_elements)
 static const struct gl_function_remap GL_EXT_draw_range_elements_functions[] = {
-   {  8402, _gloffset_DrawRangeElements },
+   {  8431, _gloffset_DrawRangeElements },
    {    -1, -1 }
 };
 #endif
@@ -5212,37 +5249,37 @@ static const struct gl_function_remap GL_EXT_gpu_program_parameters_functions[]
 static const struct gl_function_remap GL_EXT_histogram_functions[] = {
    {   812, _gloffset_Histogram },
    {  3088, _gloffset_ResetHistogram },
-   {  8774, _gloffset_GetMinmax },
-   { 13519, _gloffset_GetHistogramParameterfv },
-   { 21480, _gloffset_GetMinmaxParameteriv },
-   { 23339, _gloffset_ResetMinmax },
-   { 24200, _gloffset_GetHistogramParameteriv },
-   { 25256, _gloffset_GetHistogram },
-   { 27618, _gloffset_Minmax },
-   { 29080, _gloffset_GetMinmaxParameterfv },
+   {  8803, _gloffset_GetMinmax },
+   { 13577, _gloffset_GetHistogramParameterfv },
+   { 21593, _gloffset_GetMinmaxParameteriv },
+   { 23499, _gloffset_ResetMinmax },
+   { 24360, _gloffset_GetHistogramParameteriv },
+   { 25416, _gloffset_GetHistogram },
+   { 27778, _gloffset_Minmax },
+   { 29240, _gloffset_GetMinmaxParameterfv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_func)
 static const struct gl_function_remap GL_EXT_index_func_functions[] = {
-   { 10090, -1 }, /* IndexFuncEXT */
+   { 10148, -1 }, /* IndexFuncEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_material)
 static const struct gl_function_remap GL_EXT_index_material_functions[] = {
-   { 18584, -1 }, /* IndexMaterialEXT */
+   { 18642, -1 }, /* IndexMaterialEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_light_texture)
 static const struct gl_function_remap GL_EXT_light_texture_functions[] = {
-   { 23256, -1 }, /* ApplyTextureEXT */
-   { 23293, -1 }, /* TextureMaterialEXT */
-   { 23318, -1 }, /* TextureLightEXT */
+   { 23393, -1 }, /* ApplyTextureEXT */
+   { 23453, -1 }, /* TextureMaterialEXT */
+   { 23478, -1 }, /* TextureLightEXT */
    {    -1, -1 }
 };
 #endif
@@ -5264,19 +5301,19 @@ static const struct gl_function_remap GL_EXT_multisample_functions[] = {
 #if defined(need_GL_EXT_paletted_texture)
 static const struct gl_function_remap GL_EXT_paletted_texture_functions[] = {
    {  7384, _gloffset_ColorTable },
-   { 13365, _gloffset_GetColorTable },
-   { 20176, _gloffset_GetColorTableParameterfv },
-   { 22126, _gloffset_GetColorTableParameteriv },
+   { 13423, _gloffset_GetColorTable },
+   { 20289, _gloffset_GetColorTableParameterfv },
+   { 22239, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_pixel_transform)
 static const struct gl_function_remap GL_EXT_pixel_transform_functions[] = {
-   {  9513, -1 }, /* PixelTransformParameterfvEXT */
-   { 19169, -1 }, /* PixelTransformParameterfEXT */
-   { 19249, -1 }, /* PixelTransformParameteriEXT */
-   { 28404, -1 }, /* PixelTransformParameterivEXT */
+   {  9542, -1 }, /* PixelTransformParameterfvEXT */
+   { 19256, -1 }, /* PixelTransformParameterfEXT */
+   { 19336, -1 }, /* PixelTransformParameteriEXT */
+   { 28564, -1 }, /* PixelTransformParameterivEXT */
    {    -1, -1 }
 };
 #endif
@@ -5319,7 +5356,7 @@ static const struct gl_function_remap GL_EXT_stencil_two_side_functions[] = {
 #if defined(need_GL_EXT_subtexture)
 static const struct gl_function_remap GL_EXT_subtexture_functions[] = {
    {  6105, _gloffset_TexSubImage1D },
-   {  9388, _gloffset_TexSubImage2D },
+   {  9417, _gloffset_TexSubImage2D },
    {    -1, -1 }
 };
 #endif
@@ -5327,7 +5364,7 @@ static const struct gl_function_remap GL_EXT_subtexture_functions[] = {
 #if defined(need_GL_EXT_texture3D)
 static const struct gl_function_remap GL_EXT_texture3D_functions[] = {
    {  1658, _gloffset_TexImage3D },
-   { 19945, _gloffset_TexSubImage3D },
+   { 20058, _gloffset_TexSubImage3D },
    {    -1, -1 }
 };
 #endif
@@ -5343,17 +5380,17 @@ static const struct gl_function_remap GL_EXT_texture_array_functions[] = {
 static const struct gl_function_remap GL_EXT_texture_object_functions[] = {
    {  2964, _gloffset_PrioritizeTextures },
    {  6554, _gloffset_AreTexturesResident },
-   { 11916, _gloffset_GenTextures },
-   { 13851, _gloffset_DeleteTextures },
-   { 17102, _gloffset_IsTexture },
-   { 26250, _gloffset_BindTexture },
+   { 11974, _gloffset_GenTextures },
+   { 13909, _gloffset_DeleteTextures },
+   { 17160, _gloffset_IsTexture },
+   { 26410, _gloffset_BindTexture },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_texture_perturb_normal)
 static const struct gl_function_remap GL_EXT_texture_perturb_normal_functions[] = {
-   { 12096, -1 }, /* TextureNormalEXT */
+   { 12154, -1 }, /* TextureNormalEXT */
    {    -1, -1 }
 };
 #endif
@@ -5368,18 +5405,18 @@ static const struct gl_function_remap GL_EXT_timer_query_functions[] = {
 #if defined(need_GL_EXT_vertex_array)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_EXT_vertex_array_functions[] = {
-   { 21307, _gloffset_ArrayElement },
-   { 27206, _gloffset_GetPointerv },
-   { 28707, _gloffset_DrawArrays },
+   { 21420, _gloffset_ArrayElement },
+   { 27366, _gloffset_GetPointerv },
+   { 28867, _gloffset_DrawArrays },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_vertex_weighting)
 static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
-   { 17132, -1 }, /* VertexWeightfvEXT */
-   { 23704, -1 }, /* VertexWeightfEXT */
-   { 25225, -1 }, /* VertexWeightPointerEXT */
+   { 17190, -1 }, /* VertexWeightfvEXT */
+   { 23864, -1 }, /* VertexWeightfEXT */
+   { 25385, -1 }, /* VertexWeightPointerEXT */
    {    -1, -1 }
 };
 #endif
@@ -5388,10 +5425,10 @@ static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
 static const struct gl_function_remap GL_HP_image_transform_functions[] = {
    {  2157, -1 }, /* GetImageTransformParameterfvHP */
    {  3305, -1 }, /* ImageTransformParameterfHP */
-   {  8966, -1 }, /* ImageTransformParameterfvHP */
-   { 10525, -1 }, /* ImageTransformParameteriHP */
-   { 10793, -1 }, /* GetImageTransformParameterivHP */
-   { 17196, -1 }, /* ImageTransformParameterivHP */
+   {  8995, -1 }, /* ImageTransformParameterfvHP */
+   { 10583, -1 }, /* ImageTransformParameteriHP */
+   { 10851, -1 }, /* GetImageTransformParameterivHP */
+   { 17254, -1 }, /* ImageTransformParameterivHP */
    {    -1, -1 }
 };
 #endif
@@ -5409,10 +5446,10 @@ static const struct gl_function_remap GL_IBM_vertex_array_lists_functions[] = {
    {  5106, -1 }, /* NormalPointerListIBM */
    {  6728, -1 }, /* FogCoordPointerListIBM */
    {  7035, -1 }, /* VertexPointerListIBM */
-   { 10446, -1 }, /* ColorPointerListIBM */
-   { 11747, -1 }, /* TexCoordPointerListIBM */
-   { 12118, -1 }, /* IndexPointerListIBM */
-   { 29023, -1 }, /* EdgeFlagPointerListIBM */
+   { 10504, -1 }, /* ColorPointerListIBM */
+   { 11805, -1 }, /* TexCoordPointerListIBM */
+   { 12176, -1 }, /* IndexPointerListIBM */
+   { 29183, -1 }, /* EdgeFlagPointerListIBM */
    {    -1, -1 }
 };
 #endif
@@ -5426,10 +5463,10 @@ static const struct gl_function_remap GL_INGR_blend_func_separate_functions[] =
 
 #if defined(need_GL_INTEL_parallel_arrays)
 static const struct gl_function_remap GL_INTEL_parallel_arrays_functions[] = {
-   { 11134, -1 }, /* VertexPointervINTEL */
-   { 13612, -1 }, /* ColorPointervINTEL */
-   { 26521, -1 }, /* NormalPointervINTEL */
-   { 26947, -1 }, /* TexCoordPointervINTEL */
+   { 11192, -1 }, /* VertexPointervINTEL */
+   { 13670, -1 }, /* ColorPointervINTEL */
+   { 26681, -1 }, /* NormalPointervINTEL */
+   { 27107, -1 }, /* TexCoordPointervINTEL */
    {    -1, -1 }
 };
 #endif
@@ -5446,7 +5483,7 @@ static const struct gl_function_remap GL_MESA_shader_debug_functions[] = {
    {  1522, -1 }, /* GetDebugLogLengthMESA */
    {  3063, -1 }, /* ClearDebugLogMESA */
    {  4018, -1 }, /* GetDebugLogMESA */
-   { 27399, -1 }, /* CreateDebugObjectMESA */
+   { 27559, -1 }, /* CreateDebugObjectMESA */
    {    -1, -1 }
 };
 #endif
@@ -5463,12 +5500,12 @@ static const struct gl_function_remap GL_NV_evaluators_functions[] = {
    {  5773, -1 }, /* GetMapAttribParameterivNV */
    {  7490, -1 }, /* MapControlPointsNV */
    {  7589, -1 }, /* MapParameterfvNV */
-   {  9371, -1 }, /* EvalMapsNV */
-   { 15101, -1 }, /* GetMapAttribParameterfvNV */
-   { 15267, -1 }, /* MapParameterivNV */
-   { 21870, -1 }, /* GetMapParameterivNV */
-   { 22368, -1 }, /* GetMapParameterfvNV */
-   { 25857, -1 }, /* GetMapControlPointsNV */
+   {  9400, -1 }, /* EvalMapsNV */
+   { 15159, -1 }, /* GetMapAttribParameterfvNV */
+   { 15325, -1 }, /* MapParameterivNV */
+   { 21983, -1 }, /* GetMapParameterivNV */
+   { 22481, -1 }, /* GetMapParameterfvNV */
+   { 26017, -1 }, /* GetMapControlPointsNV */
    {    -1, -1 }
 };
 #endif
@@ -5503,8 +5540,8 @@ static const struct gl_function_remap GL_NV_register_combiners_functions[] = {
 
 #if defined(need_GL_NV_register_combiners2)
 static const struct gl_function_remap GL_NV_register_combiners2_functions[] = {
-   { 14004, -1 }, /* CombinerStageParameterfvNV */
-   { 14319, -1 }, /* GetCombinerStageParameterfvNV */
+   { 14062, -1 }, /* CombinerStageParameterfvNV */
+   { 14377, -1 }, /* GetCombinerStageParameterfvNV */
    {    -1, -1 }
 };
 #endif
@@ -5532,16 +5569,16 @@ static const struct gl_function_remap GL_PGI_misc_hints_functions[] = {
 
 #if defined(need_GL_SGIS_detail_texture)
 static const struct gl_function_remap GL_SGIS_detail_texture_functions[] = {
-   { 14292, -1 }, /* GetDetailTexFuncSGIS */
-   { 14612, -1 }, /* DetailTexFuncSGIS */
+   { 14350, -1 }, /* GetDetailTexFuncSGIS */
+   { 14670, -1 }, /* DetailTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_fog_function)
 static const struct gl_function_remap GL_SGIS_fog_function_functions[] = {
-   { 23966, -1 }, /* FogFuncSGIS */
-   { 24631, -1 }, /* GetFogFuncSGIS */
+   { 24126, -1 }, /* FogFuncSGIS */
+   { 24791, -1 }, /* GetFogFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5570,7 +5607,7 @@ static const struct gl_function_remap GL_SGIS_point_parameters_functions[] = {
 #if defined(need_GL_SGIS_sharpen_texture)
 static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
    {  5834, -1 }, /* GetSharpenTexFuncSGIS */
-   { 19464, -1 }, /* SharpenTexFuncSGIS */
+   { 19551, -1 }, /* SharpenTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5578,14 +5615,14 @@ static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
 #if defined(need_GL_SGIS_texture4D)
 static const struct gl_function_remap GL_SGIS_texture4D_functions[] = {
    {   894, -1 }, /* TexImage4DSGIS */
-   { 13920, -1 }, /* TexSubImage4DSGIS */
+   { 13978, -1 }, /* TexSubImage4DSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_color_mask)
 static const struct gl_function_remap GL_SGIS_texture_color_mask_functions[] = {
-   { 13318, -1 }, /* TextureColorMaskSGIS */
+   { 13376, -1 }, /* TextureColorMaskSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5593,7 +5630,7 @@ static const struct gl_function_remap GL_SGIS_texture_color_mask_functions[] = {
 #if defined(need_GL_SGIS_texture_filter4)
 static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {
    {  6011, -1 }, /* GetTexFilterFuncSGIS */
-   { 14438, -1 }, /* TexFilterFuncSGIS */
+   { 14496, -1 }, /* TexFilterFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5603,9 +5640,9 @@ static const struct gl_function_remap GL_SGIX_async_functions[] = {
    {  3014, -1 }, /* AsyncMarkerSGIX */
    {  3997, -1 }, /* FinishAsyncSGIX */
    {  4703, -1 }, /* PollAsyncSGIX */
-   { 19611, -1 }, /* DeleteAsyncMarkersSGIX */
-   { 19640, -1 }, /* IsAsyncMarkerSGIX */
-   { 28820, -1 }, /* GenAsyncMarkersSGIX */
+   { 19698, -1 }, /* DeleteAsyncMarkersSGIX */
+   { 19727, -1 }, /* IsAsyncMarkerSGIX */
+   { 28980, -1 }, /* GenAsyncMarkersSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5626,31 +5663,31 @@ static const struct gl_function_remap GL_SGIX_fragment_lighting_functions[] = {
    {  7102, -1 }, /* FragmentMaterialfSGIX */
    {  7263, -1 }, /* GetFragmentLightivSGIX */
    {  8100, -1 }, /* FragmentLightModeliSGIX */
-   {  9434, -1 }, /* FragmentLightivSGIX */
-   {  9671, -1 }, /* GetFragmentMaterialivSGIX */
-   { 17019, -1 }, /* FragmentLightModelfSGIX */
-   { 17319, -1 }, /* FragmentColorMaterialSGIX */
-   { 17691, -1 }, /* FragmentMaterialiSGIX */
-   { 18912, -1 }, /* LightEnviSGIX */
-   { 20268, -1 }, /* FragmentLightModelfvSGIX */
-   { 20577, -1 }, /* FragmentLightfvSGIX */
-   { 25107, -1 }, /* FragmentLightfSGIX */
-   { 27736, -1 }, /* GetFragmentLightfvSGIX */
-   { 29303, -1 }, /* FragmentMaterialivSGIX */
+   {  9463, -1 }, /* FragmentLightivSGIX */
+   {  9729, -1 }, /* GetFragmentMaterialivSGIX */
+   { 17077, -1 }, /* FragmentLightModelfSGIX */
+   { 17377, -1 }, /* FragmentColorMaterialSGIX */
+   { 17749, -1 }, /* FragmentMaterialiSGIX */
+   { 18970, -1 }, /* LightEnviSGIX */
+   { 20381, -1 }, /* FragmentLightModelfvSGIX */
+   { 20690, -1 }, /* FragmentLightfvSGIX */
+   { 25267, -1 }, /* FragmentLightfSGIX */
+   { 27896, -1 }, /* GetFragmentLightfvSGIX */
+   { 29463, -1 }, /* FragmentMaterialivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_framezoom)
 static const struct gl_function_remap GL_SGIX_framezoom_functions[] = {
-   { 19663, -1 }, /* FrameZoomSGIX */
+   { 19750, -1 }, /* FrameZoomSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_igloo_interface)
 static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
-   { 25415, -1 }, /* IglooInterfaceSGIX */
+   { 25575, -1 }, /* IglooInterfaceSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5659,10 +5696,10 @@ static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
 static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
    {  2573, -1 }, /* ReadInstrumentsSGIX */
    {  5590, -1 }, /* PollInstrumentsSGIX */
-   {  9332, -1 }, /* GetInstrumentsSGIX */
-   { 11345, -1 }, /* StartInstrumentsSGIX */
-   { 14038, -1 }, /* StopInstrumentsSGIX */
-   { 15644, -1 }, /* InstrumentsBufferSGIX */
+   {  9361, -1 }, /* GetInstrumentsSGIX */
+   { 11403, -1 }, /* StartInstrumentsSGIX */
+   { 14096, -1 }, /* StopInstrumentsSGIX */
+   { 15702, -1 }, /* InstrumentsBufferSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5671,10 +5708,10 @@ static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
 static const struct gl_function_remap GL_SGIX_list_priority_functions[] = {
    {  1125, -1 }, /* ListParameterfSGIX */
    {  2763, -1 }, /* GetListParameterfvSGIX */
-   { 15559, -1 }, /* ListParameteriSGIX */
-   { 16313, -1 }, /* ListParameterfvSGIX */
-   { 18318, -1 }, /* ListParameterivSGIX */
-   { 28864, -1 }, /* GetListParameterivSGIX */
+   { 15617, -1 }, /* ListParameteriSGIX */
+   { 16371, -1 }, /* ListParameterfvSGIX */
+   { 18376, -1 }, /* ListParameterivSGIX */
+   { 29024, -1 }, /* GetListParameterivSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5689,33 +5726,33 @@ static const struct gl_function_remap GL_SGIX_pixel_texture_functions[] = {
 #if defined(need_GL_SGIX_polynomial_ffd)
 static const struct gl_function_remap GL_SGIX_polynomial_ffd_functions[] = {
    {  3251, -1 }, /* LoadIdentityDeformationMapSGIX */
-   { 10713, -1 }, /* DeformationMap3dSGIX */
-   { 14138, -1 }, /* DeformSGIX */
-   { 21419, -1 }, /* DeformationMap3fSGIX */
+   { 10771, -1 }, /* DeformationMap3dSGIX */
+   { 14196, -1 }, /* DeformSGIX */
+   { 21532, -1 }, /* DeformationMap3fSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_reference_plane)
 static const struct gl_function_remap GL_SGIX_reference_plane_functions[] = {
-   { 12869, -1 }, /* ReferencePlaneSGIX */
+   { 12927, -1 }, /* ReferencePlaneSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_sprite)
 static const struct gl_function_remap GL_SGIX_sprite_functions[] = {
-   {  8487, -1 }, /* SpriteParameterfvSGIX */
-   { 18146, -1 }, /* SpriteParameteriSGIX */
-   { 23373, -1 }, /* SpriteParameterfSGIX */
-   { 25979, -1 }, /* SpriteParameterivSGIX */
+   {  8516, -1 }, /* SpriteParameterfvSGIX */
+   { 18204, -1 }, /* SpriteParameteriSGIX */
+   { 23533, -1 }, /* SpriteParameterfSGIX */
+   { 26139, -1 }, /* SpriteParameterivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_tag_sample_buffer)
 static const struct gl_function_remap GL_SGIX_tag_sample_buffer_functions[] = {
-   { 18205, -1 }, /* TagSampleBufferSGIX */
+   { 18263, -1 }, /* TagSampleBufferSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5724,18 +5761,18 @@ static const struct gl_function_remap GL_SGIX_tag_sample_buffer_functions[] = {
 static const struct gl_function_remap GL_SGI_color_table_functions[] = {
    {  6672, _gloffset_ColorTableParameteriv },
    {  7384, _gloffset_ColorTable },
-   { 13365, _gloffset_GetColorTable },
-   { 13475, _gloffset_CopyColorTable },
-   { 16963, _gloffset_ColorTableParameterfv },
-   { 20176, _gloffset_GetColorTableParameterfv },
-   { 22126, _gloffset_GetColorTableParameteriv },
+   { 13423, _gloffset_GetColorTable },
+   { 13533, _gloffset_CopyColorTable },
+   { 17021, _gloffset_ColorTableParameterfv },
+   { 20289, _gloffset_GetColorTableParameterfv },
+   { 22239, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUNX_constant_data)
 static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
-   { 27714, -1 }, /* FinishTextureSUNX */
+   { 27874, -1 }, /* FinishTextureSUNX */
    {    -1, -1 }
 };
 #endif
@@ -5745,18 +5782,18 @@ static const struct gl_function_remap GL_SUN_global_alpha_functions[] = {
    {  3035, -1 }, /* GlobalAlphaFactorubSUN */
    {  4193, -1 }, /* GlobalAlphaFactoriSUN */
    {  5615, -1 }, /* GlobalAlphaFactordSUN */
-   {  8571, -1 }, /* GlobalAlphaFactoruiSUN */
-   {  8923, -1 }, /* GlobalAlphaFactorbSUN */
-   { 11660, -1 }, /* GlobalAlphaFactorfSUN */
-   { 11779, -1 }, /* GlobalAlphaFactorusSUN */
-   { 19902, -1 }, /* GlobalAlphaFactorsSUN */
+   {  8600, -1 }, /* GlobalAlphaFactoruiSUN */
+   {  8952, -1 }, /* GlobalAlphaFactorbSUN */
+   { 11718, -1 }, /* GlobalAlphaFactorfSUN */
+   { 11837, -1 }, /* GlobalAlphaFactorusSUN */
+   { 19989, -1 }, /* GlobalAlphaFactorsSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_mesh_array)
 static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
-   { 25791, -1 }, /* DrawMeshArraysSUN */
+   { 25951, -1 }, /* DrawMeshArraysSUN */
    {    -1, -1 }
 };
 #endif
@@ -5765,11 +5802,11 @@ static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
 static const struct gl_function_remap GL_SUN_triangle_list_functions[] = {
    {  3971, -1 }, /* ReplacementCodeubSUN */
    {  5454, -1 }, /* ReplacementCodeubvSUN */
-   { 16684, -1 }, /* ReplacementCodeusvSUN */
-   { 16872, -1 }, /* ReplacementCodePointerSUN */
-   { 18229, -1 }, /* ReplacementCodeusSUN */
-   { 18976, -1 }, /* ReplacementCodeuiSUN */
-   { 26436, -1 }, /* ReplacementCodeuivSUN */
+   { 16742, -1 }, /* ReplacementCodeusvSUN */
+   { 16930, -1 }, /* ReplacementCodePointerSUN */
+   { 18287, -1 }, /* ReplacementCodeusSUN */
+   { 19034, -1 }, /* ReplacementCodeuiSUN */
+   { 26596, -1 }, /* ReplacementCodeuivSUN */
    {    -1, -1 }
 };
 #endif
@@ -5791,31 +5828,31 @@ static const struct gl_function_remap GL_SUN_vertex_functions[] = {
    {  6419, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
    {  7131, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
    {  7899, -1 }, /* Color3fVertex3fSUN */
-   {  8882, -1 }, /* Color3fVertex3fvSUN */
-   {  9297, -1 }, /* Color4fNormal3fVertex3fvSUN */
-   {  9969, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 11208, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
-   { 12600, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
-   { 13011, -1 }, /* TexCoord2fColor3fVertex3fSUN */
-   { 14063, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
-   { 14397, -1 }, /* Color4ubVertex2fvSUN */
-   { 14637, -1 }, /* Normal3fVertex3fSUN */
-   { 15585, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
-   { 15846, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 16513, -1 }, /* TexCoord2fVertex3fvSUN */
-   { 17289, -1 }, /* Color4ubVertex2fSUN */
-   { 17482, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
-   { 19335, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
-   { 19682, -1 }, /* Normal3fVertex3fvSUN */
-   { 20085, -1 }, /* Color4fNormal3fVertex3fSUN */
-   { 20951, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
-   { 21171, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
-   { 22874, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
-   { 24082, -1 }, /* TexCoord4fVertex4fSUN */
-   { 24508, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
-   { 24834, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
-   { 24961, -1 }, /* TexCoord4fVertex4fvSUN */
-   { 25663, -1 }, /* ReplacementCodeuiVertex3fSUN */
+   {  8911, -1 }, /* Color3fVertex3fvSUN */
+   {  9326, -1 }, /* Color4fNormal3fVertex3fvSUN */
+   { 10027, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 11266, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
+   { 12658, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
+   { 13069, -1 }, /* TexCoord2fColor3fVertex3fSUN */
+   { 14121, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
+   { 14455, -1 }, /* Color4ubVertex2fvSUN */
+   { 14695, -1 }, /* Normal3fVertex3fSUN */
+   { 15643, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
+   { 15904, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 16571, -1 }, /* TexCoord2fVertex3fvSUN */
+   { 17347, -1 }, /* Color4ubVertex2fSUN */
+   { 17540, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
+   { 19422, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
+   { 19769, -1 }, /* Normal3fVertex3fvSUN */
+   { 20198, -1 }, /* Color4fNormal3fVertex3fSUN */
+   { 21064, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
+   { 21284, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
+   { 22987, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
+   { 24242, -1 }, /* TexCoord4fVertex4fSUN */
+   { 24668, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
+   { 24994, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
+   { 25121, -1 }, /* TexCoord4fVertex4fvSUN */
+   { 25823, -1 }, /* ReplacementCodeuiVertex3fSUN */
    {    -1, -1 }
 };
 #endif
@@ -5830,33 +5867,33 @@ static const struct gl_function_remap GL_VERSION_1_3_functions[] = {
    {  5285, _gloffset_MultiTexCoord2iARB },
    {  5409, _gloffset_MultiTexCoord2svARB },
    {  7340, _gloffset_MultiTexCoord2fARB },
-   {  9133, _gloffset_MultiTexCoord3fvARB },
-   {  9625, _gloffset_MultiTexCoord4sARB },
-   { 10225, _gloffset_MultiTexCoord2dvARB },
-   { 10607, _gloffset_MultiTexCoord1svARB },
-   { 10903, _gloffset_MultiTexCoord3svARB },
-   { 10964, _gloffset_MultiTexCoord4iARB },
-   { 11687, _gloffset_MultiTexCoord3iARB },
-   { 12389, _gloffset_MultiTexCoord1dARB },
-   { 12555, _gloffset_MultiTexCoord3dvARB },
-   { 13719, _gloffset_MultiTexCoord3ivARB },
-   { 13764, _gloffset_MultiTexCoord2sARB },
-   { 14984, _gloffset_MultiTexCoord4ivARB },
-   { 16613, _gloffset_ClientActiveTextureARB },
-   { 18829, _gloffset_MultiTexCoord2dARB },
-   { 19204, _gloffset_MultiTexCoord4dvARB },
-   { 19490, _gloffset_MultiTexCoord4fvARB },
-   { 20317, _gloffset_MultiTexCoord3fARB },
-   { 22627, _gloffset_MultiTexCoord4dARB },
-   { 22831, _gloffset_MultiTexCoord1sARB },
-   { 23009, _gloffset_MultiTexCoord1dvARB },
-   { 23828, _gloffset_MultiTexCoord1ivARB },
-   { 23921, _gloffset_MultiTexCoord2ivARB },
-   { 24260, _gloffset_MultiTexCoord1iARB },
-   { 25531, _gloffset_MultiTexCoord4svARB },
-   { 26049, _gloffset_MultiTexCoord1fARB },
-   { 26312, _gloffset_MultiTexCoord4fARB },
-   { 28541, _gloffset_MultiTexCoord2fvARB },
+   {  9162, _gloffset_MultiTexCoord3fvARB },
+   {  9683, _gloffset_MultiTexCoord4sARB },
+   { 10283, _gloffset_MultiTexCoord2dvARB },
+   { 10665, _gloffset_MultiTexCoord1svARB },
+   { 10961, _gloffset_MultiTexCoord3svARB },
+   { 11022, _gloffset_MultiTexCoord4iARB },
+   { 11745, _gloffset_MultiTexCoord3iARB },
+   { 12447, _gloffset_MultiTexCoord1dARB },
+   { 12613, _gloffset_MultiTexCoord3dvARB },
+   { 13777, _gloffset_MultiTexCoord3ivARB },
+   { 13822, _gloffset_MultiTexCoord2sARB },
+   { 15042, _gloffset_MultiTexCoord4ivARB },
+   { 16671, _gloffset_ClientActiveTextureARB },
+   { 18887, _gloffset_MultiTexCoord2dARB },
+   { 19291, _gloffset_MultiTexCoord4dvARB },
+   { 19577, _gloffset_MultiTexCoord4fvARB },
+   { 20430, _gloffset_MultiTexCoord3fARB },
+   { 22740, _gloffset_MultiTexCoord4dARB },
+   { 22944, _gloffset_MultiTexCoord1sARB },
+   { 23146, _gloffset_MultiTexCoord1dvARB },
+   { 23988, _gloffset_MultiTexCoord1ivARB },
+   { 24081, _gloffset_MultiTexCoord2ivARB },
+   { 24420, _gloffset_MultiTexCoord1iARB },
+   { 25691, _gloffset_MultiTexCoord4svARB },
+   { 26209, _gloffset_MultiTexCoord1fARB },
+   { 26472, _gloffset_MultiTexCoord4fARB },
+   { 28701, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 #endif
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 731ff2b823f..65e3b2025ad 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -1014,21 +1014,27 @@ gl_dispatch_functions_start:
 	GL_STUB(gl_dispatch_stub_785, _gloffset_FlushMappedBufferRangeAPPLE)
 	HIDDEN(gl_dispatch_stub_785)
 	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
+	GL_STUB(glColorMaskIndexedEXT, _gloffset_ColorMaskIndexedEXT)
+	GL_STUB(glDisableIndexedEXT, _gloffset_DisableIndexedEXT)
+	GL_STUB(glEnableIndexedEXT, _gloffset_EnableIndexedEXT)
+	GL_STUB(glGetBooleanIndexedvEXT, _gloffset_GetBooleanIndexedvEXT)
+	GL_STUB(glGetIntegerIndexedvEXT, _gloffset_GetIntegerIndexedvEXT)
+	GL_STUB(glIsEnabledIndexedEXT, _gloffset_IsEnabledIndexedEXT)
 	GL_STUB(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT)
-	GL_STUB(gl_dispatch_stub_788, _gloffset_GetTexParameterPointervAPPLE)
-	HIDDEN(gl_dispatch_stub_788)
-	GL_STUB(gl_dispatch_stub_789, _gloffset_TextureRangeAPPLE)
-	HIDDEN(gl_dispatch_stub_789)
-	GL_STUB(gl_dispatch_stub_790, _gloffset_StencilFuncSeparateATI)
-	HIDDEN(gl_dispatch_stub_790)
-	GL_STUB(gl_dispatch_stub_791, _gloffset_ProgramEnvParameters4fvEXT)
-	HIDDEN(gl_dispatch_stub_791)
-	GL_STUB(gl_dispatch_stub_792, _gloffset_ProgramLocalParameters4fvEXT)
-	HIDDEN(gl_dispatch_stub_792)
-	GL_STUB(gl_dispatch_stub_793, _gloffset_GetQueryObjecti64vEXT)
-	HIDDEN(gl_dispatch_stub_793)
-	GL_STUB(gl_dispatch_stub_794, _gloffset_GetQueryObjectui64vEXT)
+	GL_STUB(gl_dispatch_stub_794, _gloffset_GetTexParameterPointervAPPLE)
 	HIDDEN(gl_dispatch_stub_794)
+	GL_STUB(gl_dispatch_stub_795, _gloffset_TextureRangeAPPLE)
+	HIDDEN(gl_dispatch_stub_795)
+	GL_STUB(gl_dispatch_stub_796, _gloffset_StencilFuncSeparateATI)
+	HIDDEN(gl_dispatch_stub_796)
+	GL_STUB(gl_dispatch_stub_797, _gloffset_ProgramEnvParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_797)
+	GL_STUB(gl_dispatch_stub_798, _gloffset_ProgramLocalParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_798)
+	GL_STUB(gl_dispatch_stub_799, _gloffset_GetQueryObjecti64vEXT)
+	HIDDEN(gl_dispatch_stub_799)
+	GL_STUB(gl_dispatch_stub_800, _gloffset_GetQueryObjectui64vEXT)
+	HIDDEN(gl_dispatch_stub_800)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S
index 134cff7ca46..26111c168ba 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -29800,16 +29800,24 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	.size	GL_PREFIX(FramebufferTextureLayerEXT), .-GL_PREFIX(FramebufferTextureLayerEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(ProvokingVertexEXT)
-	.type	GL_PREFIX(ProvokingVertexEXT), @function
-GL_PREFIX(ProvokingVertexEXT):
+	.globl	GL_PREFIX(ColorMaskIndexedEXT)
+	.type	GL_PREFIX(ColorMaskIndexedEXT), @function
+GL_PREFIX(ColorMaskIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	6296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
 	call	_x86_64_get_dispatch@PLT
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
 	popq	%rdi
 	movq	6296(%rax), %r11
 	jmp	*%r11
@@ -29821,18 +29829,25 @@ GL_PREFIX(ProvokingVertexEXT):
 	jmp	*%r11
 1:
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
 	call	_glapi_get_dispatch
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
 	popq	%rdi
 	movq	6296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(ProvokingVertexEXT), .-GL_PREFIX(ProvokingVertexEXT)
+	.size	GL_PREFIX(ColorMaskIndexedEXT), .-GL_PREFIX(ColorMaskIndexedEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_788)
-	.type	GL_PREFIX(_dispatch_stub_788), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_788))
-GL_PREFIX(_dispatch_stub_788):
+	.globl	GL_PREFIX(DisableIndexedEXT)
+	.type	GL_PREFIX(DisableIndexedEXT), @function
+GL_PREFIX(DisableIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	6304(%rax), %r11
@@ -29840,9 +29855,9 @@ GL_PREFIX(_dispatch_stub_788):
 #elif defined(PTHREADS)
 	pushq	%rdi
 	pushq	%rsi
-	pushq	%rdx
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rdx
+	popq	%rbp
 	popq	%rsi
 	popq	%rdi
 	movq	6304(%rax), %r11
@@ -29856,21 +29871,20 @@ GL_PREFIX(_dispatch_stub_788):
 1:
 	pushq	%rdi
 	pushq	%rsi
-	pushq	%rdx
+	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rdx
+	popq	%rbp
 	popq	%rsi
 	popq	%rdi
 	movq	6304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_788), .-GL_PREFIX(_dispatch_stub_788)
+	.size	GL_PREFIX(DisableIndexedEXT), .-GL_PREFIX(DisableIndexedEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_789)
-	.type	GL_PREFIX(_dispatch_stub_789), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_789))
-GL_PREFIX(_dispatch_stub_789):
+	.globl	GL_PREFIX(EnableIndexedEXT)
+	.type	GL_PREFIX(EnableIndexedEXT), @function
+GL_PREFIX(EnableIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	6312(%rax), %r11
@@ -29878,9 +29892,9 @@ GL_PREFIX(_dispatch_stub_789):
 #elif defined(PTHREADS)
 	pushq	%rdi
 	pushq	%rsi
-	pushq	%rdx
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rdx
+	popq	%rbp
 	popq	%rsi
 	popq	%rdi
 	movq	6312(%rax), %r11
@@ -29894,21 +29908,20 @@ GL_PREFIX(_dispatch_stub_789):
 1:
 	pushq	%rdi
 	pushq	%rsi
-	pushq	%rdx
+	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rdx
+	popq	%rbp
 	popq	%rsi
 	popq	%rdi
 	movq	6312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_789), .-GL_PREFIX(_dispatch_stub_789)
+	.size	GL_PREFIX(EnableIndexedEXT), .-GL_PREFIX(EnableIndexedEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_790)
-	.type	GL_PREFIX(_dispatch_stub_790), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_790))
-GL_PREFIX(_dispatch_stub_790):
+	.globl	GL_PREFIX(GetBooleanIndexedvEXT)
+	.type	GL_PREFIX(GetBooleanIndexedvEXT), @function
+GL_PREFIX(GetBooleanIndexedvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	6320(%rax), %r11
@@ -29917,6 +29930,223 @@ GL_PREFIX(_dispatch_stub_790):
 	pushq	%rdi
 	pushq	%rsi
 	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6320(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6320(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6320(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetBooleanIndexedvEXT), .-GL_PREFIX(GetBooleanIndexedvEXT)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GetIntegerIndexedvEXT)
+	.type	GL_PREFIX(GetIntegerIndexedvEXT), @function
+GL_PREFIX(GetIntegerIndexedvEXT):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6328(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6328(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6328(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6328(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetIntegerIndexedvEXT), .-GL_PREFIX(GetIntegerIndexedvEXT)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(IsEnabledIndexedEXT)
+	.type	GL_PREFIX(IsEnabledIndexedEXT), @function
+GL_PREFIX(IsEnabledIndexedEXT):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6336(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	6336(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6336(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	6336(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(IsEnabledIndexedEXT), .-GL_PREFIX(IsEnabledIndexedEXT)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(ProvokingVertexEXT)
+	.type	GL_PREFIX(ProvokingVertexEXT), @function
+GL_PREFIX(ProvokingVertexEXT):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6344(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	6344(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6344(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	6344(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(ProvokingVertexEXT), .-GL_PREFIX(ProvokingVertexEXT)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_794)
+	.type	GL_PREFIX(_dispatch_stub_794), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_794))
+GL_PREFIX(_dispatch_stub_794):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6352(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6352(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6352(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6352(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_794), .-GL_PREFIX(_dispatch_stub_794)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_795)
+	.type	GL_PREFIX(_dispatch_stub_795), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_795))
+GL_PREFIX(_dispatch_stub_795):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6360(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6360(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6360(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6360(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_795), .-GL_PREFIX(_dispatch_stub_795)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_796)
+	.type	GL_PREFIX(_dispatch_stub_796), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_796))
+GL_PREFIX(_dispatch_stub_796):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6368(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
 	pushq	%rcx
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
@@ -29925,13 +30155,13 @@ GL_PREFIX(_dispatch_stub_790):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6320(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6320(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29945,19 +30175,19 @@ GL_PREFIX(_dispatch_stub_790):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6320(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_790), .-GL_PREFIX(_dispatch_stub_790)
+	.size	GL_PREFIX(_dispatch_stub_796), .-GL_PREFIX(_dispatch_stub_796)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_791)
-	.type	GL_PREFIX(_dispatch_stub_791), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_791))
-GL_PREFIX(_dispatch_stub_791):
+	.globl	GL_PREFIX(_dispatch_stub_797)
+	.type	GL_PREFIX(_dispatch_stub_797), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_797))
+GL_PREFIX(_dispatch_stub_797):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6328(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29971,13 +30201,13 @@ GL_PREFIX(_dispatch_stub_791):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6328(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6328(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29991,19 +30221,19 @@ GL_PREFIX(_dispatch_stub_791):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6328(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_791), .-GL_PREFIX(_dispatch_stub_791)
+	.size	GL_PREFIX(_dispatch_stub_797), .-GL_PREFIX(_dispatch_stub_797)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_792)
-	.type	GL_PREFIX(_dispatch_stub_792), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_792))
-GL_PREFIX(_dispatch_stub_792):
+	.globl	GL_PREFIX(_dispatch_stub_798)
+	.type	GL_PREFIX(_dispatch_stub_798), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_798))
+GL_PREFIX(_dispatch_stub_798):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6336(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30017,13 +30247,13 @@ GL_PREFIX(_dispatch_stub_792):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6336(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6336(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30037,19 +30267,19 @@ GL_PREFIX(_dispatch_stub_792):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6336(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_792), .-GL_PREFIX(_dispatch_stub_792)
+	.size	GL_PREFIX(_dispatch_stub_798), .-GL_PREFIX(_dispatch_stub_798)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_793)
-	.type	GL_PREFIX(_dispatch_stub_793), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_793))
-GL_PREFIX(_dispatch_stub_793):
+	.globl	GL_PREFIX(_dispatch_stub_799)
+	.type	GL_PREFIX(_dispatch_stub_799), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_799))
+GL_PREFIX(_dispatch_stub_799):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6344(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30059,13 +30289,13 @@ GL_PREFIX(_dispatch_stub_793):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6344(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6344(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30075,19 +30305,19 @@ GL_PREFIX(_dispatch_stub_793):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6344(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_793), .-GL_PREFIX(_dispatch_stub_793)
+	.size	GL_PREFIX(_dispatch_stub_799), .-GL_PREFIX(_dispatch_stub_799)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_794)
-	.type	GL_PREFIX(_dispatch_stub_794), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_794))
-GL_PREFIX(_dispatch_stub_794):
+	.globl	GL_PREFIX(_dispatch_stub_800)
+	.type	GL_PREFIX(_dispatch_stub_800), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_800))
+GL_PREFIX(_dispatch_stub_800):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6352(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30097,13 +30327,13 @@ GL_PREFIX(_dispatch_stub_794):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6352(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6352(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30113,10 +30343,10 @@ GL_PREFIX(_dispatch_stub_794):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6352(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_794), .-GL_PREFIX(_dispatch_stub_794)
+	.size	GL_PREFIX(_dispatch_stub_800), .-GL_PREFIX(_dispatch_stub_800)
 
 	.globl GL_PREFIX(ArrayElementEXT) ; .set GL_PREFIX(ArrayElementEXT), GL_PREFIX(ArrayElement)
 	.globl GL_PREFIX(BindTextureEXT) ; .set GL_PREFIX(BindTextureEXT), GL_PREFIX(BindTexture)
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 0da924c37f2..ea210674d00 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -968,21 +968,27 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(_dispatch_stub_785, _gloffset_FlushMappedBufferRangeAPPLE, _dispatch_stub_785@12)
 	HIDDEN(GL_PREFIX(_dispatch_stub_785, _dispatch_stub_785@12))
 	GL_STUB(FramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
+	GL_STUB(ColorMaskIndexedEXT, _gloffset_ColorMaskIndexedEXT, ColorMaskIndexedEXT@20)
+	GL_STUB(DisableIndexedEXT, _gloffset_DisableIndexedEXT, DisableIndexedEXT@8)
+	GL_STUB(EnableIndexedEXT, _gloffset_EnableIndexedEXT, EnableIndexedEXT@8)
+	GL_STUB(GetBooleanIndexedvEXT, _gloffset_GetBooleanIndexedvEXT, GetBooleanIndexedvEXT@12)
+	GL_STUB(GetIntegerIndexedvEXT, _gloffset_GetIntegerIndexedvEXT, GetIntegerIndexedvEXT@12)
+	GL_STUB(IsEnabledIndexedEXT, _gloffset_IsEnabledIndexedEXT, IsEnabledIndexedEXT@8)
 	GL_STUB(ProvokingVertexEXT, _gloffset_ProvokingVertexEXT, ProvokingVertexEXT@4)
-	GL_STUB(_dispatch_stub_788, _gloffset_GetTexParameterPointervAPPLE, _dispatch_stub_788@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_788, _dispatch_stub_788@12))
-	GL_STUB(_dispatch_stub_789, _gloffset_TextureRangeAPPLE, _dispatch_stub_789@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_789, _dispatch_stub_789@12))
-	GL_STUB(_dispatch_stub_790, _gloffset_StencilFuncSeparateATI, _dispatch_stub_790@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_790, _dispatch_stub_790@16))
-	GL_STUB(_dispatch_stub_791, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_791@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_791, _dispatch_stub_791@16))
-	GL_STUB(_dispatch_stub_792, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_792@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_792, _dispatch_stub_792@16))
-	GL_STUB(_dispatch_stub_793, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_793@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_793, _dispatch_stub_793@12))
-	GL_STUB(_dispatch_stub_794, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_794@12)
+	GL_STUB(_dispatch_stub_794, _gloffset_GetTexParameterPointervAPPLE, _dispatch_stub_794@12)
 	HIDDEN(GL_PREFIX(_dispatch_stub_794, _dispatch_stub_794@12))
+	GL_STUB(_dispatch_stub_795, _gloffset_TextureRangeAPPLE, _dispatch_stub_795@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_795, _dispatch_stub_795@12))
+	GL_STUB(_dispatch_stub_796, _gloffset_StencilFuncSeparateATI, _dispatch_stub_796@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_796, _dispatch_stub_796@16))
+	GL_STUB(_dispatch_stub_797, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_797@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_797, _dispatch_stub_797@16))
+	GL_STUB(_dispatch_stub_798, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_798@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_798, _dispatch_stub_798@16))
+	GL_STUB(_dispatch_stub_799, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_799@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_799, _dispatch_stub_799@12))
+	GL_STUB(_dispatch_stub_800, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_800@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_800, _dispatch_stub_800@12))
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, _gloffset_BindTexture, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, _gloffset_DrawArrays, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
author	Brian Paul <[email protected]>	2009-12-29 22:55:57 -0700
committer	Brian Paul <[email protected]>	2009-12-29 22:55:57 -0700
commit	285d3f9ed84343b91e501d870a9ef6c61d9cc8f4 (patch)
tree	5fbcf2ad5f62c669722323370a4e1c7c994ac5a5
parent	ca3a8538b6981d7a47193605968f7adc6f3346b8 (diff)