Merge branch 'primitive-restart-cleanup'

Conflicts: docs/relnotes-7.10.html This branch is a re-do of the primitive-restart branch with all the intermediate/temporary stuff cleaned out.
author: Brian Paul <brianp@vmware.com> 2010-10-21 19:05:40 -0600
committer: Brian Paul <brianp@vmware.com> 2010-10-21 19:05:47 -0600
commit: 69a07be3e527dbc2148a4e20c50e60266225f5f2 (patch)
tree: 82583b98708fc7a6c33b471d45670e2566ed0daf /src
parent: 1d91f8d9164b38b4c924f43ec4fc5ceb65c96a78 (diff)
parent: b2d4dfe5cc5b24743175bf35285dfc57f86bc09d (diff)
31 files changed, 4457 insertions, 4046 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pt.c b/src/gallium/auxiliary/draw/draw_pt.c
index f44bf2507c..4078b2a07d 100644
--- a/src/gallium/auxiliary/draw/draw_pt.c
+++ b/src/gallium/auxiliary/draw/draw_pt.c
@@ -287,6 +287,84 @@ draw_print_arrays(struct draw_context *draw, uint prim, int start, uint count)
 }
 
 
+/** Helper code for below */
+#define PRIM_RESTART_LOOP(elements) \
+   do { \
+      for (i = start; i < end; i++) { \
+         if (elements[i] == info->restart_index) { \
+            if (cur_count > 0) { \
+               /* draw elts up to prev pos */ \
+               draw_pt_arrays(draw, prim, cur_start, cur_count); \
+            } \
+            /* begin new prim at next elt */ \
+            cur_start = i + 1; \
+            cur_count = 0; \
+         } \
+         else { \
+            cur_count++; \
+         } \
+      } \
+      if (cur_count > 0) { \
+         draw_pt_arrays(draw, prim, cur_start, cur_count); \
+      } \
+   } while (0)
+
+
+/**
+ * For drawing prims with primitive restart enabled.
+ * Scan for restart indexes and draw the runs of elements/vertices between
+ * the restarts.
+ */
+static void
+draw_pt_arrays_restart(struct draw_context *draw,
+                       const struct pipe_draw_info *info)
+{
+   const unsigned prim = info->mode;
+   const unsigned start = info->start;
+   const unsigned count = info->count;
+   const unsigned end = start + count;
+   unsigned i, cur_start, cur_count;
+
+   assert(info->primitive_restart);
+
+   if (draw->pt.user.elts) {
+      /* indexed prims (draw_elements) */
+      cur_start = start;
+      cur_count = 0;
+
+      switch (draw->pt.user.eltSize) {
+      case 1:
+         {
+            const ubyte *elt_ub = (const ubyte *) draw->pt.user.elts;
+            PRIM_RESTART_LOOP(elt_ub);
+         }
+         break;
+      case 2:
+         {
+            const ushort *elt_us = (const ushort *) draw->pt.user.elts;
+            PRIM_RESTART_LOOP(elt_us);
+         }
+         break;
+      case 4:
+         {
+            const uint *elt_ui = (const uint *) draw->pt.user.elts;
+            PRIM_RESTART_LOOP(elt_ui);
+         }
+         break;
+      default:
+         assert(0 && "bad eltSize in draw_arrays()");
+      }
+   }
+   else {
+      /* Non-indexed prims (draw_arrays).
+       * Primitive restart should have been handled in the state tracker.
+       */
+      draw_pt_arrays(draw, prim, start, count);
+   }
+}
+
+
+
 /**
  * Non-instanced drawing.
  * \sa draw_arrays_instanced
@@ -395,6 +473,12 @@ draw_vbo(struct draw_context *draw,
 
    for (instance = 0; instance < info->instance_count; instance++) {
       draw->instance_id = instance + info->start_instance;
-      draw_pt_arrays(draw, info->mode, info->start, info->count);
+
+      if (info->primitive_restart) {
+         draw_pt_arrays_restart(draw, info);
+      }
+      else {
+         draw_pt_arrays(draw, info->mode, info->start, info->count);
+      }
    }
 }
diff --git a/src/gallium/docs/source/context.rst b/src/gallium/docs/source/context.rst
index 5342fc25dc..e09a1304c4 100644
--- a/src/gallium/docs/source/context.rst
+++ b/src/gallium/docs/source/context.rst
@@ -156,6 +156,15 @@ If there is an index buffer bound, and ``indexed`` field is true, all vertex
 indices will be looked up in the index buffer.  ``min_index``, ``max_index``,
 and ``index_bias`` apply after index lookup.
 
+When drawing indexed primitives, the primitive restart index can be
+used to draw disjoint primitive strips.  For example, several separate
+line strips can be drawn by designating a special index value as the
+restart index.  The ``primitive_restart`` flag enables/disables this
+feature.  The ``restart_index`` field specifies the restart index value.
+
+When primitive restart is in use, array indexes are compared to the
+restart index before adding the index_bias offset.
+
 If a given vertex element has ``instance_divisor`` set to 0, it is said
 it contains per-vertex data and effective vertex attribute address needs
 to be recalculated for every index.
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index 96633d9365..ad0ea75b3a 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -158,6 +158,8 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
    case PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT:
    case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER:
       return 0;
+   case PIPE_CAP_PRIMITIVE_RESTART:
+      return 1;
    case PIPE_CAP_DEPTHSTENCIL_CLEAR_SEPARATE:
       return 1;
    case PIPE_CAP_DEPTH_CLAMP:
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index 37557d1194..a2bfa1bd8d 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -112,6 +112,8 @@ softpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
       return 1;
    case PIPE_CAP_STREAM_OUTPUT:
       return 1;
+   case PIPE_CAP_PRIMITIVE_RESTART:
+      return 1;
    case PIPE_CAP_DEPTHSTENCIL_CLEAR_SEPARATE:
       return 0;
    case PIPE_CAP_SHADER_STENCIL_EXPORT:
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index b6894c09e8..53f7b601ad 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -452,6 +452,7 @@ enum pipe_cap {
    PIPE_CAP_BLEND_EQUATION_SEPARATE,
    PIPE_CAP_SM3,  /*< Shader Model, supported */
    PIPE_CAP_STREAM_OUTPUT,
+   PIPE_CAP_PRIMITIVE_RESTART,
    /** Maximum texture image units accessible from vertex and fragment shaders
     * combined */
    PIPE_CAP_MAX_COMBINED_SAMPLERS,
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 9a2b31da50..fc6dba346d 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -457,6 +457,12 @@ struct pipe_draw_info
    int index_bias; /**< a bias to be added to each index */
    unsigned min_index; /**< the min index */
    unsigned max_index; /**< the max index */
+
+   /**
+    * Primitive restart enable/index (only applies to indexed drawing)
+    */
+   boolean primitive_restart;
+   unsigned restart_index;
 };
 
 
diff --git a/src/mapi/glapi/gen/Makefile b/src/mapi/glapi/gen/Makefile
index 41640b3b04..657056bece 100644
--- a/src/mapi/glapi/gen/Makefile
+++ b/src/mapi/glapi/gen/Makefile
@@ -90,6 +90,7 @@ API_XML = \
 	EXT_texture_array.xml \
 	EXT_transform_feedback.xml \
 	NV_conditional_render.xml \
+	NV_primitive_restart.xml \
 	OES_EGL_image.xml
 
 COMMON = $(API_XML) gl_XML.py glX_XML.py license.py typeexpr.py
diff --git a/src/mapi/glapi/gen/NV_primitive_restart.xml b/src/mapi/glapi/gen/NV_primitive_restart.xml
new file mode 100644
index 0000000000..abe7dda007
--- /dev/null
+++ b/src/mapi/glapi/gen/NV_primitive_restart.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+
+<OpenGLAPI>
+
+<category name="GL_NV_primitive_restart" number="285">
+
+    <enum name="PRIMITIVE_RESTART_NV"        value="0x8558"/>
+    <enum name="PRIMITIVE_RESTART_INDEX_NV"  value="0x8559"/>
+
+    <function name="PrimitiveRestartNV" offset="assign">
+    </function>
+
+    <function name="PrimitiveRestartIndexNV" offset="assign">
+	<param name="index" type="GLuint"/>
+    </function>
+
+</category>
+
+</OpenGLAPI>
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index d391895f87..d1139aa06e 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -7967,6 +7967,8 @@
 
 <xi:include href="NV_conditional_render.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="NV_primitive_restart.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <xi:include href="EXT_transform_feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="ARB_draw_instanced.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
diff --git a/src/mapi/glapi/glapi_sparc.S b/src/mapi/glapi/glapi_sparc.S
index da823282e5..8fb631ec14 100644
--- a/src/mapi/glapi/glapi_sparc.S
+++ b/src/mapi/glapi/glapi_sparc.S
@@ -994,10 +994,12 @@ gl_dispatch_functions_start:
 	GL_STUB(glProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV)
 	GL_STUB(glProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV)
 	GL_STUB(glProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV)
-	GL_STUB(gl_dispatch_stub_774, _gloffset_DepthBoundsEXT)
-	HIDDEN(gl_dispatch_stub_774)
-	GL_STUB(gl_dispatch_stub_775, _gloffset_BlendEquationSeparateEXT)
-	HIDDEN(gl_dispatch_stub_775)
+	GL_STUB(glPrimitiveRestartIndexNV, _gloffset_PrimitiveRestartIndexNV)
+	GL_STUB(glPrimitiveRestartNV, _gloffset_PrimitiveRestartNV)
+	GL_STUB(gl_dispatch_stub_776, _gloffset_DepthBoundsEXT)
+	HIDDEN(gl_dispatch_stub_776)
+	GL_STUB(gl_dispatch_stub_777, _gloffset_BlendEquationSeparateEXT)
+	HIDDEN(gl_dispatch_stub_777)
 	GL_STUB(glBindFramebufferEXT, _gloffset_BindFramebufferEXT)
 	GL_STUB(glBindRenderbufferEXT, _gloffset_BindRenderbufferEXT)
 	GL_STUB(glCheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT)
@@ -1015,12 +1017,12 @@ gl_dispatch_functions_start:
 	GL_STUB(glIsFramebufferEXT, _gloffset_IsFramebufferEXT)
 	GL_STUB(glIsRenderbufferEXT, _gloffset_IsRenderbufferEXT)
 	GL_STUB(glRenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT)
-	GL_STUB(gl_dispatch_stub_793, _gloffset_BlitFramebufferEXT)
-	HIDDEN(gl_dispatch_stub_793)
-	GL_STUB(gl_dispatch_stub_794, _gloffset_BufferParameteriAPPLE)
-	HIDDEN(gl_dispatch_stub_794)
-	GL_STUB(gl_dispatch_stub_795, _gloffset_FlushMappedBufferRangeAPPLE)
+	GL_STUB(gl_dispatch_stub_795, _gloffset_BlitFramebufferEXT)
 	HIDDEN(gl_dispatch_stub_795)
+	GL_STUB(gl_dispatch_stub_796, _gloffset_BufferParameteriAPPLE)
+	HIDDEN(gl_dispatch_stub_796)
+	GL_STUB(gl_dispatch_stub_797, _gloffset_FlushMappedBufferRangeAPPLE)
+	HIDDEN(gl_dispatch_stub_797)
 	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
 	GL_STUB(glColorMaskIndexedEXT, _gloffset_ColorMaskIndexedEXT)
 	GL_STUB(glDisableIndexedEXT, _gloffset_DisableIndexedEXT)
@@ -1038,23 +1040,23 @@ gl_dispatch_functions_start:
 	GL_STUB(glGetTransformFeedbackVaryingEXT, _gloffset_GetTransformFeedbackVaryingEXT)
 	GL_STUB(glTransformFeedbackVaryingsEXT, _gloffset_TransformFeedbackVaryingsEXT)
 	GL_STUB(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT)
-	GL_STUB(gl_dispatch_stub_813, _gloffset_GetTexParameterPointervAPPLE)
-	HIDDEN(gl_dispatch_stub_813)
-	GL_STUB(gl_dispatch_stub_814, _gloffset_TextureRangeAPPLE)
-	HIDDEN(gl_dispatch_stub_814)
+	GL_STUB(gl_dispatch_stub_815, _gloffset_GetTexParameterPointervAPPLE)
+	HIDDEN(gl_dispatch_stub_815)
+	GL_STUB(gl_dispatch_stub_816, _gloffset_TextureRangeAPPLE)
+	HIDDEN(gl_dispatch_stub_816)
 	GL_STUB(glGetObjectParameterivAPPLE, _gloffset_GetObjectParameterivAPPLE)
 	GL_STUB(glObjectPurgeableAPPLE, _gloffset_ObjectPurgeableAPPLE)
 	GL_STUB(glObjectUnpurgeableAPPLE, _gloffset_ObjectUnpurgeableAPPLE)
-	GL_STUB(gl_dispatch_stub_818, _gloffset_StencilFuncSeparateATI)
-	HIDDEN(gl_dispatch_stub_818)
-	GL_STUB(gl_dispatch_stub_819, _gloffset_ProgramEnvParameters4fvEXT)
-	HIDDEN(gl_dispatch_stub_819)
-	GL_STUB(gl_dispatch_stub_820, _gloffset_ProgramLocalParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_820, _gloffset_StencilFuncSeparateATI)
 	HIDDEN(gl_dispatch_stub_820)
-	GL_STUB(gl_dispatch_stub_821, _gloffset_GetQueryObjecti64vEXT)
+	GL_STUB(gl_dispatch_stub_821, _gloffset_ProgramEnvParameters4fvEXT)
 	HIDDEN(gl_dispatch_stub_821)
-	GL_STUB(gl_dispatch_stub_822, _gloffset_GetQueryObjectui64vEXT)
+	GL_STUB(gl_dispatch_stub_822, _gloffset_ProgramLocalParameters4fvEXT)
 	HIDDEN(gl_dispatch_stub_822)
+	GL_STUB(gl_dispatch_stub_823, _gloffset_GetQueryObjecti64vEXT)
+	HIDDEN(gl_dispatch_stub_823)
+	GL_STUB(gl_dispatch_stub_824, _gloffset_GetQueryObjectui64vEXT)
+	HIDDEN(gl_dispatch_stub_824)
 	GL_STUB(glEGLImageTargetRenderbufferStorageOES, _gloffset_EGLImageTargetRenderbufferStorageOES)
 	GL_STUB(glEGLImageTargetTexture2DOES, _gloffset_EGLImageTargetTexture2DOES)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
diff --git a/src/mapi/glapi/glapi_x86-64.S b/src/mapi/glapi/glapi_x86-64.S
index 8b44351a6c..5598f441ee 100644
--- a/src/mapi/glapi/glapi_x86-64.S
+++ b/src/mapi/glapi/glapi_x86-64.S
@@ -29272,29 +29272,87 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	.size	GL_PREFIX(ProgramNamedParameter4fvNV), .-GL_PREFIX(ProgramNamedParameter4fvNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_774)
-	.type	GL_PREFIX(_dispatch_stub_774), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_774))
-GL_PREFIX(_dispatch_stub_774):
+	.globl	GL_PREFIX(PrimitiveRestartIndexNV)
+	.type	GL_PREFIX(PrimitiveRestartIndexNV), @function
+GL_PREFIX(PrimitiveRestartIndexNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	6192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	6192(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6192(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	6192(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(PrimitiveRestartIndexNV), .-GL_PREFIX(PrimitiveRestartIndexNV)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(PrimitiveRestartNV)
+	.type	GL_PREFIX(PrimitiveRestartNV), @function
+GL_PREFIX(PrimitiveRestartNV):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6200(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	movq	6200(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6200(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	movq	6200(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(PrimitiveRestartNV), .-GL_PREFIX(PrimitiveRestartNV)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_776)
+	.type	GL_PREFIX(_dispatch_stub_776), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_776))
+GL_PREFIX(_dispatch_stub_776):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6208(%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	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29304,19 +29362,19 @@ GL_PREFIX(_dispatch_stub_774):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_774), .-GL_PREFIX(_dispatch_stub_774)
+	.size	GL_PREFIX(_dispatch_stub_776), .-GL_PREFIX(_dispatch_stub_776)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_775)
-	.type	GL_PREFIX(_dispatch_stub_775), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_775))
-GL_PREFIX(_dispatch_stub_775):
+	.globl	GL_PREFIX(_dispatch_stub_777)
+	.type	GL_PREFIX(_dispatch_stub_777), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_777))
+GL_PREFIX(_dispatch_stub_777):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29326,13 +29384,13 @@ GL_PREFIX(_dispatch_stub_775):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29342,10 +29400,10 @@ GL_PREFIX(_dispatch_stub_775):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_775), .-GL_PREFIX(_dispatch_stub_775)
+	.size	GL_PREFIX(_dispatch_stub_777), .-GL_PREFIX(_dispatch_stub_777)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFramebufferEXT)
@@ -29353,7 +29411,7 @@ GL_PREFIX(_dispatch_stub_775):
 GL_PREFIX(BindFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6208(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29363,13 +29421,13 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6208(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29379,7 +29437,7 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFramebufferEXT), .-GL_PREFIX(BindFramebufferEXT)
@@ -29390,7 +29448,7 @@ GL_PREFIX(BindFramebufferEXT):
 GL_PREFIX(BindRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6216(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29400,13 +29458,13 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6216(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29416,7 +29474,7 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindRenderbufferEXT), .-GL_PREFIX(BindRenderbufferEXT)
@@ -29427,25 +29485,25 @@ GL_PREFIX(BindRenderbufferEXT):
 GL_PREFIX(CheckFramebufferStatusEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6224(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6224(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CheckFramebufferStatusEXT), .-GL_PREFIX(CheckFramebufferStatusEXT)
@@ -29456,7 +29514,7 @@ GL_PREFIX(CheckFramebufferStatusEXT):
 GL_PREFIX(DeleteFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6232(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29466,13 +29524,13 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6232(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6232(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29482,7 +29540,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6232(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFramebuffersEXT), .-GL_PREFIX(DeleteFramebuffersEXT)
@@ -29493,7 +29551,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 GL_PREFIX(DeleteRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6240(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29503,13 +29561,13 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6240(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29519,7 +29577,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteRenderbuffersEXT), .-GL_PREFIX(DeleteRenderbuffersEXT)
@@ -29530,7 +29588,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 GL_PREFIX(FramebufferRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6248(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29544,13 +29602,13 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6248(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6248(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29564,7 +29622,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6248(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferRenderbufferEXT), .-GL_PREFIX(FramebufferRenderbufferEXT)
@@ -29575,7 +29633,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 GL_PREFIX(FramebufferTexture1DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6256(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29589,13 +29647,13 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6256(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6256(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29609,7 +29667,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6256(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture1DEXT), .-GL_PREFIX(FramebufferTexture1DEXT)
@@ -29620,7 +29678,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 GL_PREFIX(FramebufferTexture2DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6264(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29634,13 +29692,13 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6264(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6264(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29654,7 +29712,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6264(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture2DEXT), .-GL_PREFIX(FramebufferTexture2DEXT)
@@ -29665,7 +29723,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 GL_PREFIX(FramebufferTexture3DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6272(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29683,13 +29741,13 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6272(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6272(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29707,7 +29765,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6272(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture3DEXT), .-GL_PREFIX(FramebufferTexture3DEXT)
@@ -29718,7 +29776,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 GL_PREFIX(GenFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6280(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29728,13 +29786,13 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6280(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6280(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29744,7 +29802,7 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6280(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFramebuffersEXT), .-GL_PREFIX(GenFramebuffersEXT)
@@ -29755,7 +29813,7 @@ GL_PREFIX(GenFramebuffersEXT):
 GL_PREFIX(GenRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6288(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29765,13 +29823,13 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6288(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6288(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29781,7 +29839,7 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6288(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenRenderbuffersEXT), .-GL_PREFIX(GenRenderbuffersEXT)
@@ -29792,25 +29850,25 @@ GL_PREFIX(GenRenderbuffersEXT):
 GL_PREFIX(GenerateMipmapEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6296(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6296(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6296(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6296(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenerateMipmapEXT), .-GL_PREFIX(GenerateMipmapEXT)
@@ -29821,7 +29879,7 @@ GL_PREFIX(GenerateMipmapEXT):
 GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6304(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29835,13 +29893,13 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6304(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6304(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29855,7 +29913,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6304(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFramebufferAttachmentParameterivEXT), .-GL_PREFIX(GetFramebufferAttachmentParameterivEXT)
@@ -29866,7 +29924,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 GL_PREFIX(GetRenderbufferParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6312(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29876,13 +29934,13 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6312(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6312(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29892,7 +29950,7 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6312(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetRenderbufferParameterivEXT), .-GL_PREFIX(GetRenderbufferParameterivEXT)
@@ -29903,25 +29961,25 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 GL_PREFIX(IsFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6320(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6320(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6320(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6320(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsFramebufferEXT), .-GL_PREFIX(IsFramebufferEXT)
@@ -29932,25 +29990,25 @@ GL_PREFIX(IsFramebufferEXT):
 GL_PREFIX(IsRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6328(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6328(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6328(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6328(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsRenderbufferEXT), .-GL_PREFIX(IsRenderbufferEXT)
@@ -29961,7 +30019,7 @@ GL_PREFIX(IsRenderbufferEXT):
 GL_PREFIX(RenderbufferStorageEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6336(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29975,13 +30033,13 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6336(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6336(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29995,19 +30053,19 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6336(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RenderbufferStorageEXT), .-GL_PREFIX(RenderbufferStorageEXT)
 
 	.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_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	6344(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30025,13 +30083,13 @@ GL_PREFIX(_dispatch_stub_793):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6344(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6344(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30049,19 +30107,19 @@ GL_PREFIX(_dispatch_stub_793):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6344(%rax), %r11
+	movq	6360(%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_795), .-GL_PREFIX(_dispatch_stub_795)
 
 	.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_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	6352(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30071,13 +30129,13 @@ GL_PREFIX(_dispatch_stub_794):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6352(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6352(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30087,19 +30145,19 @@ GL_PREFIX(_dispatch_stub_794):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6352(%rax), %r11
+	movq	6368(%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_796), .-GL_PREFIX(_dispatch_stub_796)
 
 	.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):
+	.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	6360(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30109,13 +30167,13 @@ GL_PREFIX(_dispatch_stub_795):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6360(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6360(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30125,10 +30183,10 @@ GL_PREFIX(_dispatch_stub_795):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6360(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_795), .-GL_PREFIX(_dispatch_stub_795)
+	.size	GL_PREFIX(_dispatch_stub_797), .-GL_PREFIX(_dispatch_stub_797)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(FramebufferTextureLayerEXT)
@@ -30136,7 +30194,7 @@ GL_PREFIX(_dispatch_stub_795):
 GL_PREFIX(FramebufferTextureLayerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6368(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30150,13 +30208,13 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6368(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6368(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30170,7 +30228,7 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6368(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTextureLayerEXT), .-GL_PREFIX(FramebufferTextureLayerEXT)
@@ -30181,7 +30239,7 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 GL_PREFIX(ColorMaskIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6376(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30195,13 +30253,13 @@ GL_PREFIX(ColorMaskIndexedEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6376(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6376(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30215,7 +30273,7 @@ GL_PREFIX(ColorMaskIndexedEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6376(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorMaskIndexedEXT), .-GL_PREFIX(ColorMaskIndexedEXT)
@@ -30226,7 +30284,7 @@ GL_PREFIX(ColorMaskIndexedEXT):
 GL_PREFIX(DisableIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6384(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30236,13 +30294,13 @@ GL_PREFIX(DisableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6384(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6384(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30252,7 +30310,7 @@ GL_PREFIX(DisableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6384(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DisableIndexedEXT), .-GL_PREFIX(DisableIndexedEXT)
@@ -30263,7 +30321,7 @@ GL_PREFIX(DisableIndexedEXT):
 GL_PREFIX(EnableIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6392(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30273,13 +30331,13 @@ GL_PREFIX(EnableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6392(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6392(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30289,7 +30347,7 @@ GL_PREFIX(EnableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6392(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EnableIndexedEXT), .-GL_PREFIX(EnableIndexedEXT)
@@ -30300,7 +30358,7 @@ GL_PREFIX(EnableIndexedEXT):
 GL_PREFIX(GetBooleanIndexedvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6400(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30310,13 +30368,13 @@ GL_PREFIX(GetBooleanIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6400(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6400(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30326,7 +30384,7 @@ GL_PREFIX(GetBooleanIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6400(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetBooleanIndexedvEXT), .-GL_PREFIX(GetBooleanIndexedvEXT)
@@ -30337,7 +30395,7 @@ GL_PREFIX(GetBooleanIndexedvEXT):
 GL_PREFIX(GetIntegerIndexedvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6408(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30347,13 +30405,13 @@ GL_PREFIX(GetIntegerIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6408(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6408(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30363,7 +30421,7 @@ GL_PREFIX(GetIntegerIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6408(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetIntegerIndexedvEXT), .-GL_PREFIX(GetIntegerIndexedvEXT)
@@ -30374,7 +30432,7 @@ GL_PREFIX(GetIntegerIndexedvEXT):
 GL_PREFIX(IsEnabledIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6416(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30384,13 +30442,13 @@ GL_PREFIX(IsEnabledIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6416(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6416(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30400,7 +30458,7 @@ GL_PREFIX(IsEnabledIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6416(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsEnabledIndexedEXT), .-GL_PREFIX(IsEnabledIndexedEXT)
@@ -30411,7 +30469,7 @@ GL_PREFIX(IsEnabledIndexedEXT):
 GL_PREFIX(BeginConditionalRenderNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6424(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30421,13 +30479,13 @@ GL_PREFIX(BeginConditionalRenderNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6424(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6424(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30437,7 +30495,7 @@ GL_PREFIX(BeginConditionalRenderNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6424(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginConditionalRenderNV), .-GL_PREFIX(BeginConditionalRenderNV)
@@ -30448,25 +30506,25 @@ GL_PREFIX(BeginConditionalRenderNV):
 GL_PREFIX(EndConditionalRenderNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6432(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6432(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6432(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6432(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndConditionalRenderNV), .-GL_PREFIX(EndConditionalRenderNV)
@@ -30477,25 +30535,25 @@ GL_PREFIX(EndConditionalRenderNV):
 GL_PREFIX(BeginTransformFeedbackEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6440(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6440(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6440(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6440(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginTransformFeedbackEXT), .-GL_PREFIX(BeginTransformFeedbackEXT)
@@ -30506,7 +30564,7 @@ GL_PREFIX(BeginTransformFeedbackEXT):
 GL_PREFIX(BindBufferBaseEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6448(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30516,13 +30574,13 @@ GL_PREFIX(BindBufferBaseEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6448(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6448(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30532,7 +30590,7 @@ GL_PREFIX(BindBufferBaseEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6448(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferBaseEXT), .-GL_PREFIX(BindBufferBaseEXT)
@@ -30543,7 +30601,7 @@ GL_PREFIX(BindBufferBaseEXT):
 GL_PREFIX(BindBufferOffsetEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6456(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30557,13 +30615,13 @@ GL_PREFIX(BindBufferOffsetEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6456(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6456(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30577,7 +30635,7 @@ GL_PREFIX(BindBufferOffsetEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6456(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferOffsetEXT), .-GL_PREFIX(BindBufferOffsetEXT)
@@ -30588,7 +30646,7 @@ GL_PREFIX(BindBufferOffsetEXT):
 GL_PREFIX(BindBufferRangeEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6464(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30602,13 +30660,13 @@ GL_PREFIX(BindBufferRangeEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6464(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6464(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30622,7 +30680,7 @@ GL_PREFIX(BindBufferRangeEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6464(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferRangeEXT), .-GL_PREFIX(BindBufferRangeEXT)
@@ -30633,25 +30691,25 @@ GL_PREFIX(BindBufferRangeEXT):
 GL_PREFIX(EndTransformFeedbackEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6472(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6472(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6472(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6472(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndTransformFeedbackEXT), .-GL_PREFIX(EndTransformFeedbackEXT)
@@ -30662,7 +30720,7 @@ GL_PREFIX(EndTransformFeedbackEXT):
 GL_PREFIX(GetTransformFeedbackVaryingEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6480(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30680,13 +30738,13 @@ GL_PREFIX(GetTransformFeedbackVaryingEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6480(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6480(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30704,7 +30762,7 @@ GL_PREFIX(GetTransformFeedbackVaryingEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6480(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTransformFeedbackVaryingEXT), .-GL_PREFIX(GetTransformFeedbackVaryingEXT)
@@ -30715,7 +30773,7 @@ GL_PREFIX(GetTransformFeedbackVaryingEXT):
 GL_PREFIX(TransformFeedbackVaryingsEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6488(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30729,13 +30787,13 @@ GL_PREFIX(TransformFeedbackVaryingsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6488(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6488(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30749,7 +30807,7 @@ GL_PREFIX(TransformFeedbackVaryingsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6488(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TransformFeedbackVaryingsEXT), .-GL_PREFIX(TransformFeedbackVaryingsEXT)
@@ -30760,37 +30818,37 @@ GL_PREFIX(TransformFeedbackVaryingsEXT):
 GL_PREFIX(ProvokingVertexEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6496(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6496(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6496(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6496(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProvokingVertexEXT), .-GL_PREFIX(ProvokingVertexEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_813)
-	.type	GL_PREFIX(_dispatch_stub_813), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_813))
-GL_PREFIX(_dispatch_stub_813):
+	.globl	GL_PREFIX(_dispatch_stub_815)
+	.type	GL_PREFIX(_dispatch_stub_815), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_815))
+GL_PREFIX(_dispatch_stub_815):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6504(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30800,13 +30858,13 @@ GL_PREFIX(_dispatch_stub_813):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6504(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6504(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30816,19 +30874,19 @@ GL_PREFIX(_dispatch_stub_813):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6504(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_813), .-GL_PREFIX(_dispatch_stub_813)
+	.size	GL_PREFIX(_dispatch_stub_815), .-GL_PREFIX(_dispatch_stub_815)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_814)
-	.type	GL_PREFIX(_dispatch_stub_814), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_814))
-GL_PREFIX(_dispatch_stub_814):
+	.globl	GL_PREFIX(_dispatch_stub_816)
+	.type	GL_PREFIX(_dispatch_stub_816), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_816))
+GL_PREFIX(_dispatch_stub_816):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6512(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30838,13 +30896,13 @@ GL_PREFIX(_dispatch_stub_814):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6512(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6512(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30854,10 +30912,10 @@ GL_PREFIX(_dispatch_stub_814):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6512(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_814), .-GL_PREFIX(_dispatch_stub_814)
+	.size	GL_PREFIX(_dispatch_stub_816), .-GL_PREFIX(_dispatch_stub_816)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(GetObjectParameterivAPPLE)
@@ -30865,7 +30923,7 @@ GL_PREFIX(_dispatch_stub_814):
 GL_PREFIX(GetObjectParameterivAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6520(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30879,13 +30937,13 @@ GL_PREFIX(GetObjectParameterivAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6520(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6520(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30899,7 +30957,7 @@ GL_PREFIX(GetObjectParameterivAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6520(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetObjectParameterivAPPLE), .-GL_PREFIX(GetObjectParameterivAPPLE)
@@ -30910,7 +30968,7 @@ GL_PREFIX(GetObjectParameterivAPPLE):
 GL_PREFIX(ObjectPurgeableAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6528(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30920,13 +30978,13 @@ GL_PREFIX(ObjectPurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6528(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6528(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30936,7 +30994,7 @@ GL_PREFIX(ObjectPurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6528(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ObjectPurgeableAPPLE), .-GL_PREFIX(ObjectPurgeableAPPLE)
@@ -30947,7 +31005,7 @@ GL_PREFIX(ObjectPurgeableAPPLE):
 GL_PREFIX(ObjectUnpurgeableAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6536(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30957,13 +31015,13 @@ GL_PREFIX(ObjectUnpurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6536(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6536(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30973,19 +31031,19 @@ GL_PREFIX(ObjectUnpurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6536(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ObjectUnpurgeableAPPLE), .-GL_PREFIX(ObjectUnpurgeableAPPLE)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_818)
-	.type	GL_PREFIX(_dispatch_stub_818), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_818))
-GL_PREFIX(_dispatch_stub_818):
+	.globl	GL_PREFIX(_dispatch_stub_820)
+	.type	GL_PREFIX(_dispatch_stub_820), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_820))
+GL_PREFIX(_dispatch_stub_820):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6544(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30999,13 +31057,13 @@ GL_PREFIX(_dispatch_stub_818):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6544(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6544(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31019,19 +31077,19 @@ GL_PREFIX(_dispatch_stub_818):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6544(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_818), .-GL_PREFIX(_dispatch_stub_818)
+	.size	GL_PREFIX(_dispatch_stub_820), .-GL_PREFIX(_dispatch_stub_820)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_819)
-	.type	GL_PREFIX(_dispatch_stub_819), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_819))
-GL_PREFIX(_dispatch_stub_819):
+	.globl	GL_PREFIX(_dispatch_stub_821)
+	.type	GL_PREFIX(_dispatch_stub_821), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_821))
+GL_PREFIX(_dispatch_stub_821):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6552(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31045,13 +31103,13 @@ GL_PREFIX(_dispatch_stub_819):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6552(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6552(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31065,19 +31123,19 @@ GL_PREFIX(_dispatch_stub_819):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6552(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_819), .-GL_PREFIX(_dispatch_stub_819)
+	.size	GL_PREFIX(_dispatch_stub_821), .-GL_PREFIX(_dispatch_stub_821)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_820)
-	.type	GL_PREFIX(_dispatch_stub_820), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_820))
-GL_PREFIX(_dispatch_stub_820):
+	.globl	GL_PREFIX(_dispatch_stub_822)
+	.type	GL_PREFIX(_dispatch_stub_822), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_822))
+GL_PREFIX(_dispatch_stub_822):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6560(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31091,13 +31149,13 @@ GL_PREFIX(_dispatch_stub_820):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6560(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6560(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31111,19 +31169,19 @@ GL_PREFIX(_dispatch_stub_820):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6560(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_820), .-GL_PREFIX(_dispatch_stub_820)
+	.size	GL_PREFIX(_dispatch_stub_822), .-GL_PREFIX(_dispatch_stub_822)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_821)
-	.type	GL_PREFIX(_dispatch_stub_821), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_821))
-GL_PREFIX(_dispatch_stub_821):
+	.globl	GL_PREFIX(_dispatch_stub_823)
+	.type	GL_PREFIX(_dispatch_stub_823), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_823))
+GL_PREFIX(_dispatch_stub_823):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6568(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31133,13 +31191,13 @@ GL_PREFIX(_dispatch_stub_821):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6568(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6568(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31149,19 +31207,19 @@ GL_PREFIX(_dispatch_stub_821):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6568(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_821), .-GL_PREFIX(_dispatch_stub_821)
+	.size	GL_PREFIX(_dispatch_stub_823), .-GL_PREFIX(_dispatch_stub_823)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_822)
-	.type	GL_PREFIX(_dispatch_stub_822), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_822))
-GL_PREFIX(_dispatch_stub_822):
+	.globl	GL_PREFIX(_dispatch_stub_824)
+	.type	GL_PREFIX(_dispatch_stub_824), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_824))
+GL_PREFIX(_dispatch_stub_824):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6576(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31171,13 +31229,13 @@ GL_PREFIX(_dispatch_stub_822):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6576(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6576(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31187,10 +31245,10 @@ GL_PREFIX(_dispatch_stub_822):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6576(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_822), .-GL_PREFIX(_dispatch_stub_822)
+	.size	GL_PREFIX(_dispatch_stub_824), .-GL_PREFIX(_dispatch_stub_824)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(EGLImageTargetRenderbufferStorageOES)
@@ -31198,7 +31256,7 @@ GL_PREFIX(_dispatch_stub_822):
 GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6584(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31208,13 +31266,13 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6584(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6584(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31224,7 +31282,7 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6584(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EGLImageTargetRenderbufferStorageOES), .-GL_PREFIX(EGLImageTargetRenderbufferStorageOES)
@@ -31235,7 +31293,7 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 GL_PREFIX(EGLImageTargetTexture2DOES):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6592(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31245,13 +31303,13 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6592(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6592(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31261,7 +31319,7 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6592(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EGLImageTargetTexture2DOES), .-GL_PREFIX(EGLImageTargetTexture2DOES)
@@ -31526,7 +31584,7 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	.globl GL_PREFIX(PointParameteriv) ; .set GL_PREFIX(PointParameteriv), GL_PREFIX(PointParameterivNV)
 	.globl GL_PREFIX(DeleteVertexArrays) ; .set GL_PREFIX(DeleteVertexArrays), GL_PREFIX(_dispatch_stub_765)
 	.globl GL_PREFIX(IsVertexArray) ; .set GL_PREFIX(IsVertexArray), GL_PREFIX(_dispatch_stub_767)
-	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_775)
+	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_777)
 	.globl GL_PREFIX(BindFramebuffer) ; .set GL_PREFIX(BindFramebuffer), GL_PREFIX(BindFramebufferEXT)
 	.globl GL_PREFIX(BindRenderbuffer) ; .set GL_PREFIX(BindRenderbuffer), GL_PREFIX(BindRenderbufferEXT)
 	.globl GL_PREFIX(CheckFramebufferStatus) ; .set GL_PREFIX(CheckFramebufferStatus), GL_PREFIX(CheckFramebufferStatusEXT)
@@ -31544,7 +31602,7 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	.globl GL_PREFIX(IsFramebuffer) ; .set GL_PREFIX(IsFramebuffer), GL_PREFIX(IsFramebufferEXT)
 	.globl GL_PREFIX(IsRenderbuffer) ; .set GL_PREFIX(IsRenderbuffer), GL_PREFIX(IsRenderbufferEXT)
 	.globl GL_PREFIX(RenderbufferStorage) ; .set GL_PREFIX(RenderbufferStorage), GL_PREFIX(RenderbufferStorageEXT)
-	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_793)
+	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_795)
 	.globl GL_PREFIX(FramebufferTextureLayer) ; .set GL_PREFIX(FramebufferTextureLayer), GL_PREFIX(FramebufferTextureLayerEXT)
 	.globl GL_PREFIX(BeginTransformFeedback) ; .set GL_PREFIX(BeginTransformFeedback), GL_PREFIX(BeginTransformFeedbackEXT)
 	.globl GL_PREFIX(BindBufferBase) ; .set GL_PREFIX(BindBufferBase), GL_PREFIX(BindBufferBaseEXT)
diff --git a/src/mapi/glapi/glapi_x86.S b/src/mapi/glapi/glapi_x86.S
index 872df4a1cb..0a9efded9e 100644
--- a/src/mapi/glapi/glapi_x86.S
+++ b/src/mapi/glapi/glapi_x86.S
@@ -948,10 +948,12 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(ProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV, ProgramNamedParameter4dvNV@16)
 	GL_STUB(ProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV, ProgramNamedParameter4fNV@28)
 	GL_STUB(ProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV, ProgramNamedParameter4fvNV@16)
-	GL_STUB(_dispatch_stub_774, _gloffset_DepthBoundsEXT, _dispatch_stub_774@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_774, _dispatch_stub_774@16))
-	GL_STUB(_dispatch_stub_775, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_775@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_775, _dispatch_stub_775@8))
+	GL_STUB(PrimitiveRestartIndexNV, _gloffset_PrimitiveRestartIndexNV, PrimitiveRestartIndexNV@4)
+	GL_STUB(PrimitiveRestartNV, _gloffset_PrimitiveRestartNV, PrimitiveRestartNV@0)
+	GL_STUB(_dispatch_stub_776, _gloffset_DepthBoundsEXT, _dispatch_stub_776@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_776, _dispatch_stub_776@16))
+	GL_STUB(_dispatch_stub_777, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_777@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_777, _dispatch_stub_777@8))
 	GL_STUB(BindFramebufferEXT, _gloffset_BindFramebufferEXT, BindFramebufferEXT@8)
 	GL_STUB(BindRenderbufferEXT, _gloffset_BindRenderbufferEXT, BindRenderbufferEXT@8)
 	GL_STUB(CheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
@@ -969,12 +971,12 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(IsFramebufferEXT, _gloffset_IsFramebufferEXT, IsFramebufferEXT@4)
 	GL_STUB(IsRenderbufferEXT, _gloffset_IsRenderbufferEXT, IsRenderbufferEXT@4)
 	GL_STUB(RenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT, RenderbufferStorageEXT@16)
-	GL_STUB(_dispatch_stub_793, _gloffset_BlitFramebufferEXT, _dispatch_stub_793@40)
-	HIDDEN(GL_PREFIX(_dispatch_stub_793, _dispatch_stub_793@40))
-	GL_STUB(_dispatch_stub_794, _gloffset_BufferParameteriAPPLE, _dispatch_stub_794@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_794, _dispatch_stub_794@12))
-	GL_STUB(_dispatch_stub_795, _gloffset_FlushMappedBufferRangeAPPLE, _dispatch_stub_795@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_795, _dispatch_stub_795@12))
+	GL_STUB(_dispatch_stub_795, _gloffset_BlitFramebufferEXT, _dispatch_stub_795@40)
+	HIDDEN(GL_PREFIX(_dispatch_stub_795, _dispatch_stub_795@40))
+	GL_STUB(_dispatch_stub_796, _gloffset_BufferParameteriAPPLE, _dispatch_stub_796@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_796, _dispatch_stub_796@12))
+	GL_STUB(_dispatch_stub_797, _gloffset_FlushMappedBufferRangeAPPLE, _dispatch_stub_797@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_797, _dispatch_stub_797@12))
 	GL_STUB(FramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
 	GL_STUB(ColorMaskIndexedEXT, _gloffset_ColorMaskIndexedEXT, ColorMaskIndexedEXT@20)
 	GL_STUB(DisableIndexedEXT, _gloffset_DisableIndexedEXT, DisableIndexedEXT@8)
@@ -992,23 +994,23 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(GetTransformFeedbackVaryingEXT, _gloffset_GetTransformFeedbackVaryingEXT, GetTransformFeedbackVaryingEXT@28)
 	GL_STUB(TransformFeedbackVaryingsEXT, _gloffset_TransformFeedbackVaryingsEXT, TransformFeedbackVaryingsEXT@16)
 	GL_STUB(ProvokingVertexEXT, _gloffset_ProvokingVertexEXT, ProvokingVertexEXT@4)
-	GL_STUB(_dispatch_stub_813, _gloffset_GetTexParameterPointervAPPLE, _dispatch_stub_813@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_813, _dispatch_stub_813@12))
-	GL_STUB(_dispatch_stub_814, _gloffset_TextureRangeAPPLE, _dispatch_stub_814@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_814, _dispatch_stub_814@12))
+	GL_STUB(_dispatch_stub_815, _gloffset_GetTexParameterPointervAPPLE, _dispatch_stub_815@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_815, _dispatch_stub_815@12))
+	GL_STUB(_dispatch_stub_816, _gloffset_TextureRangeAPPLE, _dispatch_stub_816@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_816, _dispatch_stub_816@12))
 	GL_STUB(GetObjectParameterivAPPLE, _gloffset_GetObjectParameterivAPPLE, GetObjectParameterivAPPLE@16)
 	GL_STUB(ObjectPurgeableAPPLE, _gloffset_ObjectPurgeableAPPLE, ObjectPurgeableAPPLE@12)
 	GL_STUB(ObjectUnpurgeableAPPLE, _gloffset_ObjectUnpurgeableAPPLE, ObjectUnpurgeableAPPLE@12)
-	GL_STUB(_dispatch_stub_818, _gloffset_StencilFuncSeparateATI, _dispatch_stub_818@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_818, _dispatch_stub_818@16))
-	GL_STUB(_dispatch_stub_819, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_819@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_819, _dispatch_stub_819@16))
-	GL_STUB(_dispatch_stub_820, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_820@16)
+	GL_STUB(_dispatch_stub_820, _gloffset_StencilFuncSeparateATI, _dispatch_stub_820@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_820, _dispatch_stub_820@16))
-	GL_STUB(_dispatch_stub_821, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_821@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_821, _dispatch_stub_821@12))
-	GL_STUB(_dispatch_stub_822, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_822@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_822, _dispatch_stub_822@12))
+	GL_STUB(_dispatch_stub_821, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_821@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_821, _dispatch_stub_821@16))
+	GL_STUB(_dispatch_stub_822, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_822@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_822, _dispatch_stub_822@16))
+	GL_STUB(_dispatch_stub_823, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_823@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_823, _dispatch_stub_823@12))
+	GL_STUB(_dispatch_stub_824, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_824@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_824, _dispatch_stub_824@12))
 	GL_STUB(EGLImageTargetRenderbufferStorageOES, _gloffset_EGLImageTargetRenderbufferStorageOES, EGLImageTargetRenderbufferStorageOES@8)
 	GL_STUB(EGLImageTargetTexture2DOES, _gloffset_EGLImageTargetTexture2DOES, EGLImageTargetTexture2DOES@8)
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
@@ -1271,7 +1273,7 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB_ALIAS(PointParameteriv, _gloffset_PointParameterivNV, PointParameteriv@8, PointParameterivNV, PointParameterivNV@8)
 	GL_STUB_ALIAS(DeleteVertexArrays, _gloffset_DeleteVertexArraysAPPLE, DeleteVertexArrays@8, _dispatch_stub_765, _dispatch_stub_765@8)
 	GL_STUB_ALIAS(IsVertexArray, _gloffset_IsVertexArrayAPPLE, IsVertexArray@4, _dispatch_stub_767, _dispatch_stub_767@4)
-	GL_STUB_ALIAS(BlendEquationSeparate, _gloffset_BlendEquationSeparateEXT, BlendEquationSeparate@8, _dispatch_stub_775, _dispatch_stub_775@8)
+	GL_STUB_ALIAS(BlendEquationSeparate, _gloffset_BlendEquationSeparateEXT, BlendEquationSeparate@8, _dispatch_stub_777, _dispatch_stub_777@8)
 	GL_STUB_ALIAS(BindFramebuffer, _gloffset_BindFramebufferEXT, BindFramebuffer@8, BindFramebufferEXT, BindFramebufferEXT@8)
 	GL_STUB_ALIAS(BindRenderbuffer, _gloffset_BindRenderbufferEXT, BindRenderbuffer@8, BindRenderbufferEXT, BindRenderbufferEXT@8)
 	GL_STUB_ALIAS(CheckFramebufferStatus, _gloffset_CheckFramebufferStatusEXT, CheckFramebufferStatus@4, CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
@@ -1289,7 +1291,7 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB_ALIAS(IsFramebuffer, _gloffset_IsFramebufferEXT, IsFramebuffer@4, IsFramebufferEXT, IsFramebufferEXT@4)
 	GL_STUB_ALIAS(IsRenderbuffer, _gloffset_IsRenderbufferEXT, IsRenderbuffer@4, IsRenderbufferEXT, IsRenderbufferEXT@4)
 	GL_STUB_ALIAS(RenderbufferStorage, _gloffset_RenderbufferStorageEXT, RenderbufferStorage@16, RenderbufferStorageEXT, RenderbufferStorageEXT@16)
-	GL_STUB_ALIAS(BlitFramebuffer, _gloffset_BlitFramebufferEXT, BlitFramebuffer@40, _dispatch_stub_793, _dispatch_stub_793@40)
+	GL_STUB_ALIAS(BlitFramebuffer, _gloffset_BlitFramebufferEXT, BlitFramebuffer@40, _dispatch_stub_795, _dispatch_stub_795@40)
 	GL_STUB_ALIAS(FramebufferTextureLayer, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayer@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
 	GL_STUB_ALIAS(BeginTransformFeedback, _gloffset_BeginTransformFeedbackEXT, BeginTransformFeedback@4, BeginTransformFeedbackEXT, BeginTransformFeedbackEXT@4)
 	GL_STUB_ALIAS(BindBufferBase, _gloffset_BindBufferBaseEXT, BindBufferBase@12, BindBufferBaseEXT, BindBufferBaseEXT@12)
diff --git a/src/mapi/glapi/glapidispatch.h b/src/mapi/glapi/glapidispatch.h
index 1d03f4cc50..582fc01556 100644
--- a/src/mapi/glapi/glapidispatch.h
+++ b/src/mapi/glapi/glapidispatch.h
@@ -2383,6 +2383,12 @@
 #define CALL_ProgramNamedParameter4fvNV(disp, parameters) (*((disp)->ProgramNamedParameter4fvNV)) parameters
 #define GET_ProgramNamedParameter4fvNV(disp) ((disp)->ProgramNamedParameter4fvNV)
 #define SET_ProgramNamedParameter4fvNV(disp, fn) ((disp)->ProgramNamedParameter4fvNV = fn)
+#define CALL_PrimitiveRestartIndexNV(disp, parameters) (*((disp)->PrimitiveRestartIndexNV)) parameters
+#define GET_PrimitiveRestartIndexNV(disp) ((disp)->PrimitiveRestartIndexNV)
+#define SET_PrimitiveRestartIndexNV(disp, fn) ((disp)->PrimitiveRestartIndexNV = fn)
+#define CALL_PrimitiveRestartNV(disp, parameters) (*((disp)->PrimitiveRestartNV)) parameters
+#define GET_PrimitiveRestartNV(disp) ((disp)->PrimitiveRestartNV)
+#define SET_PrimitiveRestartNV(disp, fn) ((disp)->PrimitiveRestartNV = fn)
 #define CALL_DepthBoundsEXT(disp, parameters) (*((disp)->DepthBoundsEXT)) parameters
 #define GET_DepthBoundsEXT(disp) ((disp)->DepthBoundsEXT)
 #define SET_DepthBoundsEXT(disp, fn) ((disp)->DepthBoundsEXT = fn)
@@ -2539,7 +2545,7 @@
 
 #else
 
-#define driDispatchRemapTable_size 417
+#define driDispatchRemapTable_size 419
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -2908,57 +2914,59 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define ProgramNamedParameter4dvNV_remap_index 363
 #define ProgramNamedParameter4fNV_remap_index 364
 #define ProgramNamedParameter4fvNV_remap_index 365
-#define DepthBoundsEXT_remap_index 366
-#define BlendEquationSeparateEXT_remap_index 367
-#define BindFramebufferEXT_remap_index 368
-#define BindRenderbufferEXT_remap_index 369
-#define CheckFramebufferStatusEXT_remap_index 370
-#define DeleteFramebuffersEXT_remap_index 371
-#define DeleteRenderbuffersEXT_remap_index 372
-#define FramebufferRenderbufferEXT_remap_index 373
-#define FramebufferTexture1DEXT_remap_index 374
-#define FramebufferTexture2DEXT_remap_index 375
-#define FramebufferTexture3DEXT_remap_index 376
-#define GenFramebuffersEXT_remap_index 377
-#define GenRenderbuffersEXT_remap_index 378
-#define GenerateMipmapEXT_remap_index 379
-#define GetFramebufferAttachmentParameterivEXT_remap_index 380
-#define GetRenderbufferParameterivEXT_remap_index 381
-#define IsFramebufferEXT_remap_index 382
-#define IsRenderbufferEXT_remap_index 383
-#define RenderbufferStorageEXT_remap_index 384
-#define BlitFramebufferEXT_remap_index 385
-#define BufferParameteriAPPLE_remap_index 386
-#define FlushMappedBufferRangeAPPLE_remap_index 387
-#define FramebufferTextureLayerEXT_remap_index 388
-#define ColorMaskIndexedEXT_remap_index 389
-#define DisableIndexedEXT_remap_index 390
-#define EnableIndexedEXT_remap_index 391
-#define GetBooleanIndexedvEXT_remap_index 392
-#define GetIntegerIndexedvEXT_remap_index 393
-#define IsEnabledIndexedEXT_remap_index 394
-#define BeginConditionalRenderNV_remap_index 395
-#define EndConditionalRenderNV_remap_index 396
-#define BeginTransformFeedbackEXT_remap_index 397
-#define BindBufferBaseEXT_remap_index 398
-#define BindBufferOffsetEXT_remap_index 399
-#define BindBufferRangeEXT_remap_index 400
-#define EndTransformFeedbackEXT_remap_index 401
-#define GetTransformFeedbackVaryingEXT_remap_index 402
-#define TransformFeedbackVaryingsEXT_remap_index 403
-#define ProvokingVertexEXT_remap_index 404
-#define GetTexParameterPointervAPPLE_remap_index 405
-#define TextureRangeAPPLE_remap_index 406
-#define GetObjectParameterivAPPLE_remap_index 407
-#define ObjectPurgeableAPPLE_remap_index 408
-#define ObjectUnpurgeableAPPLE_remap_index 409
-#define StencilFuncSeparateATI_remap_index 410
-#define ProgramEnvParameters4fvEXT_remap_index 411
-#define ProgramLocalParameters4fvEXT_remap_index 412
-#define GetQueryObjecti64vEXT_remap_index 413
-#define GetQueryObjectui64vEXT_remap_index 414
-#define EGLImageTargetRenderbufferStorageOES_remap_index 415
-#define EGLImageTargetTexture2DOES_remap_index 416
+#define PrimitiveRestartIndexNV_remap_index 366
+#define PrimitiveRestartNV_remap_index 367
+#define DepthBoundsEXT_remap_index 368
+#define BlendEquationSeparateEXT_remap_index 369
+#define BindFramebufferEXT_remap_index 370
+#define BindRenderbufferEXT_remap_index 371
+#define CheckFramebufferStatusEXT_remap_index 372
+#define DeleteFramebuffersEXT_remap_index 373
+#define DeleteRenderbuffersEXT_remap_index 374
+#define FramebufferRenderbufferEXT_remap_index 375
+#define FramebufferTexture1DEXT_remap_index 376
+#define FramebufferTexture2DEXT_remap_index 377
+#define FramebufferTexture3DEXT_remap_index 378
+#define GenFramebuffersEXT_remap_index 379
+#define GenRenderbuffersEXT_remap_index 380
+#define GenerateMipmapEXT_remap_index 381
+#define GetFramebufferAttachmentParameterivEXT_remap_index 382
+#define GetRenderbufferParameterivEXT_remap_index 383
+#define IsFramebufferEXT_remap_index 384
+#define IsRenderbufferEXT_remap_index 385
+#define RenderbufferStorageEXT_remap_index 386
+#define BlitFramebufferEXT_remap_index 387
+#define BufferParameteriAPPLE_remap_index 388
+#define FlushMappedBufferRangeAPPLE_remap_index 389
+#define FramebufferTextureLayerEXT_remap_index 390
+#define ColorMaskIndexedEXT_remap_index 391
+#define DisableIndexedEXT_remap_index 392
+#define EnableIndexedEXT_remap_index 393
+#define GetBooleanIndexedvEXT_remap_index 394
+#define GetIntegerIndexedvEXT_remap_index 395
+#define IsEnabledIndexedEXT_remap_index 396
+#define BeginConditionalRenderNV_remap_index 397
+#define EndConditionalRenderNV_remap_index 398
+#define BeginTransformFeedbackEXT_remap_index 399
+#define BindBufferBaseEXT_remap_index 400
+#define BindBufferOffsetEXT_remap_index 401
+#define BindBufferRangeEXT_remap_index 402
+#define EndTransformFeedbackEXT_remap_index 403
+#define GetTransformFeedbackVaryingEXT_remap_index 404
+#define TransformFeedbackVaryingsEXT_remap_index 405
+#define ProvokingVertexEXT_remap_index 406
+#define GetTexParameterPointervAPPLE_remap_index 407
+#define TextureRangeAPPLE_remap_index 408
+#define GetObjectParameterivAPPLE_remap_index 409
+#define ObjectPurgeableAPPLE_remap_index 410
+#define ObjectUnpurgeableAPPLE_remap_index 411
+#define StencilFuncSeparateATI_remap_index 412
+#define ProgramEnvParameters4fvEXT_remap_index 413
+#define ProgramLocalParameters4fvEXT_remap_index 414
+#define GetQueryObjecti64vEXT_remap_index 415
+#define GetQueryObjectui64vEXT_remap_index 416
+#define EGLImageTargetRenderbufferStorageOES_remap_index 417
+#define EGLImageTargetTexture2DOES_remap_index 418
 
 #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])
@@ -4058,6 +4066,12 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_ProgramNamedParameter4fvNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLsizei, const GLubyte *, const GLfloat *)), driDispatchRemapTable[ProgramNamedParameter4fvNV_remap_index], parameters)
 #define GET_ProgramNamedParameter4fvNV(disp) GET_by_offset(disp, driDispatchRemapTable[ProgramNamedParameter4fvNV_remap_index])
 #define SET_ProgramNamedParameter4fvNV(disp, fn) SET_by_offset(disp, driDispatchRemapTable[ProgramNamedParameter4fvNV_remap_index], fn)
+#define CALL_PrimitiveRestartIndexNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), driDispatchRemapTable[PrimitiveRestartIndexNV_remap_index], parameters)
+#define GET_PrimitiveRestartIndexNV(disp) GET_by_offset(disp, driDispatchRemapTable[PrimitiveRestartIndexNV_remap_index])
+#define SET_PrimitiveRestartIndexNV(disp, fn) SET_by_offset(disp, driDispatchRemapTable[PrimitiveRestartIndexNV_remap_index], fn)
+#define CALL_PrimitiveRestartNV(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(void)), driDispatchRemapTable[PrimitiveRestartNV_remap_index], parameters)
+#define GET_PrimitiveRestartNV(disp) GET_by_offset(disp, driDispatchRemapTable[PrimitiveRestartNV_remap_index])
+#define SET_PrimitiveRestartNV(disp, fn) SET_by_offset(disp, driDispatchRemapTable[PrimitiveRestartNV_remap_index], fn)
 #define CALL_DepthBoundsEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLclampd, GLclampd)), driDispatchRemapTable[DepthBoundsEXT_remap_index], parameters)
 #define GET_DepthBoundsEXT(disp) GET_by_offset(disp, driDispatchRemapTable[DepthBoundsEXT_remap_index])
 #define SET_DepthBoundsEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[DepthBoundsEXT_remap_index], fn)
diff --git a/src/mapi/glapi/glapioffsets.h b/src/mapi/glapi/glapioffsets.h
index 48d8343195..9bb143574b 100644
--- a/src/mapi/glapi/glapioffsets.h
+++ b/src/mapi/glapi/glapioffsets.h
@@ -808,58 +808,60 @@
 #define _gloffset_ProgramNamedParameter4dvNV 771
 #define _gloffset_ProgramNamedParameter4fNV 772
 #define _gloffset_ProgramNamedParameter4fvNV 773
-#define _gloffset_DepthBoundsEXT 774
-#define _gloffset_BlendEquationSeparateEXT 775
-#define _gloffset_BindFramebufferEXT 776
-#define _gloffset_BindRenderbufferEXT 777
-#define _gloffset_CheckFramebufferStatusEXT 778
-#define _gloffset_DeleteFramebuffersEXT 779
-#define _gloffset_DeleteRenderbuffersEXT 780
-#define _gloffset_FramebufferRenderbufferEXT 781
-#define _gloffset_FramebufferTexture1DEXT 782
-#define _gloffset_FramebufferTexture2DEXT 783
-#define _gloffset_FramebufferTexture3DEXT 784
-#define _gloffset_GenFramebuffersEXT 785
-#define _gloffset_GenRenderbuffersEXT 786
-#define _gloffset_GenerateMipmapEXT 787
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 788
-#define _gloffset_GetRenderbufferParameterivEXT 789
-#define _gloffset_IsFramebufferEXT 790
-#define _gloffset_IsRenderbufferEXT 791
-#define _gloffset_RenderbufferStorageEXT 792
-#define _gloffset_BlitFramebufferEXT 793
-#define _gloffset_BufferParameteriAPPLE 794
-#define _gloffset_FlushMappedBufferRangeAPPLE 795
-#define _gloffset_FramebufferTextureLayerEXT 796
-#define _gloffset_ColorMaskIndexedEXT 797
-#define _gloffset_DisableIndexedEXT 798
-#define _gloffset_EnableIndexedEXT 799
-#define _gloffset_GetBooleanIndexedvEXT 800
-#define _gloffset_GetIntegerIndexedvEXT 801
-#define _gloffset_IsEnabledIndexedEXT 802
-#define _gloffset_BeginConditionalRenderNV 803
-#define _gloffset_EndConditionalRenderNV 804
-#define _gloffset_BeginTransformFeedbackEXT 805
-#define _gloffset_BindBufferBaseEXT 806
-#define _gloffset_BindBufferOffsetEXT 807
-#define _gloffset_BindBufferRangeEXT 808
-#define _gloffset_EndTransformFeedbackEXT 809
-#define _gloffset_GetTransformFeedbackVaryingEXT 810
-#define _gloffset_TransformFeedbackVaryingsEXT 811
-#define _gloffset_ProvokingVertexEXT 812
-#define _gloffset_GetTexParameterPointervAPPLE 813
-#define _gloffset_TextureRangeAPPLE 814
-#define _gloffset_GetObjectParameterivAPPLE 815
-#define _gloffset_ObjectPurgeableAPPLE 816
-#define _gloffset_ObjectUnpurgeableAPPLE 817
-#define _gloffset_StencilFuncSeparateATI 818
-#define _gloffset_ProgramEnvParameters4fvEXT 819
-#define _gloffset_ProgramLocalParameters4fvEXT 820
-#define _gloffset_GetQueryObjecti64vEXT 821
-#define _gloffset_GetQueryObjectui64vEXT 822
-#define _gloffset_EGLImageTargetRenderbufferStorageOES 823
-#define _gloffset_EGLImageTargetTexture2DOES 824
-#define _gloffset_FIRST_DYNAMIC 825
+#define _gloffset_PrimitiveRestartIndexNV 774
+#define _gloffset_PrimitiveRestartNV 775
+#define _gloffset_DepthBoundsEXT 776
+#define _gloffset_BlendEquationSeparateEXT 777
+#define _gloffset_BindFramebufferEXT 778
+#define _gloffset_BindRenderbufferEXT 779
+#define _gloffset_CheckFramebufferStatusEXT 780
+#define _gloffset_DeleteFramebuffersEXT 781
+#define _gloffset_DeleteRenderbuffersEXT 782
+#define _gloffset_FramebufferRenderbufferEXT 783
+#define _gloffset_FramebufferTexture1DEXT 784
+#define _gloffset_FramebufferTexture2DEXT 785
+#define _gloffset_FramebufferTexture3DEXT 786
+#define _gloffset_GenFramebuffersEXT 787
+#define _gloffset_GenRenderbuffersEXT 788
+#define _gloffset_GenerateMipmapEXT 789
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 790
+#define _gloffset_GetRenderbufferParameterivEXT 791
+#define _gloffset_IsFramebufferEXT 792
+#define _gloffset_IsRenderbufferEXT 793
+#define _gloffset_RenderbufferStorageEXT 794
+#define _gloffset_BlitFramebufferEXT 795
+#define _gloffset_BufferParameteriAPPLE 796
+#define _gloffset_FlushMappedBufferRangeAPPLE 797
+#define _gloffset_FramebufferTextureLayerEXT 798
+#define _gloffset_ColorMaskIndexedEXT 799
+#define _gloffset_DisableIndexedEXT 800
+#define _gloffset_EnableIndexedEXT 801
+#define _gloffset_GetBooleanIndexedvEXT 802
+#define _gloffset_GetIntegerIndexedvEXT 803
+#define _gloffset_IsEnabledIndexedEXT 804
+#define _gloffset_BeginConditionalRenderNV 805
+#define _gloffset_EndConditionalRenderNV 806
+#define _gloffset_BeginTransformFeedbackEXT 807
+#define _gloffset_BindBufferBaseEXT 808
+#define _gloffset_BindBufferOffsetEXT 809
+#define _gloffset_BindBufferRangeEXT 810
+#define _gloffset_EndTransformFeedbackEXT 811
+#define _gloffset_GetTransformFeedbackVaryingEXT 812
+#define _gloffset_TransformFeedbackVaryingsEXT 813
+#define _gloffset_ProvokingVertexEXT 814
+#define _gloffset_GetTexParameterPointervAPPLE 815
+#define _gloffset_TextureRangeAPPLE 816
+#define _gloffset_GetObjectParameterivAPPLE 817
+#define _gloffset_ObjectPurgeableAPPLE 818
+#define _gloffset_ObjectUnpurgeableAPPLE 819
+#define _gloffset_StencilFuncSeparateATI 820
+#define _gloffset_ProgramEnvParameters4fvEXT 821
+#define _gloffset_ProgramLocalParameters4fvEXT 822
+#define _gloffset_GetQueryObjecti64vEXT 823
+#define _gloffset_GetQueryObjectui64vEXT 824
+#define _gloffset_EGLImageTargetRenderbufferStorageOES 825
+#define _gloffset_EGLImageTargetTexture2DOES 826
+#define _gloffset_FIRST_DYNAMIC 827
 
 #else
 
@@ -1229,6 +1231,8 @@
 #define _gloffset_ProgramNamedParameter4dvNV driDispatchRemapTable[ProgramNamedParameter4dvNV_remap_index]
 #define _gloffset_ProgramNamedParameter4fNV driDispatchRemapTable[ProgramNamedParameter4fNV_remap_index]
 #define _gloffset_ProgramNamedParameter4fvNV driDispatchRemapTable[ProgramNamedParameter4fvNV_remap_index]
+#define _gloffset_PrimitiveRestartIndexNV driDispatchRemapTable[PrimitiveRestartIndexNV_remap_index]
+#define _gloffset_PrimitiveRestartNV driDispatchRemapTable[PrimitiveRestartNV_remap_index]
 #define _gloffset_DepthBoundsEXT driDispatchRemapTable[DepthBoundsEXT_remap_index]
 #define _gloffset_BlendEquationSeparateEXT driDispatchRemapTable[BlendEquationSeparateEXT_remap_index]
 #define _gloffset_BindFramebufferEXT driDispatchRemapTable[BindFramebufferEXT_remap_index]
diff --git a/src/mapi/glapi/glapitable.h b/src/mapi/glapi/glapitable.h
index 3b987d1742..b9802da8e4 100644
--- a/src/mapi/glapi/glapitable.h
+++ b/src/mapi/glapi/glapitable.h
@@ -814,57 +814,59 @@ struct _glapi_table
    void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 771 */
    void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 772 */
    void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 773 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 774 */
-   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 775 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 776 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 777 */
-   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 778 */
-   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 779 */
-   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 780 */
-   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 781 */
-   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 782 */
-   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 783 */
-   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 784 */
-   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 785 */
-   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 786 */
-   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 787 */
-   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 788 */
-   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 789 */
-   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 790 */
-   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 791 */
-   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 792 */
-   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 793 */
-   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 794 */
-   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 795 */
-   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 796 */
-   void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 797 */
-   void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 798 */
-   void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 799 */
-   void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 800 */
-   void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 801 */
-   GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 802 */
-   void (GLAPIENTRYP BeginConditionalRenderNV)(GLuint query, GLenum mode); /* 803 */
-   void (GLAPIENTRYP EndConditionalRenderNV)(void); /* 804 */
-   void (GLAPIENTRYP BeginTransformFeedbackEXT)(GLenum mode); /* 805 */
-   void (GLAPIENTRYP BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer); /* 806 */
-   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 807 */
-   void (GLAPIENTRYP BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 808 */
-   void (GLAPIENTRYP EndTransformFeedbackEXT)(void); /* 809 */
-   void (GLAPIENTRYP GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 810 */
-   void (GLAPIENTRYP TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode); /* 811 */
-   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 812 */
-   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 813 */
-   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 814 */
-   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 815 */
-   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 816 */
-   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 817 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 818 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 819 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 820 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 821 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 822 */
-   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 823 */
-   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 824 */
+   void (GLAPIENTRYP PrimitiveRestartIndexNV)(GLuint index); /* 774 */
+   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 775 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 776 */
+   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 777 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 778 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 779 */
+   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 780 */
+   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 781 */
+   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 782 */
+   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 783 */
+   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 784 */
+   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 785 */
+   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 786 */
+   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 787 */
+   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 788 */
+   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 789 */
+   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 790 */
+   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 791 */
+   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 792 */
+   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 793 */
+   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 794 */
+   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 795 */
+   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 796 */
+   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 797 */
+   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 798 */
+   void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 799 */
+   void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 800 */
+   void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 801 */
+   void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 802 */
+   void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 803 */
+   GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 804 */
+   void (GLAPIENTRYP BeginConditionalRenderNV)(GLuint query, GLenum mode); /* 805 */
+   void (GLAPIENTRYP EndConditionalRenderNV)(void); /* 806 */
+   void (GLAPIENTRYP BeginTransformFeedbackEXT)(GLenum mode); /* 807 */
+   void (GLAPIENTRYP BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer); /* 808 */
+   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 809 */
+   void (GLAPIENTRYP BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 810 */
+   void (GLAPIENTRYP EndTransformFeedbackEXT)(void); /* 811 */
+   void (GLAPIENTRYP GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 812 */
+   void (GLAPIENTRYP TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode); /* 813 */
+   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 814 */
+   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 815 */
+   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 816 */
+   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 817 */
+   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 818 */
+   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 819 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 820 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 821 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 822 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 823 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 824 */
+   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 825 */
+   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 826 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/src/mapi/glapi/glapitemp.h b/src/mapi/glapi/glapitemp.h
index ac81a7dd7f..ac8cf9ec97 100644
--- a/src/mapi/glapi/glapitemp.h
+++ b/src/mapi/glapi/glapitemp.h
@@ -5354,9 +5354,19 @@ KEYWORD1 void KEYWORD2 NAME(ProgramNamedParameter4fvNV)(GLuint id, GLsizei len,
    DISPATCH(ProgramNamedParameter4fvNV, (id, len, name, v), (F, "glProgramNamedParameter4fvNV(%d, %d, %p, %p);\n", id, len, (const void *) name, (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLclampd zmin, GLclampd zmax);
+KEYWORD1 void KEYWORD2 NAME(PrimitiveRestartIndexNV)(GLuint index)
+{
+   DISPATCH(PrimitiveRestartIndexNV, (index), (F, "glPrimitiveRestartIndexNV(%d);\n", index));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PrimitiveRestartNV)(void)
+{
+   DISPATCH(PrimitiveRestartNV, (), (F, "glPrimitiveRestartNV();\n"));
+}
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_776)(GLclampd zmin, GLclampd zmax);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLclampd zmin, GLclampd zmax)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_776)(GLclampd zmin, GLclampd zmax)
 {
    DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
 }
@@ -5366,9 +5376,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA)
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparate(0x%x, 0x%x);\n", modeRGB, modeA));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLenum modeRGB, GLenum modeA);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_777)(GLenum modeRGB, GLenum modeA);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLenum modeRGB, GLenum modeA)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_777)(GLenum modeRGB, GLenum modeA)
 {
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparateEXT(0x%x, 0x%x);\n", modeRGB, modeA));
 }
@@ -5548,23 +5558,23 @@ KEYWORD1 void KEYWORD2 NAME(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint src
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebuffer(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_793)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_795)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_793)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_795)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebufferEXT(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_794)(GLenum target, GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_796)(GLenum target, GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_794)(GLenum target, GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_796)(GLenum target, GLenum pname, GLint param)
 {
    DISPATCH(BufferParameteriAPPLE, (target, pname, param), (F, "glBufferParameteriAPPLE(0x%x, 0x%x, %d);\n", target, pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_795)(GLenum target, GLintptr offset, GLsizeiptr size);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_797)(GLenum target, GLintptr offset, GLsizeiptr size);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_795)(GLenum target, GLintptr offset, GLsizeiptr size)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_797)(GLenum target, GLintptr offset, GLsizeiptr size)
 {
    DISPATCH(FlushMappedBufferRangeAPPLE, (target, offset, size), (F, "glFlushMappedBufferRangeAPPLE(0x%x, %d, %d);\n", target, offset, size));
 }
@@ -5694,16 +5704,16 @@ KEYWORD1 void KEYWORD2 NAME(ProvokingVertex)(GLenum mode)
    DISPATCH(ProvokingVertexEXT, (mode), (F, "glProvokingVertex(0x%x);\n", mode));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_813)(GLenum target, GLenum pname, GLvoid ** params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_815)(GLenum target, GLenum pname, GLvoid ** params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_813)(GLenum target, GLenum pname, GLvoid ** params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_815)(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_814)(GLenum target, GLsizei length, GLvoid * pointer);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_816)(GLenum target, GLsizei length, GLvoid * pointer);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_814)(GLenum target, GLsizei length, GLvoid * pointer)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_816)(GLenum target, GLsizei length, GLvoid * pointer)
 {
    DISPATCH(TextureRangeAPPLE, (target, length, pointer), (F, "glTextureRangeAPPLE(0x%x, %d, %p);\n", target, length, (const void *) pointer));
 }
@@ -5723,37 +5733,37 @@ KEYWORD1 GLenum KEYWORD2 NAME(ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint
    RETURN_DISPATCH(ObjectUnpurgeableAPPLE, (objectType, name, option), (F, "glObjectUnpurgeableAPPLE(0x%x, %d, 0x%x);\n", objectType, name, option));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_818)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_820)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_818)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_820)(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_819)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_821)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_819)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_821)(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_820)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_822)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_820)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_822)(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_821)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_823)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_821)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_823)(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_822)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_824)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_822)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_824)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
@@ -6695,8 +6705,10 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(ProgramNamedParameter4dvNV),
    TABLE_ENTRY(ProgramNamedParameter4fNV),
    TABLE_ENTRY(ProgramNamedParameter4fvNV),
-   TABLE_ENTRY(_dispatch_stub_774),
-   TABLE_ENTRY(_dispatch_stub_775),
+   TABLE_ENTRY(PrimitiveRestartIndexNV),
+   TABLE_ENTRY(PrimitiveRestartNV),
+   TABLE_ENTRY(_dispatch_stub_776),
+   TABLE_ENTRY(_dispatch_stub_777),
    TABLE_ENTRY(BindFramebufferEXT),
    TABLE_ENTRY(BindRenderbufferEXT),
    TABLE_ENTRY(CheckFramebufferStatusEXT),
@@ -6714,9 +6726,9 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(IsFramebufferEXT),
    TABLE_ENTRY(IsRenderbufferEXT),
    TABLE_ENTRY(RenderbufferStorageEXT),
-   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(FramebufferTextureLayerEXT),
    TABLE_ENTRY(ColorMaskIndexedEXT),
    TABLE_ENTRY(DisableIndexedEXT),
@@ -6734,16 +6746,16 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(GetTransformFeedbackVaryingEXT),
    TABLE_ENTRY(TransformFeedbackVaryingsEXT),
    TABLE_ENTRY(ProvokingVertexEXT),
-   TABLE_ENTRY(_dispatch_stub_813),
-   TABLE_ENTRY(_dispatch_stub_814),
+   TABLE_ENTRY(_dispatch_stub_815),
+   TABLE_ENTRY(_dispatch_stub_816),
    TABLE_ENTRY(GetObjectParameterivAPPLE),
    TABLE_ENTRY(ObjectPurgeableAPPLE),
    TABLE_ENTRY(ObjectUnpurgeableAPPLE),
-   TABLE_ENTRY(_dispatch_stub_818),
-   TABLE_ENTRY(_dispatch_stub_819),
    TABLE_ENTRY(_dispatch_stub_820),
    TABLE_ENTRY(_dispatch_stub_821),
    TABLE_ENTRY(_dispatch_stub_822),
+   TABLE_ENTRY(_dispatch_stub_823),
+   TABLE_ENTRY(_dispatch_stub_824),
    TABLE_ENTRY(EGLImageTargetRenderbufferStorageOES),
    TABLE_ENTRY(EGLImageTargetTexture2DOES),
    /* A whole bunch of no-op functions.  These might be called
diff --git a/src/mapi/glapi/glprocs.h b/src/mapi/glapi/glprocs.h
index 9adab52f43..fd42c0a743 100644
--- a/src/mapi/glapi/glprocs.h
+++ b/src/mapi/glapi/glprocs.h
@@ -826,6 +826,8 @@ static const char gl_string_table[] =
     "glProgramNamedParameter4dvNV\0"
     "glProgramNamedParameter4fNV\0"
     "glProgramNamedParameter4fvNV\0"
+    "glPrimitiveRestartIndexNV\0"
+    "glPrimitiveRestartNV\0"
     "glDepthBoundsEXT\0"
     "glBlendEquationSeparateEXT\0"
     "glBindFramebufferEXT\0"
@@ -1229,18 +1231,18 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_765 mgl_dispatch_stub_765
 #define gl_dispatch_stub_766 mgl_dispatch_stub_766
 #define gl_dispatch_stub_767 mgl_dispatch_stub_767
-#define gl_dispatch_stub_774 mgl_dispatch_stub_774
-#define gl_dispatch_stub_775 mgl_dispatch_stub_775
-#define gl_dispatch_stub_793 mgl_dispatch_stub_793
-#define gl_dispatch_stub_794 mgl_dispatch_stub_794
+#define gl_dispatch_stub_776 mgl_dispatch_stub_776
+#define gl_dispatch_stub_777 mgl_dispatch_stub_777
 #define gl_dispatch_stub_795 mgl_dispatch_stub_795
-#define gl_dispatch_stub_813 mgl_dispatch_stub_813
-#define gl_dispatch_stub_814 mgl_dispatch_stub_814
-#define gl_dispatch_stub_818 mgl_dispatch_stub_818
-#define gl_dispatch_stub_819 mgl_dispatch_stub_819
+#define gl_dispatch_stub_796 mgl_dispatch_stub_796
+#define gl_dispatch_stub_797 mgl_dispatch_stub_797
+#define gl_dispatch_stub_815 mgl_dispatch_stub_815
+#define gl_dispatch_stub_816 mgl_dispatch_stub_816
 #define gl_dispatch_stub_820 mgl_dispatch_stub_820
 #define gl_dispatch_stub_821 mgl_dispatch_stub_821
 #define gl_dispatch_stub_822 mgl_dispatch_stub_822
+#define gl_dispatch_stub_823 mgl_dispatch_stub_823
+#define gl_dispatch_stub_824 mgl_dispatch_stub_824
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1281,18 +1283,18 @@ void GLAPIENTRY gl_dispatch_stub_764(GLuint array);
 void GLAPIENTRY gl_dispatch_stub_765(GLsizei n, const GLuint * arrays);
 void GLAPIENTRY gl_dispatch_stub_766(GLsizei n, GLuint * arrays);
 GLboolean GLAPIENTRY gl_dispatch_stub_767(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_774(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_775(GLenum modeRGB, GLenum modeA);
-void GLAPIENTRY gl_dispatch_stub_793(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_794(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_795(GLenum target, GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_813(GLenum target, GLenum pname, GLvoid ** params);
-void GLAPIENTRY gl_dispatch_stub_814(GLenum target, GLsizei length, GLvoid * pointer);
-void GLAPIENTRY gl_dispatch_stub_818(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_819(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_820(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_821(GLuint id, GLenum pname, GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_822(GLuint id, GLenum pname, GLuint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_776(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_777(GLenum modeRGB, GLenum modeA);
+void GLAPIENTRY gl_dispatch_stub_795(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_796(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_797(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_815(GLenum target, GLenum pname, GLvoid ** params);
+void GLAPIENTRY gl_dispatch_stub_816(GLenum target, GLsizei length, GLvoid * pointer);
+void GLAPIENTRY gl_dispatch_stub_820(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_821(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_822(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_823(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_824(GLuint id, GLenum pname, GLuint64EXT * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -2070,369 +2072,371 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET(13457, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, _gloffset_ProgramNamedParameter4dvNV),
     NAME_FUNC_OFFSET(13486, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, _gloffset_ProgramNamedParameter4fNV),
     NAME_FUNC_OFFSET(13514, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, _gloffset_ProgramNamedParameter4fvNV),
-    NAME_FUNC_OFFSET(13543, gl_dispatch_stub_774, gl_dispatch_stub_774, NULL, _gloffset_DepthBoundsEXT),
-    NAME_FUNC_OFFSET(13560, gl_dispatch_stub_775, gl_dispatch_stub_775, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(13587, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(13608, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(13630, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(13658, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(13682, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13707, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(13736, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(13762, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(13788, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(13814, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(13835, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13857, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(13877, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(13918, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(13950, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(13969, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(13989, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(14014, gl_dispatch_stub_793, gl_dispatch_stub_793, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(14035, gl_dispatch_stub_794, gl_dispatch_stub_794, NULL, _gloffset_BufferParameteriAPPLE),
-    NAME_FUNC_OFFSET(14059, gl_dispatch_stub_795, gl_dispatch_stub_795, NULL, _gloffset_FlushMappedBufferRangeAPPLE),
-    NAME_FUNC_OFFSET(14089, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
-    NAME_FUNC_OFFSET(14118, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, _gloffset_ColorMaskIndexedEXT),
-    NAME_FUNC_OFFSET(14140, glDisableIndexedEXT, glDisableIndexedEXT, NULL, _gloffset_DisableIndexedEXT),
-    NAME_FUNC_OFFSET(14160, glEnableIndexedEXT, glEnableIndexedEXT, NULL, _gloffset_EnableIndexedEXT),
-    NAME_FUNC_OFFSET(14179, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, _gloffset_GetBooleanIndexedvEXT),
-    NAME_FUNC_OFFSET(14203, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, _gloffset_GetIntegerIndexedvEXT),
-    NAME_FUNC_OFFSET(14227, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, _gloffset_IsEnabledIndexedEXT),
-    NAME_FUNC_OFFSET(14249, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, _gloffset_BeginConditionalRenderNV),
-    NAME_FUNC_OFFSET(14276, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, _gloffset_EndConditionalRenderNV),
-    NAME_FUNC_OFFSET(14301, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, _gloffset_BeginTransformFeedbackEXT),
-    NAME_FUNC_OFFSET(14329, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, _gloffset_BindBufferBaseEXT),
-    NAME_FUNC_OFFSET(14349, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, _gloffset_BindBufferOffsetEXT),
-    NAME_FUNC_OFFSET(14371, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, _gloffset_BindBufferRangeEXT),
-    NAME_FUNC_OFFSET(14392, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, _gloffset_EndTransformFeedbackEXT),
-    NAME_FUNC_OFFSET(14418, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, _gloffset_GetTransformFeedbackVaryingEXT),
-    NAME_FUNC_OFFSET(14451, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, _gloffset_TransformFeedbackVaryingsEXT),
-    NAME_FUNC_OFFSET(14482, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
-    NAME_FUNC_OFFSET(14503, gl_dispatch_stub_813, gl_dispatch_stub_813, NULL, _gloffset_GetTexParameterPointervAPPLE),
-    NAME_FUNC_OFFSET(14534, gl_dispatch_stub_814, gl_dispatch_stub_814, NULL, _gloffset_TextureRangeAPPLE),
-    NAME_FUNC_OFFSET(14554, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, _gloffset_GetObjectParameterivAPPLE),
-    NAME_FUNC_OFFSET(14582, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, _gloffset_ObjectPurgeableAPPLE),
-    NAME_FUNC_OFFSET(14605, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, _gloffset_ObjectUnpurgeableAPPLE),
-    NAME_FUNC_OFFSET(14630, gl_dispatch_stub_818, gl_dispatch_stub_818, NULL, _gloffset_StencilFuncSeparateATI),
-    NAME_FUNC_OFFSET(14655, gl_dispatch_stub_819, gl_dispatch_stub_819, NULL, _gloffset_ProgramEnvParameters4fvEXT),
-    NAME_FUNC_OFFSET(14684, gl_dispatch_stub_820, gl_dispatch_stub_820, NULL, _gloffset_ProgramLocalParameters4fvEXT),
-    NAME_FUNC_OFFSET(14715, gl_dispatch_stub_821, gl_dispatch_stub_821, NULL, _gloffset_GetQueryObjecti64vEXT),
-    NAME_FUNC_OFFSET(14739, gl_dispatch_stub_822, gl_dispatch_stub_822, NULL, _gloffset_GetQueryObjectui64vEXT),
-    NAME_FUNC_OFFSET(14764, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, _gloffset_EGLImageTargetRenderbufferStorageOES),
-    NAME_FUNC_OFFSET(14803, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, _gloffset_EGLImageTargetTexture2DOES),
-    NAME_FUNC_OFFSET(14832, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
-    NAME_FUNC_OFFSET(14850, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
-    NAME_FUNC_OFFSET(14867, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
-    NAME_FUNC_OFFSET(14883, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
-    NAME_FUNC_OFFSET(14908, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
-    NAME_FUNC_OFFSET(14928, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
-    NAME_FUNC_OFFSET(14948, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
-    NAME_FUNC_OFFSET(14971, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
-    NAME_FUNC_OFFSET(14994, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
-    NAME_FUNC_OFFSET(15014, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
-    NAME_FUNC_OFFSET(15031, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
-    NAME_FUNC_OFFSET(15048, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
-    NAME_FUNC_OFFSET(15063, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
-    NAME_FUNC_OFFSET(15087, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
-    NAME_FUNC_OFFSET(15106, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
-    NAME_FUNC_OFFSET(15125, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
-    NAME_FUNC_OFFSET(15141, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
-    NAME_FUNC_OFFSET(15160, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
-    NAME_FUNC_OFFSET(15183, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(15199, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(15215, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
-    NAME_FUNC_OFFSET(15242, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
-    NAME_FUNC_OFFSET(15269, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
-    NAME_FUNC_OFFSET(15289, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(15308, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(15327, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(15357, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(15387, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(15417, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(15447, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
-    NAME_FUNC_OFFSET(15466, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
-    NAME_FUNC_OFFSET(15489, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
-    NAME_FUNC_OFFSET(15514, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
-    NAME_FUNC_OFFSET(15539, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
-    NAME_FUNC_OFFSET(15566, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
-    NAME_FUNC_OFFSET(15594, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
-    NAME_FUNC_OFFSET(15621, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
-    NAME_FUNC_OFFSET(15649, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
-    NAME_FUNC_OFFSET(15678, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
-    NAME_FUNC_OFFSET(15707, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
-    NAME_FUNC_OFFSET(15733, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
-    NAME_FUNC_OFFSET(15764, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
-    NAME_FUNC_OFFSET(15795, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
-    NAME_FUNC_OFFSET(15819, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
-    NAME_FUNC_OFFSET(15842, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
-    NAME_FUNC_OFFSET(15860, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
-    NAME_FUNC_OFFSET(15889, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
-    NAME_FUNC_OFFSET(15918, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
-    NAME_FUNC_OFFSET(15933, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
-    NAME_FUNC_OFFSET(15959, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
-    NAME_FUNC_OFFSET(15985, glHistogram, glHistogram, NULL, _gloffset_Histogram),
-    NAME_FUNC_OFFSET(16000, glMinmax, glMinmax, NULL, _gloffset_Minmax),
-    NAME_FUNC_OFFSET(16012, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
-    NAME_FUNC_OFFSET(16032, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
-    NAME_FUNC_OFFSET(16049, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
-    NAME_FUNC_OFFSET(16065, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
-    NAME_FUNC_OFFSET(16084, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
-    NAME_FUNC_OFFSET(16107, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
-    NAME_FUNC_OFFSET(16123, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
-    NAME_FUNC_OFFSET(16145, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
-    NAME_FUNC_OFFSET(16163, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
-    NAME_FUNC_OFFSET(16182, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
-    NAME_FUNC_OFFSET(16200, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
-    NAME_FUNC_OFFSET(16219, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
-    NAME_FUNC_OFFSET(16237, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
-    NAME_FUNC_OFFSET(16256, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
-    NAME_FUNC_OFFSET(16274, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
-    NAME_FUNC_OFFSET(16293, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
-    NAME_FUNC_OFFSET(16311, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
-    NAME_FUNC_OFFSET(16330, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
-    NAME_FUNC_OFFSET(16348, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
-    NAME_FUNC_OFFSET(16367, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
-    NAME_FUNC_OFFSET(16385, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
-    NAME_FUNC_OFFSET(16404, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
-    NAME_FUNC_OFFSET(16422, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
-    NAME_FUNC_OFFSET(16441, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
-    NAME_FUNC_OFFSET(16459, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
-    NAME_FUNC_OFFSET(16478, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
-    NAME_FUNC_OFFSET(16496, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
-    NAME_FUNC_OFFSET(16515, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
-    NAME_FUNC_OFFSET(16533, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
-    NAME_FUNC_OFFSET(16552, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
-    NAME_FUNC_OFFSET(16570, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
-    NAME_FUNC_OFFSET(16589, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
-    NAME_FUNC_OFFSET(16607, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
-    NAME_FUNC_OFFSET(16626, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
-    NAME_FUNC_OFFSET(16644, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
-    NAME_FUNC_OFFSET(16663, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
-    NAME_FUNC_OFFSET(16681, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
-    NAME_FUNC_OFFSET(16700, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
-    NAME_FUNC_OFFSET(16718, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
-    NAME_FUNC_OFFSET(16737, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
-    NAME_FUNC_OFFSET(16760, glDrawArraysInstanced, glDrawArraysInstanced, NULL, _gloffset_DrawArraysInstanced),
-    NAME_FUNC_OFFSET(16785, glDrawArraysInstanced, glDrawArraysInstanced, NULL, _gloffset_DrawArraysInstanced),
-    NAME_FUNC_OFFSET(16810, glDrawElementsInstanced, glDrawElementsInstanced, NULL, _gloffset_DrawElementsInstanced),
-    NAME_FUNC_OFFSET(16837, glDrawElementsInstanced, glDrawElementsInstanced, NULL, _gloffset_DrawElementsInstanced),
-    NAME_FUNC_OFFSET(16864, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(16887, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(16910, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(16933, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(16956, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
-    NAME_FUNC_OFFSET(16973, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
-    NAME_FUNC_OFFSET(16996, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
-    NAME_FUNC_OFFSET(17019, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
-    NAME_FUNC_OFFSET(17042, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
-    NAME_FUNC_OFFSET(17068, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
-    NAME_FUNC_OFFSET(17094, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
-    NAME_FUNC_OFFSET(17120, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
-    NAME_FUNC_OFFSET(17144, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(17171, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(17197, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
-    NAME_FUNC_OFFSET(17217, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
-    NAME_FUNC_OFFSET(17237, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
-    NAME_FUNC_OFFSET(17257, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
-    NAME_FUNC_OFFSET(17280, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
-    NAME_FUNC_OFFSET(17304, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
-    NAME_FUNC_OFFSET(17327, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
-    NAME_FUNC_OFFSET(17351, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
-    NAME_FUNC_OFFSET(17368, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
-    NAME_FUNC_OFFSET(17386, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
-    NAME_FUNC_OFFSET(17403, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
-    NAME_FUNC_OFFSET(17421, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
-    NAME_FUNC_OFFSET(17438, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
-    NAME_FUNC_OFFSET(17456, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
-    NAME_FUNC_OFFSET(17473, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
-    NAME_FUNC_OFFSET(17491, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
-    NAME_FUNC_OFFSET(17508, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
-    NAME_FUNC_OFFSET(17526, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
-    NAME_FUNC_OFFSET(17543, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
-    NAME_FUNC_OFFSET(17561, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
-    NAME_FUNC_OFFSET(17578, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
-    NAME_FUNC_OFFSET(17596, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
-    NAME_FUNC_OFFSET(17613, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
-    NAME_FUNC_OFFSET(17631, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
-    NAME_FUNC_OFFSET(17648, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
-    NAME_FUNC_OFFSET(17666, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
-    NAME_FUNC_OFFSET(17685, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
-    NAME_FUNC_OFFSET(17704, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
-    NAME_FUNC_OFFSET(17723, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
-    NAME_FUNC_OFFSET(17742, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
-    NAME_FUNC_OFFSET(17762, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
-    NAME_FUNC_OFFSET(17782, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(17802, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
-    NAME_FUNC_OFFSET(17820, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(17837, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(17855, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(17872, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(17890, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
-    NAME_FUNC_OFFSET(17908, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(17925, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(17943, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
-    NAME_FUNC_OFFSET(17962, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
-    NAME_FUNC_OFFSET(17981, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
-    NAME_FUNC_OFFSET(18000, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(18022, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(18035, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(18048, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(18064, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(18080, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(18093, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(18116, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(18136, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(18155, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(18166, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(18178, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(18192, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(18205, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(18221, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(18232, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(18245, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(18264, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(18284, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(18297, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(18307, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(18323, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(18342, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(18360, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(18381, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(18396, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(18411, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(18425, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(18440, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(18452, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(18465, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(18477, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(18490, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(18502, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(18515, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(18527, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(18540, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(18552, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(18565, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(18577, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(18590, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(18602, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(18615, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(18627, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(18640, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(18659, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(18678, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(18697, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(18710, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(18728, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(18749, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(18767, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(18787, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(18801, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(18818, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, _gloffset_RenderbufferStorageMultisample),
-    NAME_FUNC_OFFSET(18854, gl_dispatch_stub_596, gl_dispatch_stub_596, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(18870, gl_dispatch_stub_597, gl_dispatch_stub_597, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(18889, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(18907, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(18928, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(18950, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(18969, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(18991, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(19014, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(19033, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(19053, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(19072, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(19092, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(19111, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(19131, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(19150, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(19170, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(19189, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(19209, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(19229, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(19250, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(19270, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(19291, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(19311, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(19332, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(19356, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(19374, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(19394, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(19412, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(19424, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(19437, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(19449, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(19462, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(19482, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(19506, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(19520, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(19537, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(19552, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(19570, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(19584, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(19601, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(19616, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(19634, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(19648, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(19665, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(19680, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(19698, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(19712, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(19729, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(19744, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(19762, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(19776, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(19793, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(19808, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(19826, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(19840, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(19857, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(19872, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(19890, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(19904, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(19921, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(19936, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(19954, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(19968, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(19985, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(20000, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(20018, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(20035, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(20055, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(20072, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(20098, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(20127, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(20142, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(20160, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(20179, gl_dispatch_stub_765, gl_dispatch_stub_765, NULL, _gloffset_DeleteVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(20200, gl_dispatch_stub_767, gl_dispatch_stub_767, NULL, _gloffset_IsVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(20216, gl_dispatch_stub_775, gl_dispatch_stub_775, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(20240, gl_dispatch_stub_775, gl_dispatch_stub_775, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(20267, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(20285, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(20304, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(20329, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(20350, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(20372, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(20398, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(20421, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(20444, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(20467, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(20485, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(20504, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(20521, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(20559, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(20588, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(20604, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(20621, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(20643, gl_dispatch_stub_793, gl_dispatch_stub_793, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(20661, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
-    NAME_FUNC_OFFSET(20687, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, _gloffset_BeginTransformFeedbackEXT),
-    NAME_FUNC_OFFSET(20712, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, _gloffset_BindBufferBaseEXT),
-    NAME_FUNC_OFFSET(20729, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, _gloffset_BindBufferRangeEXT),
-    NAME_FUNC_OFFSET(20747, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, _gloffset_EndTransformFeedbackEXT),
-    NAME_FUNC_OFFSET(20770, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, _gloffset_GetTransformFeedbackVaryingEXT),
-    NAME_FUNC_OFFSET(20800, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, _gloffset_TransformFeedbackVaryingsEXT),
-    NAME_FUNC_OFFSET(20828, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
+    NAME_FUNC_OFFSET(13543, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, _gloffset_PrimitiveRestartIndexNV),
+    NAME_FUNC_OFFSET(13569, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, _gloffset_PrimitiveRestartNV),
+    NAME_FUNC_OFFSET(13590, gl_dispatch_stub_776, gl_dispatch_stub_776, NULL, _gloffset_DepthBoundsEXT),
+    NAME_FUNC_OFFSET(13607, gl_dispatch_stub_777, gl_dispatch_stub_777, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(13634, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(13655, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(13677, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(13705, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(13729, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13754, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(13783, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(13809, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(13835, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(13861, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(13882, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13904, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(13924, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(13965, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(13997, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(14016, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(14036, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(14061, gl_dispatch_stub_795, gl_dispatch_stub_795, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(14082, gl_dispatch_stub_796, gl_dispatch_stub_796, NULL, _gloffset_BufferParameteriAPPLE),
+    NAME_FUNC_OFFSET(14106, gl_dispatch_stub_797, gl_dispatch_stub_797, NULL, _gloffset_FlushMappedBufferRangeAPPLE),
+    NAME_FUNC_OFFSET(14136, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(14165, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, _gloffset_ColorMaskIndexedEXT),
+    NAME_FUNC_OFFSET(14187, glDisableIndexedEXT, glDisableIndexedEXT, NULL, _gloffset_DisableIndexedEXT),
+    NAME_FUNC_OFFSET(14207, glEnableIndexedEXT, glEnableIndexedEXT, NULL, _gloffset_EnableIndexedEXT),
+    NAME_FUNC_OFFSET(14226, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, _gloffset_GetBooleanIndexedvEXT),
+    NAME_FUNC_OFFSET(14250, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, _gloffset_GetIntegerIndexedvEXT),
+    NAME_FUNC_OFFSET(14274, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, _gloffset_IsEnabledIndexedEXT),
+    NAME_FUNC_OFFSET(14296, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, _gloffset_BeginConditionalRenderNV),
+    NAME_FUNC_OFFSET(14323, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, _gloffset_EndConditionalRenderNV),
+    NAME_FUNC_OFFSET(14348, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, _gloffset_BeginTransformFeedbackEXT),
+    NAME_FUNC_OFFSET(14376, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, _gloffset_BindBufferBaseEXT),
+    NAME_FUNC_OFFSET(14396, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, _gloffset_BindBufferOffsetEXT),
+    NAME_FUNC_OFFSET(14418, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, _gloffset_BindBufferRangeEXT),
+    NAME_FUNC_OFFSET(14439, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, _gloffset_EndTransformFeedbackEXT),
+    NAME_FUNC_OFFSET(14465, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, _gloffset_GetTransformFeedbackVaryingEXT),
+    NAME_FUNC_OFFSET(14498, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, _gloffset_TransformFeedbackVaryingsEXT),
+    NAME_FUNC_OFFSET(14529, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
+    NAME_FUNC_OFFSET(14550, gl_dispatch_stub_815, gl_dispatch_stub_815, NULL, _gloffset_GetTexParameterPointervAPPLE),
+    NAME_FUNC_OFFSET(14581, gl_dispatch_stub_816, gl_dispatch_stub_816, NULL, _gloffset_TextureRangeAPPLE),
+    NAME_FUNC_OFFSET(14601, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, _gloffset_GetObjectParameterivAPPLE),
+    NAME_FUNC_OFFSET(14629, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, _gloffset_ObjectPurgeableAPPLE),
+    NAME_FUNC_OFFSET(14652, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, _gloffset_ObjectUnpurgeableAPPLE),
+    NAME_FUNC_OFFSET(14677, gl_dispatch_stub_820, gl_dispatch_stub_820, NULL, _gloffset_StencilFuncSeparateATI),
+    NAME_FUNC_OFFSET(14702, gl_dispatch_stub_821, gl_dispatch_stub_821, NULL, _gloffset_ProgramEnvParameters4fvEXT),
+    NAME_FUNC_OFFSET(14731, gl_dispatch_stub_822, gl_dispatch_stub_822, NULL, _gloffset_ProgramLocalParameters4fvEXT),
+    NAME_FUNC_OFFSET(14762, gl_dispatch_stub_823, gl_dispatch_stub_823, NULL, _gloffset_GetQueryObjecti64vEXT),
+    NAME_FUNC_OFFSET(14786, gl_dispatch_stub_824, gl_dispatch_stub_824, NULL, _gloffset_GetQueryObjectui64vEXT),
+    NAME_FUNC_OFFSET(14811, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, _gloffset_EGLImageTargetRenderbufferStorageOES),
+    NAME_FUNC_OFFSET(14850, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, _gloffset_EGLImageTargetTexture2DOES),
+    NAME_FUNC_OFFSET(14879, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
+    NAME_FUNC_OFFSET(14897, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
+    NAME_FUNC_OFFSET(14914, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
+    NAME_FUNC_OFFSET(14930, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
+    NAME_FUNC_OFFSET(14955, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
+    NAME_FUNC_OFFSET(14975, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
+    NAME_FUNC_OFFSET(14995, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
+    NAME_FUNC_OFFSET(15018, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
+    NAME_FUNC_OFFSET(15041, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
+    NAME_FUNC_OFFSET(15061, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
+    NAME_FUNC_OFFSET(15078, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
+    NAME_FUNC_OFFSET(15095, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
+    NAME_FUNC_OFFSET(15110, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
+    NAME_FUNC_OFFSET(15134, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
+    NAME_FUNC_OFFSET(15153, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
+    NAME_FUNC_OFFSET(15172, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
+    NAME_FUNC_OFFSET(15188, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
+    NAME_FUNC_OFFSET(15207, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
+    NAME_FUNC_OFFSET(15230, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(15246, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(15262, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
+    NAME_FUNC_OFFSET(15289, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
+    NAME_FUNC_OFFSET(15316, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
+    NAME_FUNC_OFFSET(15336, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(15355, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(15374, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(15404, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(15434, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(15464, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(15494, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
+    NAME_FUNC_OFFSET(15513, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
+    NAME_FUNC_OFFSET(15536, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
+    NAME_FUNC_OFFSET(15561, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
+    NAME_FUNC_OFFSET(15586, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
+    NAME_FUNC_OFFSET(15613, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
+    NAME_FUNC_OFFSET(15641, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
+    NAME_FUNC_OFFSET(15668, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
+    NAME_FUNC_OFFSET(15696, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
+    NAME_FUNC_OFFSET(15725, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
+    NAME_FUNC_OFFSET(15754, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
+    NAME_FUNC_OFFSET(15780, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
+    NAME_FUNC_OFFSET(15811, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
+    NAME_FUNC_OFFSET(15842, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
+    NAME_FUNC_OFFSET(15866, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
+    NAME_FUNC_OFFSET(15889, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
+    NAME_FUNC_OFFSET(15907, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
+    NAME_FUNC_OFFSET(15936, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
+    NAME_FUNC_OFFSET(15965, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
+    NAME_FUNC_OFFSET(15980, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
+    NAME_FUNC_OFFSET(16006, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
+    NAME_FUNC_OFFSET(16032, glHistogram, glHistogram, NULL, _gloffset_Histogram),
+    NAME_FUNC_OFFSET(16047, glMinmax, glMinmax, NULL, _gloffset_Minmax),
+    NAME_FUNC_OFFSET(16059, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
+    NAME_FUNC_OFFSET(16079, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
+    NAME_FUNC_OFFSET(16096, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
+    NAME_FUNC_OFFSET(16112, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
+    NAME_FUNC_OFFSET(16131, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
+    NAME_FUNC_OFFSET(16154, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
+    NAME_FUNC_OFFSET(16170, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
+    NAME_FUNC_OFFSET(16192, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
+    NAME_FUNC_OFFSET(16210, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
+    NAME_FUNC_OFFSET(16229, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
+    NAME_FUNC_OFFSET(16247, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
+    NAME_FUNC_OFFSET(16266, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
+    NAME_FUNC_OFFSET(16284, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
+    NAME_FUNC_OFFSET(16303, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
+    NAME_FUNC_OFFSET(16321, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
+    NAME_FUNC_OFFSET(16340, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
+    NAME_FUNC_OFFSET(16358, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
+    NAME_FUNC_OFFSET(16377, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
+    NAME_FUNC_OFFSET(16395, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
+    NAME_FUNC_OFFSET(16414, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
+    NAME_FUNC_OFFSET(16432, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
+    NAME_FUNC_OFFSET(16451, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
+    NAME_FUNC_OFFSET(16469, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
+    NAME_FUNC_OFFSET(16488, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
+    NAME_FUNC_OFFSET(16506, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
+    NAME_FUNC_OFFSET(16525, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
+    NAME_FUNC_OFFSET(16543, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
+    NAME_FUNC_OFFSET(16562, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
+    NAME_FUNC_OFFSET(16580, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
+    NAME_FUNC_OFFSET(16599, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
+    NAME_FUNC_OFFSET(16617, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
+    NAME_FUNC_OFFSET(16636, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
+    NAME_FUNC_OFFSET(16654, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
+    NAME_FUNC_OFFSET(16673, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
+    NAME_FUNC_OFFSET(16691, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
+    NAME_FUNC_OFFSET(16710, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
+    NAME_FUNC_OFFSET(16728, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
+    NAME_FUNC_OFFSET(16747, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
+    NAME_FUNC_OFFSET(16765, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
+    NAME_FUNC_OFFSET(16784, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
+    NAME_FUNC_OFFSET(16807, glDrawArraysInstanced, glDrawArraysInstanced, NULL, _gloffset_DrawArraysInstanced),
+    NAME_FUNC_OFFSET(16832, glDrawArraysInstanced, glDrawArraysInstanced, NULL, _gloffset_DrawArraysInstanced),
+    NAME_FUNC_OFFSET(16857, glDrawElementsInstanced, glDrawElementsInstanced, NULL, _gloffset_DrawElementsInstanced),
+    NAME_FUNC_OFFSET(16884, glDrawElementsInstanced, glDrawElementsInstanced, NULL, _gloffset_DrawElementsInstanced),
+    NAME_FUNC_OFFSET(16911, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(16934, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(16957, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(16980, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(17003, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
+    NAME_FUNC_OFFSET(17020, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
+    NAME_FUNC_OFFSET(17043, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
+    NAME_FUNC_OFFSET(17066, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
+    NAME_FUNC_OFFSET(17089, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
+    NAME_FUNC_OFFSET(17115, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
+    NAME_FUNC_OFFSET(17141, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
+    NAME_FUNC_OFFSET(17167, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
+    NAME_FUNC_OFFSET(17191, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(17218, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(17244, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
+    NAME_FUNC_OFFSET(17264, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
+    NAME_FUNC_OFFSET(17284, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
+    NAME_FUNC_OFFSET(17304, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
+    NAME_FUNC_OFFSET(17327, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
+    NAME_FUNC_OFFSET(17351, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
+    NAME_FUNC_OFFSET(17374, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
+    NAME_FUNC_OFFSET(17398, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
+    NAME_FUNC_OFFSET(17415, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
+    NAME_FUNC_OFFSET(17433, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
+    NAME_FUNC_OFFSET(17450, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
+    NAME_FUNC_OFFSET(17468, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
+    NAME_FUNC_OFFSET(17485, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
+    NAME_FUNC_OFFSET(17503, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
+    NAME_FUNC_OFFSET(17520, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
+    NAME_FUNC_OFFSET(17538, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
+    NAME_FUNC_OFFSET(17555, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
+    NAME_FUNC_OFFSET(17573, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
+    NAME_FUNC_OFFSET(17590, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
+    NAME_FUNC_OFFSET(17608, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
+    NAME_FUNC_OFFSET(17625, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
+    NAME_FUNC_OFFSET(17643, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
+    NAME_FUNC_OFFSET(17660, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
+    NAME_FUNC_OFFSET(17678, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
+    NAME_FUNC_OFFSET(17695, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
+    NAME_FUNC_OFFSET(17713, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
+    NAME_FUNC_OFFSET(17732, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
+    NAME_FUNC_OFFSET(17751, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
+    NAME_FUNC_OFFSET(17770, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
+    NAME_FUNC_OFFSET(17789, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
+    NAME_FUNC_OFFSET(17809, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
+    NAME_FUNC_OFFSET(17829, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
+    NAME_FUNC_OFFSET(17849, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
+    NAME_FUNC_OFFSET(17867, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
+    NAME_FUNC_OFFSET(17884, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
+    NAME_FUNC_OFFSET(17902, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
+    NAME_FUNC_OFFSET(17919, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
+    NAME_FUNC_OFFSET(17937, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
+    NAME_FUNC_OFFSET(17955, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
+    NAME_FUNC_OFFSET(17972, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
+    NAME_FUNC_OFFSET(17990, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
+    NAME_FUNC_OFFSET(18009, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
+    NAME_FUNC_OFFSET(18028, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
+    NAME_FUNC_OFFSET(18047, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
+    NAME_FUNC_OFFSET(18069, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
+    NAME_FUNC_OFFSET(18082, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
+    NAME_FUNC_OFFSET(18095, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
+    NAME_FUNC_OFFSET(18111, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
+    NAME_FUNC_OFFSET(18127, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
+    NAME_FUNC_OFFSET(18140, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
+    NAME_FUNC_OFFSET(18163, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
+    NAME_FUNC_OFFSET(18183, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
+    NAME_FUNC_OFFSET(18202, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
+    NAME_FUNC_OFFSET(18213, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
+    NAME_FUNC_OFFSET(18225, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
+    NAME_FUNC_OFFSET(18239, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
+    NAME_FUNC_OFFSET(18252, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
+    NAME_FUNC_OFFSET(18268, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
+    NAME_FUNC_OFFSET(18279, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
+    NAME_FUNC_OFFSET(18292, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
+    NAME_FUNC_OFFSET(18311, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
+    NAME_FUNC_OFFSET(18331, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
+    NAME_FUNC_OFFSET(18344, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
+    NAME_FUNC_OFFSET(18354, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
+    NAME_FUNC_OFFSET(18370, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
+    NAME_FUNC_OFFSET(18389, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
+    NAME_FUNC_OFFSET(18407, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
+    NAME_FUNC_OFFSET(18428, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
+    NAME_FUNC_OFFSET(18443, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
+    NAME_FUNC_OFFSET(18458, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
+    NAME_FUNC_OFFSET(18472, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
+    NAME_FUNC_OFFSET(18487, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
+    NAME_FUNC_OFFSET(18499, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
+    NAME_FUNC_OFFSET(18512, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
+    NAME_FUNC_OFFSET(18524, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
+    NAME_FUNC_OFFSET(18537, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
+    NAME_FUNC_OFFSET(18549, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
+    NAME_FUNC_OFFSET(18562, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
+    NAME_FUNC_OFFSET(18574, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
+    NAME_FUNC_OFFSET(18587, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
+    NAME_FUNC_OFFSET(18599, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
+    NAME_FUNC_OFFSET(18612, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
+    NAME_FUNC_OFFSET(18624, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
+    NAME_FUNC_OFFSET(18637, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
+    NAME_FUNC_OFFSET(18649, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
+    NAME_FUNC_OFFSET(18662, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
+    NAME_FUNC_OFFSET(18674, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
+    NAME_FUNC_OFFSET(18687, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
+    NAME_FUNC_OFFSET(18706, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
+    NAME_FUNC_OFFSET(18725, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
+    NAME_FUNC_OFFSET(18744, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
+    NAME_FUNC_OFFSET(18757, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
+    NAME_FUNC_OFFSET(18775, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
+    NAME_FUNC_OFFSET(18796, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
+    NAME_FUNC_OFFSET(18814, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
+    NAME_FUNC_OFFSET(18834, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(18848, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(18865, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, _gloffset_RenderbufferStorageMultisample),
+    NAME_FUNC_OFFSET(18901, gl_dispatch_stub_596, gl_dispatch_stub_596, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET(18917, gl_dispatch_stub_597, gl_dispatch_stub_597, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET(18936, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(18954, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(18975, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(18997, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(19016, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(19038, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(19061, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET(19080, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET(19100, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET(19119, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET(19139, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET(19158, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET(19178, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET(19197, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET(19217, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET(19236, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET(19256, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET(19276, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET(19297, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET(19317, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET(19338, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET(19358, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(19379, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(19403, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(19421, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(19441, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(19459, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(19471, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(19484, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(19496, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(19509, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(19529, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(19553, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(19567, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(19584, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(19599, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(19617, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(19631, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(19648, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(19663, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(19681, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(19695, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(19712, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(19727, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(19745, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(19759, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(19776, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(19791, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(19809, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(19823, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(19840, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(19855, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(19873, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(19887, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(19904, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(19919, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(19937, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(19951, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(19968, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(19983, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(20001, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(20015, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(20032, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(20047, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(20065, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(20082, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(20102, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(20119, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(20145, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(20174, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(20189, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(20207, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(20226, gl_dispatch_stub_765, gl_dispatch_stub_765, NULL, _gloffset_DeleteVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(20247, gl_dispatch_stub_767, gl_dispatch_stub_767, NULL, _gloffset_IsVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(20263, gl_dispatch_stub_777, gl_dispatch_stub_777, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(20287, gl_dispatch_stub_777, gl_dispatch_stub_777, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(20314, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(20332, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(20351, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(20376, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(20397, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(20419, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(20445, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(20468, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(20491, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(20514, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(20532, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(20551, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(20568, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(20606, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(20635, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(20651, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(20668, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(20690, gl_dispatch_stub_795, gl_dispatch_stub_795, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(20708, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(20734, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, _gloffset_BeginTransformFeedbackEXT),
+    NAME_FUNC_OFFSET(20759, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, _gloffset_BindBufferBaseEXT),
+    NAME_FUNC_OFFSET(20776, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, _gloffset_BindBufferRangeEXT),
+    NAME_FUNC_OFFSET(20794, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, _gloffset_EndTransformFeedbackEXT),
+    NAME_FUNC_OFFSET(20817, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, _gloffset_GetTransformFeedbackVaryingEXT),
+    NAME_FUNC_OFFSET(20847, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, _gloffset_TransformFeedbackVaryingsEXT),
+    NAME_FUNC_OFFSET(20875, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index ae653e1914..2274e54ba0 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -494,6 +494,9 @@ _mesa_create_exec_table(void)
    SET_ActiveStencilFaceEXT(exec, _mesa_ActiveStencilFaceEXT);
 #endif
 
+   /* 285. GL_NV_primitive_restart */
+   SET_PrimitiveRestartIndexNV(exec, _mesa_PrimitiveRestartIndex);
+
    /* ???. GL_EXT_depth_bounds_test */
    SET_DepthBoundsEXT(exec, _mesa_DepthBoundsEXT);
 
diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c
index 9a36394d65..08b4b4a3b6 100644
--- a/src/mesa/main/api_noop.c
+++ b/src/mesa/main/api_noop.c
@@ -679,6 +679,16 @@ static void GLAPIENTRY _mesa_noop_End( void )
 }
 
 
+/***
+ * PrimitiveRestart called outside glBegin()/End(): raise an error
+ */
+static void GLAPIENTRY _mesa_noop_PrimitiveRestartNV( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   _mesa_error(ctx, GL_INVALID_OPERATION, "glPrimitiveRestartNV(no glBegin)");
+}
+
+
 /**
  * Execute a glRectf() function.  This is not suitable for GL_COMPILE
  * modes (as the test for outside begin/end is not compiled),
@@ -1007,6 +1017,8 @@ _mesa_noop_vtxfmt_init( GLvertexformat *vfmt )
    vfmt->EdgeFlag = _mesa_noop_EdgeFlag;
    vfmt->End = _mesa_noop_End;
 
+   vfmt->PrimitiveRestartNV = _mesa_noop_PrimitiveRestartNV;
+
    _MESA_INIT_EVAL_VTXFMT(vfmt, _mesa_noop_);
 
    vfmt->FogCoordfEXT = _mesa_noop_FogCoordfEXT;
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index c9f0facdaf..5e006e0ad3 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -1086,6 +1086,7 @@ typedef struct {
    void (GLAPIENTRYP CallLists)( GLsizei, GLenum, const GLvoid * );
    void (GLAPIENTRYP Begin)( GLenum );
    void (GLAPIENTRYP End)( void );
+   void (GLAPIENTRYP PrimitiveRestartNV)( void );
    /* GL_NV_vertex_program */
    void (GLAPIENTRYP VertexAttrib1fNV)( GLuint index, GLfloat x );
    void (GLAPIENTRYP VertexAttrib1fvNV)( GLuint index, const GLfloat *v );
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 5a5b199df3..af16c010b9 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -124,6 +124,14 @@ client_state(struct gl_context *ctx, GLenum cap, GLboolean state)
          break;
 #endif /* FEATURE_NV_vertex_program */
 
+      /* GL_NV_primitive_restart */
+      case GL_PRIMITIVE_RESTART_NV:
+	 if (!ctx->Extensions.NV_primitive_restart) {
+            goto invalid_enum_error;
+         }
+         var = &ctx->Array.PrimitiveRestart;
+         break;
+
       default:
          goto invalid_enum_error;
    }
@@ -945,9 +953,11 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
          break;
 #endif
 
-      /* GL 3.1 primitive restart */
+      /* GL 3.1 primitive restart.  Note: this enum is different from
+       * GL_PRIMITIVE_RESTART_NV (which is client state).
+       */
       case GL_PRIMITIVE_RESTART:
-	 if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
+         if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
             goto invalid_enum_error;
          }
          if (ctx->Array.PrimitiveRestart != state) {
@@ -1454,9 +1464,16 @@ _mesa_IsEnabled( GLenum cap )
          return ctx->TransformFeedback.RasterDiscard;
 #endif
 
+      /* GL_NV_primitive_restart */
+      case GL_PRIMITIVE_RESTART_NV:
+	 if (!ctx->Extensions.NV_primitive_restart) {
+            goto invalid_enum_error;
+         }
+         return ctx->Array.PrimitiveRestart;
+
       /* GL 3.1 primitive restart */
       case GL_PRIMITIVE_RESTART:
-	 if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
+         if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
             goto invalid_enum_error;
          }
          return ctx->Array.PrimitiveRestart;
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index bc18e1b113..4403945f43 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -1369,6 +1369,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_PRIMARY_COLOR_ARB\0"
    "GL_PRIMARY_COLOR_EXT\0"
    "GL_PRIMITIVES_GENERATED_EXT\0"
+   "GL_PRIMITIVE_RESTART_INDEX_NV\0"
+   "GL_PRIMITIVE_RESTART_NV\0"
    "GL_PROGRAM_ADDRESS_REGISTERS_ARB\0"
    "GL_PROGRAM_ALU_INSTRUCTIONS_ARB\0"
    "GL_PROGRAM_ATTRIBS_ARB\0"
@@ -2103,7 +2105,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[2065] =
+static const enum_elt all_enums[2067] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -3438,763 +3440,765 @@ static const enum_elt all_enums[2065] =
    { 29819, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
    { 29840, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
    { 29861, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */
-   { 29889, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 29922, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 29954, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 29977, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
-   { 30007, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
-   { 30036, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 30059, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 30089, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 30118, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 30146, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 30168, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 30196, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 30224, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 30246, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 30267, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 30307, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 30346, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 30376, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 30411, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 30444, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 30478, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 30517, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 30556, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 30578, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 30604, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 30628, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
-   { 30654, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 30677, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 30699, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 30720, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 30741, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 30768, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 30800, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 30832, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 30867, 0x00001701 }, /* GL_PROJECTION */
-   { 30881, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 30902, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 30945, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 30971, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
-   { 30991, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
-   { 31015, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 31036, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 31055, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 31078, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 31117, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 31155, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 31175, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 31205, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 31229, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 31249, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 31279, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 31303, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 31323, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 31356, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 31382, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 31412, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 31443, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 31473, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
-   { 31492, 0x00002003 }, /* GL_Q */
-   { 31497, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 31522, 0x00000007 }, /* GL_QUADS */
-   { 31531, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-   { 31575, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-   { 31623, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 31640, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 31654, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
-   { 31684, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
-   { 31711, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 31733, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 31759, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
-   { 31779, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 31795, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 31815, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 31841, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 31871, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
-   { 31888, 0x00002002 }, /* GL_R */
-   { 31893, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 31905, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
-   { 31931, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 31964, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 31979, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 31999, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
-   { 32027, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 32059, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 32083, 0x000088B8 }, /* GL_READ_ONLY */
-   { 32096, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 32113, 0x000088BA }, /* GL_READ_WRITE */
-   { 32127, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 32145, 0x00001903 }, /* GL_RED */
-   { 32152, 0x00008016 }, /* GL_REDUCE */
-   { 32162, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 32176, 0x00000D15 }, /* GL_RED_BIAS */
-   { 32188, 0x00000D52 }, /* GL_RED_BITS */
-   { 32200, 0x00000D14 }, /* GL_RED_SCALE */
-   { 32213, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 32231, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 32253, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 32274, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
-   { 32296, 0x00008A19 }, /* GL_RELEASED_APPLE */
-   { 32314, 0x00001C00 }, /* GL_RENDER */
-   { 32324, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 32340, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 32367, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
-   { 32398, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
-   { 32422, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 32450, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
-   { 32478, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 32504, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
-   { 32534, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 32561, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
-   { 32592, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 32612, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 32639, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
-   { 32670, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 32693, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 32720, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
-   { 32747, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 32779, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 32815, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
-   { 32851, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
-   { 32871, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 32896, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
-   { 32925, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 32949, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
-   { 32977, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 33006, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
-   { 33039, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 33061, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 33087, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
-   { 33113, 0x00001F01 }, /* GL_RENDERER */
-   { 33125, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 33140, 0x00002901 }, /* GL_REPEAT */
-   { 33150, 0x00001E01 }, /* GL_REPLACE */
-   { 33161, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 33176, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 33199, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 33217, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 33239, 0x00008A1B }, /* GL_RETAINED_APPLE */
-   { 33257, 0x00000102 }, /* GL_RETURN */
-   { 33267, 0x00001907 }, /* GL_RGB */
-   { 33274, 0x00008052 }, /* GL_RGB10 */
-   { 33283, 0x00008059 }, /* GL_RGB10_A2 */
-   { 33295, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 33311, 0x00008052 }, /* GL_RGB10_EXT */
-   { 33324, 0x00008053 }, /* GL_RGB12 */
-   { 33333, 0x00008053 }, /* GL_RGB12_EXT */
-   { 33346, 0x00008054 }, /* GL_RGB16 */
-   { 33355, 0x00008054 }, /* GL_RGB16_EXT */
-   { 33368, 0x0000804E }, /* GL_RGB2_EXT */
-   { 33380, 0x0000804F }, /* GL_RGB4 */
-   { 33388, 0x0000804F }, /* GL_RGB4_EXT */
-   { 33400, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 33413, 0x00008050 }, /* GL_RGB5 */
-   { 33421, 0x00008D62 }, /* GL_RGB565 */
-   { 33431, 0x00008D62 }, /* GL_RGB565_OES */
-   { 33445, 0x00008057 }, /* GL_RGB5_A1 */
-   { 33456, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 33471, 0x00008057 }, /* GL_RGB5_A1_OES */
-   { 33486, 0x00008050 }, /* GL_RGB5_EXT */
-   { 33498, 0x00008051 }, /* GL_RGB8 */
-   { 33506, 0x00008051 }, /* GL_RGB8_EXT */
-   { 33518, 0x00008051 }, /* GL_RGB8_OES */
-   { 33530, 0x00001908 }, /* GL_RGBA */
-   { 33538, 0x0000805A }, /* GL_RGBA12 */
-   { 33548, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 33562, 0x0000805B }, /* GL_RGBA16 */
-   { 33572, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 33586, 0x00008055 }, /* GL_RGBA2 */
-   { 33595, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 33608, 0x00008056 }, /* GL_RGBA4 */
-   { 33617, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 33636, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 33649, 0x00008056 }, /* GL_RGBA4_OES */
-   { 33662, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 33676, 0x00008058 }, /* GL_RGBA8 */
-   { 33685, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 33698, 0x00008058 }, /* GL_RGBA8_OES */
-   { 33711, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 33726, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 33744, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 33757, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 33770, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 33784, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 33796, 0x00008573 }, /* GL_RGB_SCALE */
-   { 33809, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 33826, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 33843, 0x00000407 }, /* GL_RIGHT */
-   { 33852, 0x00002000 }, /* GL_S */
-   { 33857, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 33871, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 33892, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 33906, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 33927, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 33941, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
-   { 33959, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 33975, 0x000080A9 }, /* GL_SAMPLES */
-   { 33986, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 34002, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 34017, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 34035, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 34057, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 34085, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 34117, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 34140, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 34167, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 34185, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 34208, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 34230, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 34249, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 34272, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 34298, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 34328, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 34353, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 34382, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 34397, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 34412, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 34428, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 34453, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 34493, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 34537, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 34570, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 34600, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 34632, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 34662, 0x00001C02 }, /* GL_SELECT */
-   { 34672, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 34700, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 34725, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 34741, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
-   { 34765, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 34792, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 34823, 0x0000150F }, /* GL_SET */
-   { 34830, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
-   { 34855, 0x00008DFA }, /* GL_SHADER_COMPILER */
-   { 34874, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 34895, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 34919, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 34934, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 34949, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 34977, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 35000, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 35030, 0x00001601 }, /* GL_SHININESS */
-   { 35043, 0x00001402 }, /* GL_SHORT */
-   { 35052, 0x00009119 }, /* GL_SIGNALED */
-   { 35064, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 35085, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 35101, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 35121, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 35140, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 35154, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 35169, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 35191, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 35211, 0x00001D01 }, /* GL_SMOOTH */
-   { 35221, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 35254, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 35281, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 35314, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 35341, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 35358, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 35379, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 35400, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 35415, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 35434, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 35453, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 35470, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 35491, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 35512, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 35527, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 35546, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 35565, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 35582, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 35603, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 35624, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 35639, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 35658, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 35677, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 35697, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 35715, 0x00001202 }, /* GL_SPECULAR */
-   { 35727, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 35741, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 35756, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 35774, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 35791, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 35805, 0x00008580 }, /* GL_SRC0_RGB */
-   { 35817, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 35831, 0x00008581 }, /* GL_SRC1_RGB */
-   { 35843, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 35857, 0x00008582 }, /* GL_SRC2_RGB */
-   { 35869, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 35882, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 35904, 0x00000300 }, /* GL_SRC_COLOR */
-   { 35917, 0x00008C40 }, /* GL_SRGB */
-   { 35925, 0x00008C41 }, /* GL_SRGB8 */
-   { 35934, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 35950, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 35964, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 35982, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 36001, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 36016, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 36035, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 36050, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 36069, 0x000088E5 }, /* GL_STATIC_READ */
-   { 36084, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 36103, 0x00001802 }, /* GL_STENCIL */
-   { 36114, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 36136, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 36162, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
-   { 36188, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 36209, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 36234, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 36255, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 36280, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 36312, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 36348, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 36380, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 36416, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 36436, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 36463, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 36489, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 36505, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 36527, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 36550, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 36566, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 36582, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 36599, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
-   { 36617, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
-   { 36636, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 36659, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 36681, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
-   { 36703, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
-   { 36721, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 36743, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
-   { 36765, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
-   { 36783, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 36805, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
-   { 36827, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 36848, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 36875, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 36902, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 36917, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 36933, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 36962, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 36984, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 37005, 0x00000C33 }, /* GL_STEREO */
-   { 37015, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
-   { 37039, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
-   { 37064, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
-   { 37088, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 37103, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 37122, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 37137, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 37156, 0x000088E1 }, /* GL_STREAM_READ */
-   { 37171, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 37190, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 37207, 0x000084E7 }, /* GL_SUBTRACT */
-   { 37219, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 37235, 0x00009113 }, /* GL_SYNC_CONDITION */
-   { 37253, 0x00009116 }, /* GL_SYNC_FENCE */
-   { 37267, 0x00009115 }, /* GL_SYNC_FLAGS */
-   { 37281, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
-   { 37308, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-   { 37338, 0x00009114 }, /* GL_SYNC_STATUS */
-   { 37353, 0x00002001 }, /* GL_T */
-   { 37358, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 37373, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 37392, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 37408, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 37423, 0x00002A27 }, /* GL_T2F_V3F */
-   { 37434, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 37453, 0x00002A28 }, /* GL_T4F_V4F */
-   { 37464, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 37487, 0x00001702 }, /* GL_TEXTURE */
-   { 37498, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 37510, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 37526, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 37538, 0x000084CA }, /* GL_TEXTURE10 */
-   { 37551, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 37568, 0x000084CB }, /* GL_TEXTURE11 */
-   { 37581, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 37598, 0x000084CC }, /* GL_TEXTURE12 */
-   { 37611, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 37628, 0x000084CD }, /* GL_TEXTURE13 */
-   { 37641, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 37658, 0x000084CE }, /* GL_TEXTURE14 */
-   { 37671, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 37688, 0x000084CF }, /* GL_TEXTURE15 */
-   { 37701, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 37718, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 37731, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 37748, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 37761, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 37778, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 37791, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 37808, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 37821, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 37838, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 37854, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 37866, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 37879, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 37896, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 37909, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 37926, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 37939, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 37956, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 37969, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 37986, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 37999, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 38016, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 38029, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 38046, 0x000084DA }, /* GL_TEXTURE26 */
-   { 38059, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 38076, 0x000084DB }, /* GL_TEXTURE27 */
-   { 38089, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 38106, 0x000084DC }, /* GL_TEXTURE28 */
-   { 38119, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 38136, 0x000084DD }, /* GL_TEXTURE29 */
-   { 38149, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 38166, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 38182, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 38194, 0x000084DE }, /* GL_TEXTURE30 */
-   { 38207, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 38224, 0x000084DF }, /* GL_TEXTURE31 */
-   { 38237, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 38254, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 38270, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 38282, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 38298, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 38310, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 38326, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 38338, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 38354, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 38366, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 38382, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 38394, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 38410, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 38422, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 38438, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 38452, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 38476, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 38490, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 38514, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 38528, 0x0000806F }, /* GL_TEXTURE_3D_OES */
-   { 38546, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 38568, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 38594, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 38616, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 38638, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 38670, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 38692, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 38724, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 38746, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
-   { 38772, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 38800, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 38832, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
-   { 38864, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 38897, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 38929, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 38944, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 38965, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 38990, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 39008, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 39032, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 39063, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 39093, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 39123, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 39158, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 39189, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 39227, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 39254, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 39286, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 39320, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 39344, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 39372, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 39396, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 39424, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 39457, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 39481, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 39503, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 39525, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 39551, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 39585, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 39618, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 39655, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 39683, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 39715, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 39738, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 39776, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 39818, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 39849, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 39877, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 39907, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 39935, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
-   { 39960, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 39980, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 40004, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 40035, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 40070, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
-   { 40105, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 40136, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 40171, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
-   { 40206, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 40237, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 40272, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
-   { 40307, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
-   { 40331, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 40362, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 40397, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
-   { 40432, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 40463, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 40498, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
-   { 40533, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 40564, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 40599, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
-   { 40634, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-   { 40663, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 40680, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 40702, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 40728, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 40743, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 40764, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 40784, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 40810, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
-   { 40840, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 40860, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
-   { 40884, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 40901, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 40918, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 40935, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
-   { 40958, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 40975, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 41000, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 41022, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 41048, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 41066, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 41092, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 41118, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 41148, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 41175, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 41200, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 41220, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 41244, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 41271, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 41298, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 41325, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 41351, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 41381, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 41403, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 41421, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 41461, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 41491, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 41519, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 41547, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 41575, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 41596, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 41615, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 41637, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 41656, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 41676, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-   { 41706, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-   { 41737, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 41762, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 41786, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 41806, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 41830, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 41850, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 41873, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 41897, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
-   { 41925, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-   { 41955, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 41980, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 42014, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 42031, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 42049, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
-   { 42071, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 42089, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 42107, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
-   { 42126, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 42146, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 42165, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 42194, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 42211, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
-   { 42233, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
-   { 42263, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-   { 42299, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
-   { 42340, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
-   { 42373, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
-   { 42411, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-   { 42447, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
-   { 42485, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
-   { 42524, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
-   { 42569, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
-   { 42604, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
-   { 42649, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 42675, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 42705, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 42737, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 42767, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 42801, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 42817, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 42848, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 42883, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 42911, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 42943, 0x00000004 }, /* GL_TRIANGLES */
-   { 42956, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
-   { 42983, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 42999, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 43020, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 43038, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
-   { 43070, 0x00000001 }, /* GL_TRUE */
-   { 43078, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
-   { 43097, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 43117, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 43140, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 43160, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 43181, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 43203, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 43225, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 43245, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 43266, 0x00009118 }, /* GL_UNSIGNALED */
-   { 43280, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 43297, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 43324, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 43347, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 43363, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 43390, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
-   { 43421, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 43442, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
-   { 43467, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 43491, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
-   { 43516, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 43547, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
-   { 43582, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 43606, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 43634, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 43657, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 43675, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 43705, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
-   { 43739, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 43765, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 43795, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
-   { 43829, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 43855, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 43879, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 43907, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 43935, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 43962, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 43994, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 44025, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 44039, 0x00002A20 }, /* GL_V2F */
-   { 44046, 0x00002A21 }, /* GL_V3F */
-   { 44053, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 44072, 0x00001F00 }, /* GL_VENDOR */
-   { 44082, 0x00001F02 }, /* GL_VERSION */
-   { 44093, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 44109, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 44133, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 44163, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 44194, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 44229, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 44253, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 44274, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 44297, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 44318, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 44345, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 44373, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 44401, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 44429, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 44457, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 44485, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 44513, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 44540, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 44567, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 44594, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 44621, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 44648, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 44675, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 44702, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 44729, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 44756, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 44794, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 44836, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 44867, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 44902, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 44936, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 44974, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 45005, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 45040, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 45068, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 45100, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 45130, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 45164, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 45192, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 45224, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 45244, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 45266, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 45295, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 45316, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 45345, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 45378, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 45410, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 45437, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 45468, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 45498, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 45515, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 45536, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 45563, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 45575, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 45591, 0x00008A1A }, /* GL_VOLATILE_APPLE */
-   { 45609, 0x0000911D }, /* GL_WAIT_FAILED */
-   { 45624, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 45644, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 45675, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 45710, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
-   { 45745, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
-   { 45765, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 45793, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
-   { 45821, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 45846, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
-   { 45871, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 45898, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
-   { 45925, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 45950, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
-   { 45975, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 45999, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 46018, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 46032, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 46050, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
-   { 46068, 0x00001506 }, /* GL_XOR */
-   { 46075, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 46094, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 46108, 0x00000000 }, /* GL_ZERO */
-   { 46116, 0x00000D16 }, /* GL_ZOOM_X */
-   { 46126, 0x00000D17 }, /* GL_ZOOM_Y */
+   { 29889, 0x00008559 }, /* GL_PRIMITIVE_RESTART_INDEX_NV */
+   { 29919, 0x00008558 }, /* GL_PRIMITIVE_RESTART_NV */
+   { 29943, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 29976, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 30008, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 30031, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
+   { 30061, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
+   { 30090, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 30113, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 30143, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 30172, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 30200, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 30222, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 30250, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 30278, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 30300, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 30321, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 30361, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 30400, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 30430, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 30465, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 30498, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 30532, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 30571, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 30610, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 30632, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 30658, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 30682, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
+   { 30708, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 30731, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 30753, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 30774, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 30795, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 30822, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 30854, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 30886, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 30921, 0x00001701 }, /* GL_PROJECTION */
+   { 30935, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 30956, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 30999, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 31025, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
+   { 31045, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
+   { 31069, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 31090, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 31109, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 31132, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 31171, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 31209, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 31229, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 31259, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 31283, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 31303, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 31333, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 31357, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 31377, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 31410, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 31436, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 31466, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 31497, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 31527, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
+   { 31546, 0x00002003 }, /* GL_Q */
+   { 31551, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 31576, 0x00000007 }, /* GL_QUADS */
+   { 31585, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+   { 31629, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+   { 31677, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 31694, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 31708, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
+   { 31738, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
+   { 31765, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 31787, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 31813, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
+   { 31833, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 31849, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 31869, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 31895, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 31925, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
+   { 31942, 0x00002002 }, /* GL_R */
+   { 31947, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 31959, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
+   { 31985, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 32018, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 32033, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 32053, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
+   { 32081, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 32113, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 32137, 0x000088B8 }, /* GL_READ_ONLY */
+   { 32150, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 32167, 0x000088BA }, /* GL_READ_WRITE */
+   { 32181, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 32199, 0x00001903 }, /* GL_RED */
+   { 32206, 0x00008016 }, /* GL_REDUCE */
+   { 32216, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 32230, 0x00000D15 }, /* GL_RED_BIAS */
+   { 32242, 0x00000D52 }, /* GL_RED_BITS */
+   { 32254, 0x00000D14 }, /* GL_RED_SCALE */
+   { 32267, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 32285, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 32307, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 32328, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
+   { 32350, 0x00008A19 }, /* GL_RELEASED_APPLE */
+   { 32368, 0x00001C00 }, /* GL_RENDER */
+   { 32378, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 32394, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 32421, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
+   { 32452, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
+   { 32476, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 32504, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
+   { 32532, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 32558, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
+   { 32588, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 32615, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
+   { 32646, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 32666, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 32693, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
+   { 32724, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 32747, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 32774, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
+   { 32801, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 32833, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 32869, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
+   { 32905, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
+   { 32925, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 32950, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
+   { 32979, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 33003, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
+   { 33031, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 33060, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
+   { 33093, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 33115, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 33141, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
+   { 33167, 0x00001F01 }, /* GL_RENDERER */
+   { 33179, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 33194, 0x00002901 }, /* GL_REPEAT */
+   { 33204, 0x00001E01 }, /* GL_REPLACE */
+   { 33215, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 33230, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 33253, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 33271, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 33293, 0x00008A1B }, /* GL_RETAINED_APPLE */
+   { 33311, 0x00000102 }, /* GL_RETURN */
+   { 33321, 0x00001907 }, /* GL_RGB */
+   { 33328, 0x00008052 }, /* GL_RGB10 */
+   { 33337, 0x00008059 }, /* GL_RGB10_A2 */
+   { 33349, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 33365, 0x00008052 }, /* GL_RGB10_EXT */
+   { 33378, 0x00008053 }, /* GL_RGB12 */
+   { 33387, 0x00008053 }, /* GL_RGB12_EXT */
+   { 33400, 0x00008054 }, /* GL_RGB16 */
+   { 33409, 0x00008054 }, /* GL_RGB16_EXT */
+   { 33422, 0x0000804E }, /* GL_RGB2_EXT */
+   { 33434, 0x0000804F }, /* GL_RGB4 */
+   { 33442, 0x0000804F }, /* GL_RGB4_EXT */
+   { 33454, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 33467, 0x00008050 }, /* GL_RGB5 */
+   { 33475, 0x00008D62 }, /* GL_RGB565 */
+   { 33485, 0x00008D62 }, /* GL_RGB565_OES */
+   { 33499, 0x00008057 }, /* GL_RGB5_A1 */
+   { 33510, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 33525, 0x00008057 }, /* GL_RGB5_A1_OES */
+   { 33540, 0x00008050 }, /* GL_RGB5_EXT */
+   { 33552, 0x00008051 }, /* GL_RGB8 */
+   { 33560, 0x00008051 }, /* GL_RGB8_EXT */
+   { 33572, 0x00008051 }, /* GL_RGB8_OES */
+   { 33584, 0x00001908 }, /* GL_RGBA */
+   { 33592, 0x0000805A }, /* GL_RGBA12 */
+   { 33602, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 33616, 0x0000805B }, /* GL_RGBA16 */
+   { 33626, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 33640, 0x00008055 }, /* GL_RGBA2 */
+   { 33649, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 33662, 0x00008056 }, /* GL_RGBA4 */
+   { 33671, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 33690, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 33703, 0x00008056 }, /* GL_RGBA4_OES */
+   { 33716, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 33730, 0x00008058 }, /* GL_RGBA8 */
+   { 33739, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 33752, 0x00008058 }, /* GL_RGBA8_OES */
+   { 33765, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 33780, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 33798, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 33811, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 33824, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 33838, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 33850, 0x00008573 }, /* GL_RGB_SCALE */
+   { 33863, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 33880, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 33897, 0x00000407 }, /* GL_RIGHT */
+   { 33906, 0x00002000 }, /* GL_S */
+   { 33911, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 33925, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 33946, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 33960, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 33981, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 33995, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
+   { 34013, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 34029, 0x000080A9 }, /* GL_SAMPLES */
+   { 34040, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 34056, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 34071, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 34089, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 34111, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 34139, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 34171, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 34194, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 34221, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 34239, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 34262, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 34284, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 34303, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 34326, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 34352, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 34382, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 34407, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 34436, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 34451, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 34466, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 34482, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 34507, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 34547, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 34591, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 34624, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 34654, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 34686, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 34716, 0x00001C02 }, /* GL_SELECT */
+   { 34726, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 34754, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 34779, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 34795, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
+   { 34819, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 34846, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 34877, 0x0000150F }, /* GL_SET */
+   { 34884, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
+   { 34909, 0x00008DFA }, /* GL_SHADER_COMPILER */
+   { 34928, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 34949, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 34973, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 34988, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 35003, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 35031, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 35054, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 35084, 0x00001601 }, /* GL_SHININESS */
+   { 35097, 0x00001402 }, /* GL_SHORT */
+   { 35106, 0x00009119 }, /* GL_SIGNALED */
+   { 35118, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 35139, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 35155, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 35175, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 35194, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 35208, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 35223, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 35245, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 35265, 0x00001D01 }, /* GL_SMOOTH */
+   { 35275, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 35308, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 35335, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 35368, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 35395, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 35412, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 35433, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 35454, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 35469, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 35488, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 35507, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 35524, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 35545, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 35566, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 35581, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 35600, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 35619, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 35636, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 35657, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 35678, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 35693, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 35712, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 35731, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 35751, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 35769, 0x00001202 }, /* GL_SPECULAR */
+   { 35781, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 35795, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 35810, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 35828, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 35845, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 35859, 0x00008580 }, /* GL_SRC0_RGB */
+   { 35871, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 35885, 0x00008581 }, /* GL_SRC1_RGB */
+   { 35897, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 35911, 0x00008582 }, /* GL_SRC2_RGB */
+   { 35923, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 35936, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 35958, 0x00000300 }, /* GL_SRC_COLOR */
+   { 35971, 0x00008C40 }, /* GL_SRGB */
+   { 35979, 0x00008C41 }, /* GL_SRGB8 */
+   { 35988, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 36004, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 36018, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 36036, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 36055, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 36070, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 36089, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 36104, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 36123, 0x000088E5 }, /* GL_STATIC_READ */
+   { 36138, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 36157, 0x00001802 }, /* GL_STENCIL */
+   { 36168, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 36190, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 36216, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
+   { 36242, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 36263, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 36288, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 36309, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 36334, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 36366, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 36402, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 36434, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 36470, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 36490, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 36517, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 36543, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 36559, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 36581, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 36604, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 36620, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 36636, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 36653, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
+   { 36671, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
+   { 36690, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 36713, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 36735, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
+   { 36757, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
+   { 36775, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 36797, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
+   { 36819, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
+   { 36837, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 36859, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
+   { 36881, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 36902, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 36929, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 36956, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 36971, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 36987, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 37016, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 37038, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 37059, 0x00000C33 }, /* GL_STEREO */
+   { 37069, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
+   { 37093, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
+   { 37118, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
+   { 37142, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 37157, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 37176, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 37191, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 37210, 0x000088E1 }, /* GL_STREAM_READ */
+   { 37225, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 37244, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 37261, 0x000084E7 }, /* GL_SUBTRACT */
+   { 37273, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 37289, 0x00009113 }, /* GL_SYNC_CONDITION */
+   { 37307, 0x00009116 }, /* GL_SYNC_FENCE */
+   { 37321, 0x00009115 }, /* GL_SYNC_FLAGS */
+   { 37335, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
+   { 37362, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+   { 37392, 0x00009114 }, /* GL_SYNC_STATUS */
+   { 37407, 0x00002001 }, /* GL_T */
+   { 37412, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 37427, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 37446, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 37462, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 37477, 0x00002A27 }, /* GL_T2F_V3F */
+   { 37488, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 37507, 0x00002A28 }, /* GL_T4F_V4F */
+   { 37518, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 37541, 0x00001702 }, /* GL_TEXTURE */
+   { 37552, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 37564, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 37580, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 37592, 0x000084CA }, /* GL_TEXTURE10 */
+   { 37605, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 37622, 0x000084CB }, /* GL_TEXTURE11 */
+   { 37635, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 37652, 0x000084CC }, /* GL_TEXTURE12 */
+   { 37665, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 37682, 0x000084CD }, /* GL_TEXTURE13 */
+   { 37695, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 37712, 0x000084CE }, /* GL_TEXTURE14 */
+   { 37725, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 37742, 0x000084CF }, /* GL_TEXTURE15 */
+   { 37755, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 37772, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 37785, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 37802, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 37815, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 37832, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 37845, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 37862, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 37875, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 37892, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 37908, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 37920, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 37933, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 37950, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 37963, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 37980, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 37993, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 38010, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 38023, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 38040, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 38053, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 38070, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 38083, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 38100, 0x000084DA }, /* GL_TEXTURE26 */
+   { 38113, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 38130, 0x000084DB }, /* GL_TEXTURE27 */
+   { 38143, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 38160, 0x000084DC }, /* GL_TEXTURE28 */
+   { 38173, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 38190, 0x000084DD }, /* GL_TEXTURE29 */
+   { 38203, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 38220, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 38236, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 38248, 0x000084DE }, /* GL_TEXTURE30 */
+   { 38261, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 38278, 0x000084DF }, /* GL_TEXTURE31 */
+   { 38291, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 38308, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 38324, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 38336, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 38352, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 38364, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 38380, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 38392, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 38408, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 38420, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 38436, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 38448, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 38464, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 38476, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 38492, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 38506, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 38530, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 38544, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 38568, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 38582, 0x0000806F }, /* GL_TEXTURE_3D_OES */
+   { 38600, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 38622, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 38648, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 38670, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 38692, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 38724, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 38746, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 38778, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 38800, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
+   { 38826, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 38854, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 38886, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
+   { 38918, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 38951, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 38983, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 38998, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 39019, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 39044, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 39062, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 39086, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 39117, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 39147, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 39177, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 39212, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 39243, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 39281, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 39308, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 39340, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 39374, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 39398, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 39426, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 39450, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 39478, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 39511, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 39535, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 39557, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 39579, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 39605, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 39639, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 39672, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 39709, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 39737, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 39769, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 39792, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 39830, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 39872, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 39903, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 39931, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 39961, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 39989, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
+   { 40014, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 40034, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 40058, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 40089, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 40124, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
+   { 40159, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 40190, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 40225, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
+   { 40260, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 40291, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 40326, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
+   { 40361, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
+   { 40385, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 40416, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 40451, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
+   { 40486, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 40517, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 40552, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
+   { 40587, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 40618, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 40653, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
+   { 40688, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+   { 40717, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 40734, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 40756, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 40782, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 40797, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 40818, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 40838, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 40864, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
+   { 40894, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 40914, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
+   { 40938, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 40955, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 40972, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 40989, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
+   { 41012, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 41029, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 41054, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 41076, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 41102, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 41120, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 41146, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 41172, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 41202, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 41229, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 41254, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 41274, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 41298, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 41325, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 41352, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 41379, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 41405, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 41435, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 41457, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 41475, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 41515, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 41545, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 41573, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 41601, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 41629, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 41650, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 41669, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 41691, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 41710, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 41730, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+   { 41760, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+   { 41791, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 41816, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 41840, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 41860, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 41884, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 41904, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 41927, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 41951, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
+   { 41979, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+   { 42009, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 42034, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 42068, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 42085, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 42103, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
+   { 42125, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 42143, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 42161, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
+   { 42180, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 42200, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 42219, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 42248, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 42265, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
+   { 42287, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
+   { 42317, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+   { 42353, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
+   { 42394, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
+   { 42427, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
+   { 42465, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+   { 42501, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
+   { 42539, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
+   { 42578, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
+   { 42623, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
+   { 42658, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
+   { 42703, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 42729, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 42759, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 42791, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 42821, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 42855, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 42871, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 42902, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 42937, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 42965, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 42997, 0x00000004 }, /* GL_TRIANGLES */
+   { 43010, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
+   { 43037, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 43053, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 43074, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 43092, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
+   { 43124, 0x00000001 }, /* GL_TRUE */
+   { 43132, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
+   { 43151, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 43171, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 43194, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 43214, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 43235, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 43257, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 43279, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 43299, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 43320, 0x00009118 }, /* GL_UNSIGNALED */
+   { 43334, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 43351, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 43378, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 43401, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 43417, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 43444, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+   { 43475, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 43496, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
+   { 43521, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 43545, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
+   { 43570, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 43601, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
+   { 43636, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 43660, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 43688, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 43711, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 43729, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 43759, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
+   { 43793, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 43819, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 43849, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
+   { 43883, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 43909, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 43933, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 43961, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 43989, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 44016, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 44048, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 44079, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 44093, 0x00002A20 }, /* GL_V2F */
+   { 44100, 0x00002A21 }, /* GL_V3F */
+   { 44107, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 44126, 0x00001F00 }, /* GL_VENDOR */
+   { 44136, 0x00001F02 }, /* GL_VERSION */
+   { 44147, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 44163, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 44187, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 44217, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 44248, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 44283, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 44307, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 44328, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 44351, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 44372, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 44399, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 44427, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 44455, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 44483, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 44511, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 44539, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 44567, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 44594, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 44621, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 44648, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 44675, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 44702, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 44729, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 44756, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 44783, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 44810, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 44848, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 44890, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 44921, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 44956, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 44990, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 45028, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 45059, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 45094, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 45122, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 45154, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 45184, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 45218, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 45246, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 45278, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 45298, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 45320, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 45349, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 45370, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 45399, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 45432, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 45464, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 45491, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 45522, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 45552, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 45569, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 45590, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 45617, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 45629, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 45645, 0x00008A1A }, /* GL_VOLATILE_APPLE */
+   { 45663, 0x0000911D }, /* GL_WAIT_FAILED */
+   { 45678, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 45698, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 45729, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 45764, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
+   { 45799, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
+   { 45819, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 45847, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
+   { 45875, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 45900, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
+   { 45925, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 45952, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
+   { 45979, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 46004, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
+   { 46029, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 46053, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 46072, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 46086, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 46104, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
+   { 46122, 0x00001506 }, /* GL_XOR */
+   { 46129, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 46148, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 46162, 0x00000000 }, /* GL_ZERO */
+   { 46170, 0x00000D16 }, /* GL_ZOOM_X */
+   { 46180, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1423] =
+static const unsigned reduced_enums[1425] =
 {
        500, /* GL_FALSE */
        760, /* GL_LINES */
        763, /* GL_LINE_LOOP */
        770, /* GL_LINE_STRIP */
-      1934, /* GL_TRIANGLES */
-      1938, /* GL_TRIANGLE_STRIP */
-      1936, /* GL_TRIANGLE_FAN */
-      1393, /* GL_QUADS */
-      1397, /* GL_QUAD_STRIP */
+      1936, /* GL_TRIANGLES */
+      1940, /* GL_TRIANGLE_STRIP */
+      1938, /* GL_TRIANGLE_FAN */
+      1395, /* GL_QUADS */
+      1399, /* GL_QUAD_STRIP */
       1273, /* GL_POLYGON */
        761, /* GL_LINES_ADJACENCY_ARB */
        771, /* GL_LINE_STRIP_ADJACENCY_ARB */
-      1935, /* GL_TRIANGLES_ADJACENCY_ARB */
-      1939, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
+      1937, /* GL_TRIANGLES_ADJACENCY_ARB */
+      1941, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
       1285, /* GL_POLYGON_STIPPLE_BIT */
       1228, /* GL_PIXEL_MODE_BIT */
        747, /* GL_LIGHTING_BIT */
        532, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
        781, /* GL_LOAD */
-      1471, /* GL_RETURN */
+      1473, /* GL_RETURN */
       1096, /* GL_MULT */
         23, /* GL_ADD */
       1112, /* GL_NEVER */
@@ -4205,15 +4209,15 @@ static const unsigned reduced_enums[1423] =
       1129, /* GL_NOTEQUAL */
        648, /* GL_GEQUAL */
         47, /* GL_ALWAYS */
-      1622, /* GL_SRC_COLOR */
+      1624, /* GL_SRC_COLOR */
       1161, /* GL_ONE_MINUS_SRC_COLOR */
-      1620, /* GL_SRC_ALPHA */
+      1622, /* GL_SRC_ALPHA */
       1160, /* GL_ONE_MINUS_SRC_ALPHA */
        469, /* GL_DST_ALPHA */
       1158, /* GL_ONE_MINUS_DST_ALPHA */
        470, /* GL_DST_COLOR */
       1159, /* GL_ONE_MINUS_DST_COLOR */
-      1621, /* GL_SRC_ALPHA_SATURATE */
+      1623, /* GL_SRC_ALPHA_SATURATE */
        629, /* GL_FRONT_LEFT */
        630, /* GL_FRONT_RIGHT */
         69, /* GL_BACK_LEFT */
@@ -4221,7 +4225,7 @@ static const unsigned reduced_enums[1423] =
        626, /* GL_FRONT */
         68, /* GL_BACK */
        735, /* GL_LEFT */
-      1519, /* GL_RIGHT */
+      1521, /* GL_RIGHT */
        627, /* GL_FRONT_AND_BACK */
         63, /* GL_AUX0 */
         64, /* GL_AUX1 */
@@ -4230,8 +4234,8 @@ static const unsigned reduced_enums[1423] =
        723, /* GL_INVALID_ENUM */
        728, /* GL_INVALID_VALUE */
        727, /* GL_INVALID_OPERATION */
-      1627, /* GL_STACK_OVERFLOW */
-      1628, /* GL_STACK_UNDERFLOW */
+      1629, /* GL_STACK_OVERFLOW */
+      1630, /* GL_STACK_UNDERFLOW */
       1186, /* GL_OUT_OF_MEMORY */
        724, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
@@ -4290,7 +4294,7 @@ static const unsigned reduced_enums[1423] =
        751, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
        752, /* GL_LIGHT_MODEL_TWO_SIDE */
        748, /* GL_LIGHT_MODEL_AMBIENT */
-      1569, /* GL_SHADE_MODEL */
+      1571, /* GL_SHADE_MODEL */
        206, /* GL_COLOR_MATERIAL_FACE */
        207, /* GL_COLOR_MATERIAL_PARAMETER */
        205, /* GL_COLOR_MATERIAL */
@@ -4307,24 +4311,24 @@ static const unsigned reduced_enums[1423] =
        375, /* GL_DEPTH_CLEAR_VALUE */
        389, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1671, /* GL_STENCIL_TEST */
-      1652, /* GL_STENCIL_CLEAR_VALUE */
-      1654, /* GL_STENCIL_FUNC */
-      1673, /* GL_STENCIL_VALUE_MASK */
-      1653, /* GL_STENCIL_FAIL */
-      1668, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1669, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1670, /* GL_STENCIL_REF */
-      1674, /* GL_STENCIL_WRITEMASK */
+      1673, /* GL_STENCIL_TEST */
+      1654, /* GL_STENCIL_CLEAR_VALUE */
+      1656, /* GL_STENCIL_FUNC */
+      1675, /* GL_STENCIL_VALUE_MASK */
+      1655, /* GL_STENCIL_FAIL */
+      1670, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1671, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1672, /* GL_STENCIL_REF */
+      1676, /* GL_STENCIL_WRITEMASK */
        922, /* GL_MATRIX_MODE */
       1118, /* GL_NORMALIZE */
-      2037, /* GL_VIEWPORT */
+      2039, /* GL_VIEWPORT */
       1091, /* GL_MODELVIEW_STACK_DEPTH */
-      1370, /* GL_PROJECTION_STACK_DEPTH */
-      1896, /* GL_TEXTURE_STACK_DEPTH */
+      1372, /* GL_PROJECTION_STACK_DEPTH */
+      1898, /* GL_TEXTURE_STACK_DEPTH */
       1088, /* GL_MODELVIEW_MATRIX */
-      1368, /* GL_PROJECTION_MATRIX */
-      1878, /* GL_TEXTURE_MATRIX */
+      1370, /* GL_PROJECTION_MATRIX */
+      1880, /* GL_TEXTURE_MATRIX */
         61, /* GL_ATTRIB_STACK_DEPTH */
        148, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         43, /* GL_ALPHA_TEST */
@@ -4339,27 +4343,27 @@ static const unsigned reduced_enums[1423] =
        204, /* GL_COLOR_LOGIC_OP */
         67, /* GL_AUX_BUFFERS */
        415, /* GL_DRAW_BUFFER */
-      1412, /* GL_READ_BUFFER */
-      1547, /* GL_SCISSOR_BOX */
-      1548, /* GL_SCISSOR_TEST */
+      1414, /* GL_READ_BUFFER */
+      1549, /* GL_SCISSOR_BOX */
+      1550, /* GL_SCISSOR_TEST */
        694, /* GL_INDEX_CLEAR_VALUE */
        699, /* GL_INDEX_WRITEMASK */
        201, /* GL_COLOR_CLEAR_VALUE */
        243, /* GL_COLOR_WRITEMASK */
        696, /* GL_INDEX_MODE */
-      1512, /* GL_RGBA_MODE */
+      1514, /* GL_RGBA_MODE */
        414, /* GL_DOUBLEBUFFER */
-      1675, /* GL_STEREO */
-      1463, /* GL_RENDER_MODE */
+      1677, /* GL_STEREO */
+      1465, /* GL_RENDER_MODE */
       1207, /* GL_PERSPECTIVE_CORRECTION_HINT */
       1265, /* GL_POINT_SMOOTH_HINT */
        766, /* GL_LINE_SMOOTH_HINT */
       1283, /* GL_POLYGON_SMOOTH_HINT */
        552, /* GL_FOG_HINT */
-      1858, /* GL_TEXTURE_GEN_S */
-      1860, /* GL_TEXTURE_GEN_T */
-      1857, /* GL_TEXTURE_GEN_R */
-      1856, /* GL_TEXTURE_GEN_Q */
+      1860, /* GL_TEXTURE_GEN_S */
+      1862, /* GL_TEXTURE_GEN_T */
+      1859, /* GL_TEXTURE_GEN_R */
+      1858, /* GL_TEXTURE_GEN_Q */
       1220, /* GL_PIXEL_MAP_I_TO_I */
       1226, /* GL_PIXEL_MAP_S_TO_S */
       1222, /* GL_PIXEL_MAP_I_TO_R */
@@ -4380,12 +4384,12 @@ static const unsigned reduced_enums[1423] =
       1213, /* GL_PIXEL_MAP_G_TO_G_SIZE */
       1211, /* GL_PIXEL_MAP_B_TO_B_SIZE */
       1209, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1949, /* GL_UNPACK_SWAP_BYTES */
-      1944, /* GL_UNPACK_LSB_FIRST */
-      1945, /* GL_UNPACK_ROW_LENGTH */
-      1948, /* GL_UNPACK_SKIP_ROWS */
-      1947, /* GL_UNPACK_SKIP_PIXELS */
-      1942, /* GL_UNPACK_ALIGNMENT */
+      1951, /* GL_UNPACK_SWAP_BYTES */
+      1946, /* GL_UNPACK_LSB_FIRST */
+      1947, /* GL_UNPACK_ROW_LENGTH */
+      1950, /* GL_UNPACK_SKIP_ROWS */
+      1949, /* GL_UNPACK_SKIP_PIXELS */
+      1944, /* GL_UNPACK_ALIGNMENT */
       1195, /* GL_PACK_SWAP_BYTES */
       1190, /* GL_PACK_LSB_FIRST */
       1191, /* GL_PACK_ROW_LENGTH */
@@ -4396,10 +4400,10 @@ static const unsigned reduced_enums[1423] =
        868, /* GL_MAP_STENCIL */
        698, /* GL_INDEX_SHIFT */
        697, /* GL_INDEX_OFFSET */
-      1426, /* GL_RED_SCALE */
-      1424, /* GL_RED_BIAS */
-      2063, /* GL_ZOOM_X */
-      2064, /* GL_ZOOM_Y */
+      1428, /* GL_RED_SCALE */
+      1426, /* GL_RED_BIAS */
+      2065, /* GL_ZOOM_X */
+      2066, /* GL_ZOOM_Y */
        653, /* GL_GREEN_SCALE */
        651, /* GL_GREEN_BIAS */
        101, /* GL_BLUE_SCALE */
@@ -4420,14 +4424,14 @@ static const unsigned reduced_enums[1423] =
       1014, /* GL_MAX_TEXTURE_STACK_DEPTH */
       1036, /* GL_MAX_VIEWPORT_DIMS */
        930, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1685, /* GL_SUBPIXEL_BITS */
+      1687, /* GL_SUBPIXEL_BITS */
        693, /* GL_INDEX_BITS */
-      1425, /* GL_RED_BITS */
+      1427, /* GL_RED_BITS */
        652, /* GL_GREEN_BITS */
        100, /* GL_BLUE_BITS */
         41, /* GL_ALPHA_BITS */
        369, /* GL_DEPTH_BITS */
-      1650, /* GL_STENCIL_BITS */
+      1652, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
@@ -4456,39 +4460,39 @@ static const unsigned reduced_enums[1423] =
        811, /* GL_MAP1_GRID_SEGMENTS */
        837, /* GL_MAP2_GRID_DOMAIN */
        838, /* GL_MAP2_GRID_SEGMENTS */
-      1768, /* GL_TEXTURE_1D */
-      1770, /* GL_TEXTURE_2D */
+      1770, /* GL_TEXTURE_1D */
+      1772, /* GL_TEXTURE_2D */
        503, /* GL_FEEDBACK_BUFFER_POINTER */
        504, /* GL_FEEDBACK_BUFFER_SIZE */
        505, /* GL_FEEDBACK_BUFFER_TYPE */
-      1557, /* GL_SELECTION_BUFFER_POINTER */
-      1558, /* GL_SELECTION_BUFFER_SIZE */
-      1902, /* GL_TEXTURE_WIDTH */
-      1864, /* GL_TEXTURE_HEIGHT */
-      1808, /* GL_TEXTURE_COMPONENTS */
-      1792, /* GL_TEXTURE_BORDER_COLOR */
-      1791, /* GL_TEXTURE_BORDER */
+      1559, /* GL_SELECTION_BUFFER_POINTER */
+      1560, /* GL_SELECTION_BUFFER_SIZE */
+      1904, /* GL_TEXTURE_WIDTH */
+      1866, /* GL_TEXTURE_HEIGHT */
+      1810, /* GL_TEXTURE_COMPONENTS */
+      1794, /* GL_TEXTURE_BORDER_COLOR */
+      1793, /* GL_TEXTURE_BORDER */
        406, /* GL_DONT_CARE */
        501, /* GL_FASTEST */
       1113, /* GL_NICEST */
         48, /* GL_AMBIENT */
        403, /* GL_DIFFUSE */
-      1609, /* GL_SPECULAR */
+      1611, /* GL_SPECULAR */
       1287, /* GL_POSITION */
-      1612, /* GL_SPOT_DIRECTION */
-      1613, /* GL_SPOT_EXPONENT */
-      1611, /* GL_SPOT_CUTOFF */
+      1614, /* GL_SPOT_DIRECTION */
+      1615, /* GL_SPOT_EXPONENT */
+      1613, /* GL_SPOT_CUTOFF */
        288, /* GL_CONSTANT_ATTENUATION */
        755, /* GL_LINEAR_ATTENUATION */
-      1392, /* GL_QUADRATIC_ATTENUATION */
+      1394, /* GL_QUADRATIC_ATTENUATION */
        257, /* GL_COMPILE */
        258, /* GL_COMPILE_AND_EXECUTE */
        132, /* GL_BYTE */
-      1951, /* GL_UNSIGNED_BYTE */
-      1574, /* GL_SHORT */
-      1966, /* GL_UNSIGNED_SHORT */
+      1953, /* GL_UNSIGNED_BYTE */
+      1576, /* GL_SHORT */
+      1968, /* GL_UNSIGNED_SHORT */
        701, /* GL_INT */
-      1954, /* GL_UNSIGNED_INT */
+      1956, /* GL_UNSIGNED_INT */
        512, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
@@ -4502,7 +4506,7 @@ static const unsigned reduced_enums[1423] =
        313, /* GL_COPY */
         51, /* GL_AND_INVERTED */
       1116, /* GL_NOOP */
-      2059, /* GL_XOR */
+      2061, /* GL_XOR */
       1182, /* GL_OR */
       1117, /* GL_NOR */
        491, /* GL_EQUIV */
@@ -4511,58 +4515,58 @@ static const unsigned reduced_enums[1423] =
        314, /* GL_COPY_INVERTED */
       1184, /* GL_OR_INVERTED */
       1106, /* GL_NAND */
-      1563, /* GL_SET */
+      1565, /* GL_SET */
        488, /* GL_EMISSION */
-      1573, /* GL_SHININESS */
+      1575, /* GL_SHININESS */
         49, /* GL_AMBIENT_AND_DIFFUSE */
        203, /* GL_COLOR_INDEXES */
       1055, /* GL_MODELVIEW */
-      1367, /* GL_PROJECTION */
-      1703, /* GL_TEXTURE */
+      1369, /* GL_PROJECTION */
+      1705, /* GL_TEXTURE */
        159, /* GL_COLOR */
        361, /* GL_DEPTH */
-      1635, /* GL_STENCIL */
+      1637, /* GL_STENCIL */
        202, /* GL_COLOR_INDEX */
-      1655, /* GL_STENCIL_INDEX */
+      1657, /* GL_STENCIL_INDEX */
        376, /* GL_DEPTH_COMPONENT */
-      1421, /* GL_RED */
+      1423, /* GL_RED */
        650, /* GL_GREEN */
         98, /* GL_BLUE */
         31, /* GL_ALPHA */
-      1472, /* GL_RGB */
-      1495, /* GL_RGBA */
+      1474, /* GL_RGB */
+      1497, /* GL_RGBA */
        787, /* GL_LUMINANCE */
        808, /* GL_LUMINANCE_ALPHA */
         74, /* GL_BITMAP */
       1237, /* GL_POINT */
        753, /* GL_LINE */
        506, /* GL_FILL */
-      1432, /* GL_RENDER */
+      1434, /* GL_RENDER */
        502, /* GL_FEEDBACK */
-      1556, /* GL_SELECT */
+      1558, /* GL_SELECT */
        511, /* GL_FLAT */
-      1584, /* GL_SMOOTH */
+      1586, /* GL_SMOOTH */
        732, /* GL_KEEP */
-      1465, /* GL_REPLACE */
+      1467, /* GL_REPLACE */
        683, /* GL_INCR */
        357, /* GL_DECR */
-      1983, /* GL_VENDOR */
-      1462, /* GL_RENDERER */
-      1984, /* GL_VERSION */
+      1985, /* GL_VENDOR */
+      1464, /* GL_RENDERER */
+      1986, /* GL_VERSION */
        495, /* GL_EXTENSIONS */
-      1520, /* GL_S */
-      1694, /* GL_T */
-      1408, /* GL_R */
-      1391, /* GL_Q */
+      1522, /* GL_S */
+      1696, /* GL_T */
+      1410, /* GL_R */
+      1393, /* GL_Q */
       1092, /* GL_MODULATE */
        356, /* GL_DECAL */
-      1851, /* GL_TEXTURE_ENV_MODE */
-      1850, /* GL_TEXTURE_ENV_COLOR */
-      1849, /* GL_TEXTURE_ENV */
+      1853, /* GL_TEXTURE_ENV_MODE */
+      1852, /* GL_TEXTURE_ENV_COLOR */
+      1851, /* GL_TEXTURE_ENV */
        496, /* GL_EYE_LINEAR */
       1143, /* GL_OBJECT_LINEAR */
-      1610, /* GL_SPHERE_MAP */
-      1854, /* GL_TEXTURE_GEN_MODE */
+      1612, /* GL_SPHERE_MAP */
+      1856, /* GL_TEXTURE_GEN_MODE */
       1145, /* GL_OBJECT_PLANE */
        497, /* GL_EYE_PLANE */
       1107, /* GL_NEAREST */
@@ -4571,30 +4575,30 @@ static const unsigned reduced_enums[1423] =
        759, /* GL_LINEAR_MIPMAP_NEAREST */
       1110, /* GL_NEAREST_MIPMAP_LINEAR */
        758, /* GL_LINEAR_MIPMAP_LINEAR */
-      1877, /* GL_TEXTURE_MAG_FILTER */
-      1886, /* GL_TEXTURE_MIN_FILTER */
-      1905, /* GL_TEXTURE_WRAP_S */
-      1906, /* GL_TEXTURE_WRAP_T */
+      1879, /* GL_TEXTURE_MAG_FILTER */
+      1888, /* GL_TEXTURE_MIN_FILTER */
+      1907, /* GL_TEXTURE_WRAP_S */
+      1908, /* GL_TEXTURE_WRAP_T */
        138, /* GL_CLAMP */
-      1464, /* GL_REPEAT */
+      1466, /* GL_REPEAT */
       1281, /* GL_POLYGON_OFFSET_UNITS */
       1280, /* GL_POLYGON_OFFSET_POINT */
       1279, /* GL_POLYGON_OFFSET_LINE */
-      1409, /* GL_R3_G3_B2 */
-      1980, /* GL_V2F */
-      1981, /* GL_V3F */
+      1411, /* GL_R3_G3_B2 */
+      1982, /* GL_V2F */
+      1983, /* GL_V3F */
        135, /* GL_C4UB_V2F */
        136, /* GL_C4UB_V3F */
        133, /* GL_C3F_V3F */
       1104, /* GL_N3F_V3F */
        134, /* GL_C4F_N3F_V3F */
-      1699, /* GL_T2F_V3F */
-      1701, /* GL_T4F_V4F */
-      1697, /* GL_T2F_C4UB_V3F */
-      1695, /* GL_T2F_C3F_V3F */
-      1698, /* GL_T2F_N3F_V3F */
-      1696, /* GL_T2F_C4F_N3F_V3F */
-      1700, /* GL_T4F_C4F_N3F_V4F */
+      1701, /* GL_T2F_V3F */
+      1703, /* GL_T4F_V4F */
+      1699, /* GL_T2F_C4UB_V3F */
+      1697, /* GL_T2F_C3F_V3F */
+      1700, /* GL_T2F_N3F_V3F */
+      1698, /* GL_T2F_C4F_N3F_V3F */
+      1702, /* GL_T4F_C4F_N3F_V4F */
        151, /* GL_CLIP_PLANE0 */
        152, /* GL_CLIP_PLANE1 */
        153, /* GL_CLIP_PLANE2 */
@@ -4623,11 +4627,11 @@ static const unsigned reduced_enums[1423] =
        634, /* GL_FUNC_REVERSE_SUBTRACT */
        293, /* GL_CONVOLUTION_1D */
        294, /* GL_CONVOLUTION_2D */
-      1559, /* GL_SEPARABLE_2D */
+      1561, /* GL_SEPARABLE_2D */
        297, /* GL_CONVOLUTION_BORDER_MODE */
        301, /* GL_CONVOLUTION_FILTER_SCALE */
        299, /* GL_CONVOLUTION_FILTER_BIAS */
-      1422, /* GL_REDUCE */
+      1424, /* GL_REDUCE */
        303, /* GL_CONVOLUTION_FORMAT */
        307, /* GL_CONVOLUTION_WIDTH */
        305, /* GL_CONVOLUTION_HEIGHT */
@@ -4642,7 +4646,7 @@ static const unsigned reduced_enums[1423] =
       1309, /* GL_POST_CONVOLUTION_BLUE_BIAS */
       1305, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
        659, /* GL_HISTOGRAM */
-      1374, /* GL_PROXY_HISTOGRAM */
+      1376, /* GL_PROXY_HISTOGRAM */
        675, /* GL_HISTOGRAM_WIDTH */
        665, /* GL_HISTOGRAM_FORMAT */
        671, /* GL_HISTOGRAM_RED_SIZE */
@@ -4654,16 +4658,16 @@ static const unsigned reduced_enums[1423] =
       1040, /* GL_MINMAX */
       1042, /* GL_MINMAX_FORMAT */
       1044, /* GL_MINMAX_SINK */
-      1702, /* GL_TABLE_TOO_LARGE_EXT */
-      1953, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1969, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1972, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1963, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1955, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1704, /* GL_TABLE_TOO_LARGE_EXT */
+      1955, /* GL_UNSIGNED_BYTE_3_3_2 */
+      1971, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      1974, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      1965, /* GL_UNSIGNED_INT_8_8_8_8 */
+      1957, /* GL_UNSIGNED_INT_10_10_10_2 */
       1278, /* GL_POLYGON_OFFSET_FILL */
       1277, /* GL_POLYGON_OFFSET_FACTOR */
       1276, /* GL_POLYGON_OFFSET_BIAS */
-      1468, /* GL_RESCALE_NORMAL */
+      1470, /* GL_RESCALE_NORMAL */
         36, /* GL_ALPHA4 */
         38, /* GL_ALPHA8 */
         32, /* GL_ALPHA12 */
@@ -4683,53 +4687,53 @@ static const unsigned reduced_enums[1423] =
        709, /* GL_INTENSITY8 */
        703, /* GL_INTENSITY12 */
        705, /* GL_INTENSITY16 */
-      1481, /* GL_RGB2_EXT */
-      1482, /* GL_RGB4 */
-      1485, /* GL_RGB5 */
-      1492, /* GL_RGB8 */
-      1473, /* GL_RGB10 */
-      1477, /* GL_RGB12 */
-      1479, /* GL_RGB16 */
-      1500, /* GL_RGBA2 */
-      1502, /* GL_RGBA4 */
-      1488, /* GL_RGB5_A1 */
-      1507, /* GL_RGBA8 */
-      1474, /* GL_RGB10_A2 */
-      1496, /* GL_RGBA12 */
-      1498, /* GL_RGBA16 */
-      1893, /* GL_TEXTURE_RED_SIZE */
-      1862, /* GL_TEXTURE_GREEN_SIZE */
-      1789, /* GL_TEXTURE_BLUE_SIZE */
-      1774, /* GL_TEXTURE_ALPHA_SIZE */
-      1875, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1866, /* GL_TEXTURE_INTENSITY_SIZE */
-      1466, /* GL_REPLACE_EXT */
-      1378, /* GL_PROXY_TEXTURE_1D */
-      1381, /* GL_PROXY_TEXTURE_2D */
-      1900, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1888, /* GL_TEXTURE_PRIORITY */
-      1895, /* GL_TEXTURE_RESIDENT */
-      1777, /* GL_TEXTURE_BINDING_1D */
-      1779, /* GL_TEXTURE_BINDING_2D */
-      1781, /* GL_TEXTURE_BINDING_3D */
+      1483, /* GL_RGB2_EXT */
+      1484, /* GL_RGB4 */
+      1487, /* GL_RGB5 */
+      1494, /* GL_RGB8 */
+      1475, /* GL_RGB10 */
+      1479, /* GL_RGB12 */
+      1481, /* GL_RGB16 */
+      1502, /* GL_RGBA2 */
+      1504, /* GL_RGBA4 */
+      1490, /* GL_RGB5_A1 */
+      1509, /* GL_RGBA8 */
+      1476, /* GL_RGB10_A2 */
+      1498, /* GL_RGBA12 */
+      1500, /* GL_RGBA16 */
+      1895, /* GL_TEXTURE_RED_SIZE */
+      1864, /* GL_TEXTURE_GREEN_SIZE */
+      1791, /* GL_TEXTURE_BLUE_SIZE */
+      1776, /* GL_TEXTURE_ALPHA_SIZE */
+      1877, /* GL_TEXTURE_LUMINANCE_SIZE */
+      1868, /* GL_TEXTURE_INTENSITY_SIZE */
+      1468, /* GL_REPLACE_EXT */
+      1380, /* GL_PROXY_TEXTURE_1D */
+      1383, /* GL_PROXY_TEXTURE_2D */
+      1902, /* GL_TEXTURE_TOO_LARGE_EXT */
+      1890, /* GL_TEXTURE_PRIORITY */
+      1897, /* GL_TEXTURE_RESIDENT */
+      1779, /* GL_TEXTURE_BINDING_1D */
+      1781, /* GL_TEXTURE_BINDING_2D */
+      1783, /* GL_TEXTURE_BINDING_3D */
       1192, /* GL_PACK_SKIP_IMAGES */
       1188, /* GL_PACK_IMAGE_HEIGHT */
-      1946, /* GL_UNPACK_SKIP_IMAGES */
-      1943, /* GL_UNPACK_IMAGE_HEIGHT */
-      1772, /* GL_TEXTURE_3D */
-      1384, /* GL_PROXY_TEXTURE_3D */
-      1846, /* GL_TEXTURE_DEPTH */
-      1903, /* GL_TEXTURE_WRAP_R */
+      1948, /* GL_UNPACK_SKIP_IMAGES */
+      1945, /* GL_UNPACK_IMAGE_HEIGHT */
+      1774, /* GL_TEXTURE_3D */
+      1386, /* GL_PROXY_TEXTURE_3D */
+      1848, /* GL_TEXTURE_DEPTH */
+      1905, /* GL_TEXTURE_WRAP_R */
        926, /* GL_MAX_3D_TEXTURE_SIZE */
-      1985, /* GL_VERTEX_ARRAY */
+      1987, /* GL_VERTEX_ARRAY */
       1119, /* GL_NORMAL_ARRAY */
        160, /* GL_COLOR_ARRAY */
        687, /* GL_INDEX_ARRAY */
-      1816, /* GL_TEXTURE_COORD_ARRAY */
+      1818, /* GL_TEXTURE_COORD_ARRAY */
        480, /* GL_EDGE_FLAG_ARRAY */
-      1991, /* GL_VERTEX_ARRAY_SIZE */
-      1993, /* GL_VERTEX_ARRAY_TYPE */
-      1992, /* GL_VERTEX_ARRAY_STRIDE */
+      1993, /* GL_VERTEX_ARRAY_SIZE */
+      1995, /* GL_VERTEX_ARRAY_TYPE */
+      1994, /* GL_VERTEX_ARRAY_STRIDE */
       1124, /* GL_NORMAL_ARRAY_TYPE */
       1123, /* GL_NORMAL_ARRAY_STRIDE */
        164, /* GL_COLOR_ARRAY_SIZE */
@@ -4737,24 +4741,24 @@ static const unsigned reduced_enums[1423] =
        165, /* GL_COLOR_ARRAY_STRIDE */
        692, /* GL_INDEX_ARRAY_TYPE */
        691, /* GL_INDEX_ARRAY_STRIDE */
-      1820, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      1822, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      1821, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+      1822, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      1824, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      1823, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
        484, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1990, /* GL_VERTEX_ARRAY_POINTER */
+      1992, /* GL_VERTEX_ARRAY_POINTER */
       1122, /* GL_NORMAL_ARRAY_POINTER */
        163, /* GL_COLOR_ARRAY_POINTER */
        690, /* GL_INDEX_ARRAY_POINTER */
-      1819, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+      1821, /* GL_TEXTURE_COORD_ARRAY_POINTER */
        483, /* GL_EDGE_FLAG_ARRAY_POINTER */
       1097, /* GL_MULTISAMPLE */
-      1533, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1535, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1540, /* GL_SAMPLE_COVERAGE */
-      1537, /* GL_SAMPLE_BUFFERS */
-      1528, /* GL_SAMPLES */
-      1544, /* GL_SAMPLE_COVERAGE_VALUE */
-      1542, /* GL_SAMPLE_COVERAGE_INVERT */
+      1535, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1537, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1542, /* GL_SAMPLE_COVERAGE */
+      1539, /* GL_SAMPLE_BUFFERS */
+      1530, /* GL_SAMPLES */
+      1546, /* GL_SAMPLE_COVERAGE_VALUE */
+      1544, /* GL_SAMPLE_COVERAGE_INVERT */
        208, /* GL_COLOR_MATRIX */
        210, /* GL_COLOR_MATRIX_STACK_DEPTH */
        936, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
@@ -4766,9 +4770,9 @@ static const unsigned reduced_enums[1423] =
       1297, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
       1292, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
       1288, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1799, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1385, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1801, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+      1801, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1387, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      1803, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
         82, /* GL_BLEND_DST_RGB */
         96, /* GL_BLEND_SRC_RGB */
         80, /* GL_BLEND_DST_ALPHA */
@@ -4776,9 +4780,9 @@ static const unsigned reduced_enums[1423] =
        214, /* GL_COLOR_TABLE */
       1313, /* GL_POST_CONVOLUTION_COLOR_TABLE */
       1296, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1373, /* GL_PROXY_COLOR_TABLE */
-      1377, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1376, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+      1375, /* GL_PROXY_COLOR_TABLE */
+      1379, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1378, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
        238, /* GL_COLOR_TABLE_SCALE */
        218, /* GL_COLOR_TABLE_BIAS */
        223, /* GL_COLOR_TABLE_FORMAT */
@@ -4793,7 +4797,7 @@ static const unsigned reduced_enums[1423] =
         72, /* GL_BGRA */
        951, /* GL_MAX_ELEMENTS_VERTICES */
        950, /* GL_MAX_ELEMENTS_INDICES */
-      1865, /* GL_TEXTURE_INDEX_SIZE_EXT */
+      1867, /* GL_TEXTURE_INDEX_SIZE_EXT */
        157, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
       1259, /* GL_POINT_SIZE_MIN */
       1255, /* GL_POINT_SIZE_MAX */
@@ -4801,52 +4805,52 @@ static const unsigned reduced_enums[1423] =
       1240, /* GL_POINT_DISTANCE_ATTENUATION */
        139, /* GL_CLAMP_TO_BORDER */
        142, /* GL_CLAMP_TO_EDGE */
-      1887, /* GL_TEXTURE_MIN_LOD */
-      1885, /* GL_TEXTURE_MAX_LOD */
-      1776, /* GL_TEXTURE_BASE_LEVEL */
-      1884, /* GL_TEXTURE_MAX_LEVEL */
+      1889, /* GL_TEXTURE_MIN_LOD */
+      1887, /* GL_TEXTURE_MAX_LOD */
+      1778, /* GL_TEXTURE_BASE_LEVEL */
+      1886, /* GL_TEXTURE_MAX_LEVEL */
        678, /* GL_IGNORE_BORDER_HP */
        289, /* GL_CONSTANT_BORDER_HP */
-      1467, /* GL_REPLICATE_BORDER_HP */
+      1469, /* GL_REPLICATE_BORDER_HP */
        295, /* GL_CONVOLUTION_BORDER_COLOR */
       1151, /* GL_OCCLUSION_TEST_HP */
       1152, /* GL_OCCLUSION_TEST_RESULT_HP */
        756, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1793, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1795, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1797, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1798, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1796, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1794, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+      1795, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1797, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1799, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      1800, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1798, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1796, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
        931, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
        932, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
       1323, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
       1325, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
       1322, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
       1324, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1873, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1874, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1872, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+      1875, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      1876, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      1874, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
        640, /* GL_GENERATE_MIPMAP */
        641, /* GL_GENERATE_MIPMAP_HINT */
        555, /* GL_FOG_OFFSET_SGIX */
        556, /* GL_FOG_OFFSET_VALUE_SGIX */
-      1807, /* GL_TEXTURE_COMPARE_SGIX */
-      1806, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1869, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1861, /* GL_TEXTURE_GEQUAL_R_SGIX */
+      1809, /* GL_TEXTURE_COMPARE_SGIX */
+      1808, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      1871, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      1863, /* GL_TEXTURE_GEQUAL_R_SGIX */
        377, /* GL_DEPTH_COMPONENT16 */
        381, /* GL_DEPTH_COMPONENT24 */
        385, /* GL_DEPTH_COMPONENT32 */
        320, /* GL_CULL_VERTEX_EXT */
        322, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
        321, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      2055, /* GL_WRAP_BORDER_SUN */
-      1800, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+      2057, /* GL_WRAP_BORDER_SUN */
+      1802, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
        749, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1577, /* GL_SINGLE_COLOR */
-      1561, /* GL_SEPARATE_SPECULAR_COLOR */
-      1572, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+      1579, /* GL_SINGLE_COLOR */
+      1563, /* GL_SEPARATE_SPECULAR_COLOR */
+      1574, /* GL_SHARED_TEXTURE_PALETTE_EXT */
        567, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
        568, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
        578, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
@@ -4859,23 +4863,23 @@ static const unsigned reduced_enums[1423] =
        622, /* GL_FRAMEBUFFER_UNDEFINED */
        393, /* GL_DEPTH_STENCIL_ATTACHMENT */
        686, /* GL_INDEX */
-      1952, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1973, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1974, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1970, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1967, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1964, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1961, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1882, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1883, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1881, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+      1954, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      1975, /* GL_UNSIGNED_SHORT_5_6_5 */
+      1976, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      1972, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      1969, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      1966, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      1963, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      1884, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      1885, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      1883, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
       1047, /* GL_MIRRORED_REPEAT */
-      1515, /* GL_RGB_S3TC */
-      1484, /* GL_RGB4_S3TC */
-      1513, /* GL_RGBA_S3TC */
-      1506, /* GL_RGBA4_S3TC */
-      1511, /* GL_RGBA_DXT5_S3TC */
-      1503, /* GL_RGBA4_DXT5_S3TC */
+      1517, /* GL_RGB_S3TC */
+      1486, /* GL_RGB4_S3TC */
+      1515, /* GL_RGBA_S3TC */
+      1508, /* GL_RGBA4_S3TC */
+      1513, /* GL_RGBA_DXT5_S3TC */
+      1505, /* GL_RGBA4_DXT5_S3TC */
        277, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
        272, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
        273, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
@@ -4893,54 +4897,54 @@ static const unsigned reduced_enums[1423] =
        536, /* GL_FOG_COORDINATE_ARRAY */
        212, /* GL_COLOR_SUM */
        347, /* GL_CURRENT_SECONDARY_COLOR */
-      1553, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1555, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1554, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1552, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1549, /* GL_SECONDARY_COLOR_ARRAY */
+      1555, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1557, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1556, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1554, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1551, /* GL_SECONDARY_COLOR_ARRAY */
        345, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         28, /* GL_ALIASED_POINT_SIZE_RANGE */
         27, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1704, /* GL_TEXTURE0 */
-      1706, /* GL_TEXTURE1 */
-      1728, /* GL_TEXTURE2 */
-      1750, /* GL_TEXTURE3 */
-      1756, /* GL_TEXTURE4 */
-      1758, /* GL_TEXTURE5 */
-      1760, /* GL_TEXTURE6 */
-      1762, /* GL_TEXTURE7 */
-      1764, /* GL_TEXTURE8 */
-      1766, /* GL_TEXTURE9 */
-      1707, /* GL_TEXTURE10 */
-      1709, /* GL_TEXTURE11 */
-      1711, /* GL_TEXTURE12 */
-      1713, /* GL_TEXTURE13 */
-      1715, /* GL_TEXTURE14 */
-      1717, /* GL_TEXTURE15 */
-      1719, /* GL_TEXTURE16 */
-      1721, /* GL_TEXTURE17 */
-      1723, /* GL_TEXTURE18 */
-      1725, /* GL_TEXTURE19 */
-      1729, /* GL_TEXTURE20 */
-      1731, /* GL_TEXTURE21 */
-      1733, /* GL_TEXTURE22 */
-      1735, /* GL_TEXTURE23 */
-      1737, /* GL_TEXTURE24 */
-      1739, /* GL_TEXTURE25 */
-      1741, /* GL_TEXTURE26 */
-      1743, /* GL_TEXTURE27 */
-      1745, /* GL_TEXTURE28 */
-      1747, /* GL_TEXTURE29 */
-      1751, /* GL_TEXTURE30 */
-      1753, /* GL_TEXTURE31 */
+      1706, /* GL_TEXTURE0 */
+      1708, /* GL_TEXTURE1 */
+      1730, /* GL_TEXTURE2 */
+      1752, /* GL_TEXTURE3 */
+      1758, /* GL_TEXTURE4 */
+      1760, /* GL_TEXTURE5 */
+      1762, /* GL_TEXTURE6 */
+      1764, /* GL_TEXTURE7 */
+      1766, /* GL_TEXTURE8 */
+      1768, /* GL_TEXTURE9 */
+      1709, /* GL_TEXTURE10 */
+      1711, /* GL_TEXTURE11 */
+      1713, /* GL_TEXTURE12 */
+      1715, /* GL_TEXTURE13 */
+      1717, /* GL_TEXTURE14 */
+      1719, /* GL_TEXTURE15 */
+      1721, /* GL_TEXTURE16 */
+      1723, /* GL_TEXTURE17 */
+      1725, /* GL_TEXTURE18 */
+      1727, /* GL_TEXTURE19 */
+      1731, /* GL_TEXTURE20 */
+      1733, /* GL_TEXTURE21 */
+      1735, /* GL_TEXTURE22 */
+      1737, /* GL_TEXTURE23 */
+      1739, /* GL_TEXTURE24 */
+      1741, /* GL_TEXTURE25 */
+      1743, /* GL_TEXTURE26 */
+      1745, /* GL_TEXTURE27 */
+      1747, /* GL_TEXTURE28 */
+      1749, /* GL_TEXTURE29 */
+      1753, /* GL_TEXTURE30 */
+      1755, /* GL_TEXTURE31 */
         18, /* GL_ACTIVE_TEXTURE */
        145, /* GL_CLIENT_ACTIVE_TEXTURE */
       1015, /* GL_MAX_TEXTURE_UNITS */
-      1927, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1930, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1932, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1924, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1686, /* GL_SUBTRACT */
+      1929, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      1932, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      1934, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      1926, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1688, /* GL_SUBTRACT */
        998, /* GL_MAX_RENDERBUFFER_SIZE */
        260, /* GL_COMPRESSED_ALPHA */
        264, /* GL_COMPRESSED_LUMINANCE */
@@ -4948,18 +4952,18 @@ static const unsigned reduced_enums[1423] =
        262, /* GL_COMPRESSED_INTENSITY */
        268, /* GL_COMPRESSED_RGB */
        269, /* GL_COMPRESSED_RGBA */
-      1814, /* GL_TEXTURE_COMPRESSION_HINT */
-      1891, /* GL_TEXTURE_RECTANGLE_ARB */
-      1786, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-      1388, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+      1816, /* GL_TEXTURE_COMPRESSION_HINT */
+      1893, /* GL_TEXTURE_RECTANGLE_ARB */
+      1788, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+      1390, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
        996, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
        392, /* GL_DEPTH_STENCIL */
-      1957, /* GL_UNSIGNED_INT_24_8 */
+      1959, /* GL_UNSIGNED_INT_24_8 */
       1010, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1880, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+      1882, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
       1012, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1852, /* GL_TEXTURE_FILTER_CONTROL */
-      1870, /* GL_TEXTURE_LOD_BIAS */
+      1854, /* GL_TEXTURE_FILTER_CONTROL */
+      1872, /* GL_TEXTURE_LOD_BIAS */
        245, /* GL_COMBINE4 */
       1004, /* GL_MAX_SHININESS_NV */
       1005, /* GL_MAX_SPOT_EXPONENT_NV */
@@ -4967,38 +4971,40 @@ static const unsigned reduced_enums[1423] =
        358, /* GL_DECR_WRAP */
       1067, /* GL_MODELVIEW1_ARB */
       1125, /* GL_NORMAL_MAP */
-      1427, /* GL_REFLECTION_MAP */
-      1824, /* GL_TEXTURE_CUBE_MAP */
-      1783, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      1836, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      1826, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      1839, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      1829, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      1842, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      1832, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1386, /* GL_PROXY_TEXTURE_CUBE_MAP */
+      1429, /* GL_REFLECTION_MAP */
+      1826, /* GL_TEXTURE_CUBE_MAP */
+      1785, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      1838, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      1828, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      1841, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      1831, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      1844, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      1834, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1388, /* GL_PROXY_TEXTURE_CUBE_MAP */
        944, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
       1103, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+      1334, /* GL_PRIMITIVE_RESTART_NV */
+      1333, /* GL_PRIMITIVE_RESTART_INDEX_NV */
        550, /* GL_FOG_DISTANCE_MODE_NV */
        499, /* GL_EYE_RADIAL_NV */
        498, /* GL_EYE_PLANE_ABSOLUTE_NV */
        244, /* GL_COMBINE */
        251, /* GL_COMBINE_RGB */
        246, /* GL_COMBINE_ALPHA */
-      1516, /* GL_RGB_SCALE */
+      1518, /* GL_RGB_SCALE */
         24, /* GL_ADD_SIGNED */
        713, /* GL_INTERPOLATE */
        284, /* GL_CONSTANT */
       1329, /* GL_PRIMARY_COLOR */
       1326, /* GL_PREVIOUS */
-      1592, /* GL_SOURCE0_RGB */
-      1598, /* GL_SOURCE1_RGB */
-      1604, /* GL_SOURCE2_RGB */
-      1608, /* GL_SOURCE3_RGB_NV */
-      1589, /* GL_SOURCE0_ALPHA */
-      1595, /* GL_SOURCE1_ALPHA */
-      1601, /* GL_SOURCE2_ALPHA */
-      1607, /* GL_SOURCE3_ALPHA_NV */
+      1594, /* GL_SOURCE0_RGB */
+      1600, /* GL_SOURCE1_RGB */
+      1606, /* GL_SOURCE2_RGB */
+      1610, /* GL_SOURCE3_RGB_NV */
+      1591, /* GL_SOURCE0_ALPHA */
+      1597, /* GL_SOURCE1_ALPHA */
+      1603, /* GL_SOURCE2_ALPHA */
+      1609, /* GL_SOURCE3_ALPHA_NV */
       1165, /* GL_OPERAND0_RGB */
       1171, /* GL_OPERAND1_RGB */
       1177, /* GL_OPERAND2_RGB */
@@ -5008,32 +5014,32 @@ static const unsigned reduced_enums[1423] =
       1174, /* GL_OPERAND2_ALPHA */
       1180, /* GL_OPERAND3_ALPHA_NV */
        120, /* GL_BUFFER_OBJECT_APPLE */
-      1986, /* GL_VERTEX_ARRAY_BINDING */
-      1889, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-      1890, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-      2060, /* GL_YCBCR_422_APPLE */
-      1975, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1977, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      1899, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-      1677, /* GL_STORAGE_PRIVATE_APPLE */
-      1676, /* GL_STORAGE_CACHED_APPLE */
-      1678, /* GL_STORAGE_SHARED_APPLE */
-      1579, /* GL_SLICE_ACCUM_SUN */
-      1396, /* GL_QUAD_MESH_SUN */
-      1937, /* GL_TRIANGLE_MESH_SUN */
-      2025, /* GL_VERTEX_PROGRAM_ARB */
-      2036, /* GL_VERTEX_STATE_PROGRAM_NV */
-      2012, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      2018, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      2020, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      2022, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+      1988, /* GL_VERTEX_ARRAY_BINDING */
+      1891, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+      1892, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+      2062, /* GL_YCBCR_422_APPLE */
+      1977, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      1979, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      1901, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+      1679, /* GL_STORAGE_PRIVATE_APPLE */
+      1678, /* GL_STORAGE_CACHED_APPLE */
+      1680, /* GL_STORAGE_SHARED_APPLE */
+      1581, /* GL_SLICE_ACCUM_SUN */
+      1398, /* GL_QUAD_MESH_SUN */
+      1939, /* GL_TRIANGLE_MESH_SUN */
+      2027, /* GL_VERTEX_PROGRAM_ARB */
+      2038, /* GL_VERTEX_STATE_PROGRAM_NV */
+      2014, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      2020, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      2022, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      2024, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
        349, /* GL_CURRENT_VERTEX_ATTRIB */
-      1345, /* GL_PROGRAM_LENGTH_ARB */
-      1360, /* GL_PROGRAM_STRING_ARB */
+      1347, /* GL_PROGRAM_LENGTH_ARB */
+      1362, /* GL_PROGRAM_STRING_ARB */
       1090, /* GL_MODELVIEW_PROJECTION_NV */
        677, /* GL_IDENTITY_NV */
        729, /* GL_INVERSE_NV */
-      1929, /* GL_TRANSPOSE_NV */
+      1931, /* GL_TRANSPOSE_NV */
        730, /* GL_INVERSE_TRANSPOSE_NV */
        982, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
        981, /* GL_MAX_PROGRAM_MATRICES_ARB */
@@ -5047,33 +5053,33 @@ static const unsigned reduced_enums[1423] =
        908, /* GL_MATRIX7_NV */
        332, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
        329, /* GL_CURRENT_MATRIX_ARB */
-      2028, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      2031, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1357, /* GL_PROGRAM_PARAMETER_NV */
-      2016, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1362, /* GL_PROGRAM_TARGET_NV */
-      1359, /* GL_PROGRAM_RESIDENT_NV */
-      1909, /* GL_TRACK_MATRIX_NV */
-      1910, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      2026, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1339, /* GL_PROGRAM_ERROR_POSITION_ARB */
+      2030, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      2033, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1359, /* GL_PROGRAM_PARAMETER_NV */
+      2018, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1364, /* GL_PROGRAM_TARGET_NV */
+      1361, /* GL_PROGRAM_RESIDENT_NV */
+      1911, /* GL_TRACK_MATRIX_NV */
+      1912, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      2028, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1341, /* GL_PROGRAM_ERROR_POSITION_ARB */
        373, /* GL_DEPTH_CLAMP */
-      1994, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      2001, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      2002, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      2003, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      2004, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      2005, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      2006, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      2007, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      2008, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      2009, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1995, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1996, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1997, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1998, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1999, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      2000, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+      1996, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      2003, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      2004, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      2005, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      2006, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      2007, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      2008, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      2009, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      2010, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      2011, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1997, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1998, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1999, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      2000, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      2001, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      2002, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
        820, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
        827, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
        828, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
@@ -5097,7 +5103,7 @@ static const unsigned reduced_enums[1423] =
        857, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
        858, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
        859, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1338, /* GL_PROGRAM_BINDING_ARB */
+      1340, /* GL_PROGRAM_BINDING_ARB */
        861, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
        862, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
        848, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
@@ -5106,27 +5112,27 @@ static const unsigned reduced_enums[1423] =
        851, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
        852, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
        853, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      1812, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      1809, /* GL_TEXTURE_COMPRESSED */
+      1814, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      1811, /* GL_TEXTURE_COMPRESSED */
       1131, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
        282, /* GL_COMPRESSED_TEXTURE_FORMATS */
       1033, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      2054, /* GL_WEIGHT_SUM_UNITY_ARB */
-      2024, /* GL_VERTEX_BLEND_ARB */
+      2056, /* GL_WEIGHT_SUM_UNITY_ARB */
+      2026, /* GL_VERTEX_BLEND_ARB */
        351, /* GL_CURRENT_WEIGHT_ARB */
-      2052, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      2050, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      2048, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      2046, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      2041, /* GL_WEIGHT_ARRAY_ARB */
+      2054, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      2052, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      2050, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      2048, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      2043, /* GL_WEIGHT_ARRAY_ARB */
        407, /* GL_DOT3_RGB */
        408, /* GL_DOT3_RGBA */
        276, /* GL_COMPRESSED_RGB_FXT1_3DFX */
        271, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
       1098, /* GL_MULTISAMPLE_3DFX */
-      1538, /* GL_SAMPLE_BUFFERS_3DFX */
-      1529, /* GL_SAMPLES_3DFX */
+      1540, /* GL_SAMPLE_BUFFERS_3DFX */
+      1531, /* GL_SAMPLES_3DFX */
       1078, /* GL_MODELVIEW2_ARB */
       1081, /* GL_MODELVIEW3_ARB */
       1082, /* GL_MODELVIEW4_ARB */
@@ -5164,7 +5170,7 @@ static const unsigned reduced_enums[1423] =
       1093, /* GL_MODULATE_ADD_ATI */
       1094, /* GL_MODULATE_SIGNED_ADD_ATI */
       1095, /* GL_MODULATE_SUBTRACT_ATI */
-      2061, /* GL_YCBCR_MESA */
+      2063, /* GL_YCBCR_MESA */
       1189, /* GL_PACK_INVERT_MESA */
        354, /* GL_DEBUG_OBJECT_MESA */
        355, /* GL_DEBUG_PRINT_MESA */
@@ -5180,18 +5186,18 @@ static const unsigned reduced_enums[1423] =
        126, /* GL_BUMP_ENVMAP_ATI */
        130, /* GL_BUMP_TARGET_ATI */
       1133, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
-      1336, /* GL_PROGRAM_BINARY_FORMATS_OES */
-      1641, /* GL_STENCIL_BACK_FUNC */
-      1639, /* GL_STENCIL_BACK_FAIL */
-      1643, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1645, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+      1338, /* GL_PROGRAM_BINARY_FORMATS_OES */
+      1643, /* GL_STENCIL_BACK_FUNC */
+      1641, /* GL_STENCIL_BACK_FAIL */
+      1645, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1647, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
        559, /* GL_FRAGMENT_PROGRAM_ARB */
-      1334, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1365, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1364, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1348, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1354, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1353, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+      1336, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1367, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1366, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1350, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1356, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1355, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
        971, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
        994, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
        993, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
@@ -5226,75 +5232,75 @@ static const unsigned reduced_enums[1423] =
        920, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
        918, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
        914, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1847, /* GL_TEXTURE_DEPTH_SIZE */
+      1849, /* GL_TEXTURE_DEPTH_SIZE */
        400, /* GL_DEPTH_TEXTURE_MODE */
-      1804, /* GL_TEXTURE_COMPARE_MODE */
-      1802, /* GL_TEXTURE_COMPARE_FUNC */
+      1806, /* GL_TEXTURE_COMPARE_MODE */
+      1804, /* GL_TEXTURE_COMPARE_FUNC */
        255, /* GL_COMPARE_R_TO_TEXTURE */
       1266, /* GL_POINT_SPRITE */
        309, /* GL_COORD_REPLACE */
       1271, /* GL_POINT_SPRITE_R_MODE_NV */
-      1400, /* GL_QUERY_COUNTER_BITS */
+      1402, /* GL_QUERY_COUNTER_BITS */
        338, /* GL_CURRENT_QUERY */
-      1403, /* GL_QUERY_RESULT */
-      1405, /* GL_QUERY_RESULT_AVAILABLE */
+      1405, /* GL_QUERY_RESULT */
+      1407, /* GL_QUERY_RESULT_AVAILABLE */
       1026, /* GL_MAX_VERTEX_ATTRIBS */
-      2014, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+      2016, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
        398, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
        397, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
       1006, /* GL_MAX_TEXTURE_COORDS */
       1008, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1341, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1343, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1342, /* GL_PROGRAM_FORMAT_ARB */
-      1901, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+      1343, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1345, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1344, /* GL_PROGRAM_FORMAT_ARB */
+      1903, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
        371, /* GL_DEPTH_BOUNDS_TEST_EXT */
        370, /* GL_DEPTH_BOUNDS_EXT */
         53, /* GL_ARRAY_BUFFER */
        485, /* GL_ELEMENT_ARRAY_BUFFER */
         54, /* GL_ARRAY_BUFFER_BINDING */
        486, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1988, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1990, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
       1120, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        161, /* GL_COLOR_ARRAY_BUFFER_BINDING */
        688, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      1817, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+      1819, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
        481, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1550, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+      1552, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
        537, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      2042, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      2010, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1344, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+      2044, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      2012, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1346, /* GL_PROGRAM_INSTRUCTIONS_ARB */
        977, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1350, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1352, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
        986, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1363, /* GL_PROGRAM_TEMPORARIES_ARB */
+      1365, /* GL_PROGRAM_TEMPORARIES_ARB */
        992, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1352, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1354, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
        988, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1356, /* GL_PROGRAM_PARAMETERS_ARB */
+      1358, /* GL_PROGRAM_PARAMETERS_ARB */
        991, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1351, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1353, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
        987, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1335, /* GL_PROGRAM_ATTRIBS_ARB */
+      1337, /* GL_PROGRAM_ATTRIBS_ARB */
        972, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1349, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1351, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
        985, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1333, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1335, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
        970, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1347, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+      1349, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
        983, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
        978, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
        974, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1366, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1926, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1417, /* GL_READ_ONLY */
-      2056, /* GL_WRITE_ONLY */
-      1419, /* GL_READ_WRITE */
+      1368, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      1928, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1419, /* GL_READ_ONLY */
+      2058, /* GL_WRITE_ONLY */
+      1421, /* GL_READ_WRITE */
        110, /* GL_BUFFER_ACCESS */
        114, /* GL_BUFFER_MAPPED */
        117, /* GL_BUFFER_MAP_POINTER */
-      1908, /* GL_TIME_ELAPSED_EXT */
+      1910, /* GL_TIME_ELAPSED_EXT */
        871, /* GL_MATRIX0_ARB */
        883, /* GL_MATRIX1_ARB */
        895, /* GL_MATRIX2_ARB */
@@ -5327,12 +5333,12 @@ static const unsigned reduced_enums[1423] =
        894, /* GL_MATRIX29_ARB */
        897, /* GL_MATRIX30_ARB */
        898, /* GL_MATRIX31_ARB */
-      1681, /* GL_STREAM_DRAW */
-      1683, /* GL_STREAM_READ */
-      1679, /* GL_STREAM_COPY */
-      1631, /* GL_STATIC_DRAW */
-      1633, /* GL_STATIC_READ */
-      1629, /* GL_STATIC_COPY */
+      1683, /* GL_STREAM_DRAW */
+      1685, /* GL_STREAM_READ */
+      1681, /* GL_STREAM_COPY */
+      1633, /* GL_STATIC_DRAW */
+      1635, /* GL_STATIC_READ */
+      1631, /* GL_STATIC_COPY */
        475, /* GL_DYNAMIC_DRAW */
        477, /* GL_DYNAMIC_READ */
        473, /* GL_DYNAMIC_COPY */
@@ -5341,41 +5347,41 @@ static const unsigned reduced_enums[1423] =
       1230, /* GL_PIXEL_PACK_BUFFER_BINDING */
       1234, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
        362, /* GL_DEPTH24_STENCIL8 */
-      1897, /* GL_TEXTURE_STENCIL_SIZE */
-      1845, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+      1899, /* GL_TEXTURE_STENCIL_SIZE */
+      1847, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
        973, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
        976, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
        980, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
        979, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
        928, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-      1672, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      1674, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         17, /* GL_ACTIVE_STENCIL_FACE_EXT */
       1052, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1531, /* GL_SAMPLES_PASSED */
+      1533, /* GL_SAMPLES_PASSED */
       1253, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
       1252, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
       1251, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
       1089, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
-      1369, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-      1879, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+      1371, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+      1881, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
        121, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
        113, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-      1431, /* GL_RELEASED_APPLE */
-      2039, /* GL_VOLATILE_APPLE */
-      1470, /* GL_RETAINED_APPLE */
-      1941, /* GL_UNDEFINED_APPLE */
-      1390, /* GL_PURGEABLE_APPLE */
+      1433, /* GL_RELEASED_APPLE */
+      2041, /* GL_VOLATILE_APPLE */
+      1472, /* GL_RETAINED_APPLE */
+      1943, /* GL_UNDEFINED_APPLE */
+      1392, /* GL_PURGEABLE_APPLE */
        560, /* GL_FRAGMENT_SHADER */
-      2034, /* GL_VERTEX_SHADER */
-      1355, /* GL_PROGRAM_OBJECT_ARB */
-      1566, /* GL_SHADER_OBJECT_ARB */
+      2036, /* GL_VERTEX_SHADER */
+      1357, /* GL_PROGRAM_OBJECT_ARB */
+      1568, /* GL_SHADER_OBJECT_ARB */
        954, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
       1030, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
       1023, /* GL_MAX_VARYING_FLOATS */
       1028, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
        938, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
       1149, /* GL_OBJECT_TYPE_ARB */
-      1568, /* GL_SHADER_TYPE */
+      1570, /* GL_SHADER_TYPE */
        525, /* GL_FLOAT_VEC2 */
        527, /* GL_FLOAT_VEC3 */
        529, /* GL_FLOAT_VEC4 */
@@ -5389,12 +5395,12 @@ static const unsigned reduced_enums[1423] =
        513, /* GL_FLOAT_MAT2 */
        517, /* GL_FLOAT_MAT3 */
        521, /* GL_FLOAT_MAT4 */
-      1521, /* GL_SAMPLER_1D */
-      1523, /* GL_SAMPLER_2D */
-      1525, /* GL_SAMPLER_3D */
-      1527, /* GL_SAMPLER_CUBE */
-      1522, /* GL_SAMPLER_1D_SHADOW */
-      1524, /* GL_SAMPLER_2D_SHADOW */
+      1523, /* GL_SAMPLER_1D */
+      1525, /* GL_SAMPLER_2D */
+      1527, /* GL_SAMPLER_3D */
+      1529, /* GL_SAMPLER_CUBE */
+      1524, /* GL_SAMPLER_1D_SHADOW */
+      1526, /* GL_SAMPLER_2D_SHADOW */
        515, /* GL_FLOAT_MAT2x3 */
        516, /* GL_FLOAT_MAT2x4 */
        519, /* GL_FLOAT_MAT3x2 */
@@ -5404,16 +5410,16 @@ static const unsigned reduced_enums[1423] =
        360, /* GL_DELETE_STATUS */
        259, /* GL_COMPILE_STATUS */
        776, /* GL_LINK_STATUS */
-      1982, /* GL_VALIDATE_STATUS */
+      1984, /* GL_VALIDATE_STATUS */
        700, /* GL_INFO_LOG_LENGTH */
         56, /* GL_ATTACHED_SHADERS */
         20, /* GL_ACTIVE_UNIFORMS */
         21, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1567, /* GL_SHADER_SOURCE_LENGTH */
+      1569, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
        562, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1570, /* GL_SHADING_LANGUAGE_VERSION */
+      1572, /* GL_SHADING_LANGUAGE_VERSION */
        337, /* GL_CURRENT_PROGRAM */
       1198, /* GL_PALETTE4_RGB8_OES */
       1200, /* GL_PALETTE4_RGBA8_OES */
@@ -5428,56 +5434,56 @@ static const unsigned reduced_enums[1423] =
        682, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
        680, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
       1250, /* GL_POINT_SIZE_ARRAY_OES */
-      1823, /* GL_TEXTURE_CROP_RECT_OES */
+      1825, /* GL_TEXTURE_CROP_RECT_OES */
        912, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
       1249, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-      1965, /* GL_UNSIGNED_NORMALIZED */
-      1769, /* GL_TEXTURE_1D_ARRAY_EXT */
-      1379, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-      1771, /* GL_TEXTURE_2D_ARRAY_EXT */
-      1382, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-      1778, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-      1780, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+      1967, /* GL_UNSIGNED_NORMALIZED */
+      1771, /* GL_TEXTURE_1D_ARRAY_EXT */
+      1381, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+      1773, /* GL_TEXTURE_2D_ARRAY_EXT */
+      1384, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+      1780, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+      1782, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
        958, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB */
-      1623, /* GL_SRGB */
-      1624, /* GL_SRGB8 */
-      1626, /* GL_SRGB_ALPHA */
-      1625, /* GL_SRGB8_ALPHA8 */
-      1583, /* GL_SLUMINANCE_ALPHA */
-      1582, /* GL_SLUMINANCE8_ALPHA8 */
-      1580, /* GL_SLUMINANCE */
-      1581, /* GL_SLUMINANCE8 */
+      1625, /* GL_SRGB */
+      1626, /* GL_SRGB8 */
+      1628, /* GL_SRGB_ALPHA */
+      1627, /* GL_SRGB8_ALPHA8 */
+      1585, /* GL_SLUMINANCE_ALPHA */
+      1584, /* GL_SLUMINANCE8_ALPHA8 */
+      1582, /* GL_SLUMINANCE */
+      1583, /* GL_SLUMINANCE8 */
        280, /* GL_COMPRESSED_SRGB */
        281, /* GL_COMPRESSED_SRGB_ALPHA */
        278, /* GL_COMPRESSED_SLUMINANCE */
        279, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      1923, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
-      1917, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
+      1925, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
+      1919, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
       1021, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */
-      1922, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
-      1920, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
-      1919, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
+      1924, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
+      1922, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
+      1921, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
       1332, /* GL_PRIMITIVES_GENERATED_EXT */
-      1921, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
-      1410, /* GL_RASTERIZER_DISCARD_EXT */
+      1923, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
+      1412, /* GL_RASTERIZER_DISCARD_EXT */
       1019, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */
       1020, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */
        712, /* GL_INTERLEAVED_ATTRIBS_EXT */
-      1560, /* GL_SEPARATE_ATTRIBS_EXT */
-      1916, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
-      1915, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
+      1562, /* GL_SEPARATE_ATTRIBS_EXT */
+      1918, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
+      1917, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
       1268, /* GL_POINT_SPRITE_COORD_ORIGIN */
        784, /* GL_LOWER_LEFT */
-      1979, /* GL_UPPER_LEFT */
-      1647, /* GL_STENCIL_BACK_REF */
-      1648, /* GL_STENCIL_BACK_VALUE_MASK */
-      1649, /* GL_STENCIL_BACK_WRITEMASK */
+      1981, /* GL_UPPER_LEFT */
+      1649, /* GL_STENCIL_BACK_REF */
+      1650, /* GL_STENCIL_BACK_VALUE_MASK */
+      1651, /* GL_STENCIL_BACK_WRITEMASK */
        465, /* GL_DRAW_FRAMEBUFFER_BINDING */
-      1436, /* GL_RENDERBUFFER_BINDING */
-      1413, /* GL_READ_FRAMEBUFFER */
+      1438, /* GL_RENDERBUFFER_BINDING */
+      1415, /* GL_READ_FRAMEBUFFER */
        464, /* GL_DRAW_FRAMEBUFFER */
-      1414, /* GL_READ_FRAMEBUFFER_BINDING */
-      1455, /* GL_RENDERBUFFER_SAMPLES */
+      1416, /* GL_READ_FRAMEBUFFER_BINDING */
+      1457, /* GL_RENDERBUFFER_SAMPLES */
        575, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
        572, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
        587, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
@@ -5511,28 +5517,28 @@ static const unsigned reduced_enums[1423] =
        179, /* GL_COLOR_ATTACHMENT14 */
        181, /* GL_COLOR_ATTACHMENT15 */
        365, /* GL_DEPTH_ATTACHMENT */
-      1636, /* GL_STENCIL_ATTACHMENT */
+      1638, /* GL_STENCIL_ATTACHMENT */
        564, /* GL_FRAMEBUFFER */
-      1433, /* GL_RENDERBUFFER */
-      1459, /* GL_RENDERBUFFER_WIDTH */
-      1446, /* GL_RENDERBUFFER_HEIGHT */
-      1449, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1667, /* GL_STENCIL_INDEX_EXT */
-      1656, /* GL_STENCIL_INDEX1 */
-      1661, /* GL_STENCIL_INDEX4 */
-      1664, /* GL_STENCIL_INDEX8 */
-      1657, /* GL_STENCIL_INDEX16 */
-      1453, /* GL_RENDERBUFFER_RED_SIZE */
-      1444, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1439, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1434, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1441, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1457, /* GL_RENDERBUFFER_STENCIL_SIZE */
+      1435, /* GL_RENDERBUFFER */
+      1461, /* GL_RENDERBUFFER_WIDTH */
+      1448, /* GL_RENDERBUFFER_HEIGHT */
+      1451, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1669, /* GL_STENCIL_INDEX_EXT */
+      1658, /* GL_STENCIL_INDEX1 */
+      1663, /* GL_STENCIL_INDEX4 */
+      1666, /* GL_STENCIL_INDEX8 */
+      1659, /* GL_STENCIL_INDEX16 */
+      1455, /* GL_RENDERBUFFER_RED_SIZE */
+      1446, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1441, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1436, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1443, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1459, /* GL_RENDERBUFFER_STENCIL_SIZE */
        615, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
       1001, /* GL_MAX_SAMPLES */
-      1859, /* GL_TEXTURE_GEN_STR_OES */
+      1861, /* GL_TEXTURE_GEN_STR_OES */
        655, /* GL_HALF_FLOAT_OES */
-      1487, /* GL_RGB565_OES */
+      1489, /* GL_RGB565_OES */
        571, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB */
        611, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB */
        610, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
@@ -5551,49 +5557,49 @@ static const unsigned reduced_enums[1423] =
        786, /* GL_LOW_INT */
       1038, /* GL_MEDIUM_INT */
        657, /* GL_HIGH_INT */
-      1956, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+      1958, /* GL_UNSIGNED_INT_10_10_10_2_OES */
        716, /* GL_INT_10_10_10_2_OES */
-      1564, /* GL_SHADER_BINARY_FORMATS */
+      1566, /* GL_SHADER_BINARY_FORMATS */
       1134, /* GL_NUM_SHADER_BINARY_FORMATS */
-      1565, /* GL_SHADER_COMPILER */
+      1567, /* GL_SHADER_COMPILER */
       1032, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
       1025, /* GL_MAX_VARYING_VECTORS */
        956, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
-      1407, /* GL_QUERY_WAIT_NV */
-      1402, /* GL_QUERY_NO_WAIT_NV */
-      1399, /* GL_QUERY_BY_REGION_WAIT_NV */
-      1398, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
-      1912, /* GL_TRANSFORM_FEEDBACK */
-      1918, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-      1914, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-      1913, /* GL_TRANSFORM_FEEDBACK_BINDING */
-      1394, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+      1409, /* GL_QUERY_WAIT_NV */
+      1404, /* GL_QUERY_NO_WAIT_NV */
+      1401, /* GL_QUERY_BY_REGION_WAIT_NV */
+      1400, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
+      1914, /* GL_TRANSFORM_FEEDBACK */
+      1920, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+      1916, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+      1915, /* GL_TRANSFORM_FEEDBACK_BINDING */
+      1396, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
        507, /* GL_FIRST_VERTEX_CONVENTION */
        733, /* GL_LAST_VERTEX_CONVENTION */
-      1371, /* GL_PROVOKING_VERTEX */
+      1373, /* GL_PROVOKING_VERTEX */
        316, /* GL_COPY_READ_BUFFER */
        317, /* GL_COPY_WRITE_BUFFER */
-      1514, /* GL_RGBA_SNORM */
-      1510, /* GL_RGBA8_SNORM */
-      1576, /* GL_SIGNED_NORMALIZED */
+      1516, /* GL_RGBA_SNORM */
+      1512, /* GL_RGBA8_SNORM */
+      1578, /* GL_SIGNED_NORMALIZED */
       1003, /* GL_MAX_SERVER_WAIT_TIMEOUT */
       1148, /* GL_OBJECT_TYPE */
-      1688, /* GL_SYNC_CONDITION */
-      1693, /* GL_SYNC_STATUS */
-      1690, /* GL_SYNC_FLAGS */
-      1689, /* GL_SYNC_FENCE */
-      1692, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-      1950, /* GL_UNSIGNALED */
-      1575, /* GL_SIGNALED */
+      1690, /* GL_SYNC_CONDITION */
+      1695, /* GL_SYNC_STATUS */
+      1692, /* GL_SYNC_FLAGS */
+      1691, /* GL_SYNC_FENCE */
+      1694, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+      1952, /* GL_UNSIGNALED */
+      1577, /* GL_SIGNALED */
         46, /* GL_ALREADY_SIGNALED */
-      1907, /* GL_TIMEOUT_EXPIRED */
+      1909, /* GL_TIMEOUT_EXPIRED */
        283, /* GL_CONDITION_SATISFIED */
-      2040, /* GL_WAIT_FAILED */
+      2042, /* GL_WAIT_FAILED */
        492, /* GL_EVAL_BIT */
-      1411, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+      1413, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
        778, /* GL_LIST_BIT */
-      1788, /* GL_TEXTURE_BIT */
-      1546, /* GL_SCISSOR_BIT */
+      1790, /* GL_TEXTURE_BIT */
+      1548, /* GL_SCISSOR_BIT */
         29, /* GL_ALL_ATTRIB_BITS */
       1100, /* GL_MULTISAMPLE_BIT */
         30, /* GL_ALL_CLIENT_ATTRIB_BITS */
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 8224c15627..29a21deebc 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -320,6 +320,12 @@ extra_NV_vertex_program_ARB_vertex_program_ARB_fragment_program_NV_vertex_progra
    EXTRA_END
 };
 
+static const int
+extra_NV_primitive_restart[] = {
+   EXT(NV_primitive_restart),
+   EXTRA_END
+};
+
 static const int extra_version_30[] = { EXTRA_VERSION_30, EXTRA_END };
 static const int extra_version_31[] = { EXTRA_VERSION_31, EXTRA_END };
 static const int extra_version_32[] = { EXTRA_VERSION_32, EXTRA_END };
@@ -1019,6 +1025,12 @@ static const struct value_desc values[] = {
    { GL_MAX_SPOT_EXPONENT_NV, CONTEXT_FLOAT(Const.MaxSpotExponent),
      extra_NV_light_max_exponent },
      
+   /* GL_NV_primitive_restart */
+   { GL_PRIMITIVE_RESTART_NV, CONTEXT_BOOL(Array.PrimitiveRestart),
+     extra_NV_primitive_restart },
+   { GL_PRIMITIVE_RESTART_INDEX_NV, CONTEXT_INT(Array.RestartIndex),
+     extra_NV_primitive_restart },
+ 
    /* GL_ARB_vertex_buffer_object */
    { GL_INDEX_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
      offsetof(struct gl_array_object, Index.BufferObj), NO_EXTRA },
@@ -1182,11 +1194,15 @@ static const struct value_desc values[] = {
    { GL_CONTEXT_FLAGS, CONTEXT_INT(Const.ContextFlags), extra_version_30  },
 
    /* GL 3.1 */
+   /* NOTE: different enum values for GL_PRIMITIVE_RESTART_NV
+    * vs. GL_PRIMITIVE_RESTART!
+    */
    { GL_PRIMITIVE_RESTART, CONTEXT_BOOL(Array.PrimitiveRestart),
      extra_version_31 },
    { GL_PRIMITIVE_RESTART_INDEX, CONTEXT_INT(Array.RestartIndex),
      extra_version_31 },
  
+
    /* GL 3.2 */
    { GL_CONTEXT_PROFILE_MASK, CONTEXT_INT(Const.ProfileMask),
      extra_version_32 },
diff --git a/src/mesa/main/remap_helper.h b/src/mesa/main/remap_helper.h
index fe3e0fd912..010c03459e 100644
--- a/src/mesa/main/remap_helper.h
+++ b/src/mesa/main/remap_helper.h
@@ -65,4400 +65,4408 @@ static const char _mesa_function_pool[] =
    "\0"
    "glLoadIdentity\0"
    "\0"
-   /* _mesa_function_pool[172]: GetCombinerOutputParameterfvNV (will be remapped) */
-   "iiip\0"
-   "glGetCombinerOutputParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[211]: SampleCoverageARB (will be remapped) */
+   /* _mesa_function_pool[172]: SampleCoverageARB (will be remapped) */
    "fi\0"
    "glSampleCoverage\0"
    "glSampleCoverageARB\0"
    "\0"
-   /* _mesa_function_pool[252]: ConvolutionFilter1D (offset 348) */
+   /* _mesa_function_pool[213]: ConvolutionFilter1D (offset 348) */
    "iiiiip\0"
    "glConvolutionFilter1D\0"
    "glConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[307]: BeginQueryARB (will be remapped) */
+   /* _mesa_function_pool[268]: BeginQueryARB (will be remapped) */
    "ii\0"
    "glBeginQuery\0"
    "glBeginQueryARB\0"
    "\0"
-   /* _mesa_function_pool[340]: RasterPos3dv (offset 71) */
+   /* _mesa_function_pool[301]: RasterPos3dv (offset 71) */
    "p\0"
    "glRasterPos3dv\0"
    "\0"
-   /* _mesa_function_pool[358]: PointParameteriNV (will be remapped) */
+   /* _mesa_function_pool[319]: PointParameteriNV (will be remapped) */
    "ii\0"
    "glPointParameteri\0"
    "glPointParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[400]: GetProgramiv (will be remapped) */
+   /* _mesa_function_pool[361]: GetProgramiv (will be remapped) */
    "iip\0"
    "glGetProgramiv\0"
    "\0"
-   /* _mesa_function_pool[420]: MultiTexCoord3sARB (offset 398) */
+   /* _mesa_function_pool[381]: MultiTexCoord3sARB (offset 398) */
    "iiii\0"
    "glMultiTexCoord3s\0"
    "glMultiTexCoord3sARB\0"
    "\0"
-   /* _mesa_function_pool[465]: SecondaryColor3iEXT (will be remapped) */
+   /* _mesa_function_pool[426]: SecondaryColor3iEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3i\0"
    "glSecondaryColor3iEXT\0"
    "\0"
-   /* _mesa_function_pool[511]: WindowPos3fMESA (will be remapped) */
+   /* _mesa_function_pool[472]: WindowPos3fMESA (will be remapped) */
    "fff\0"
    "glWindowPos3f\0"
    "glWindowPos3fARB\0"
    "glWindowPos3fMESA\0"
    "\0"
-   /* _mesa_function_pool[565]: TexCoord1iv (offset 99) */
+   /* _mesa_function_pool[526]: TexCoord1iv (offset 99) */
    "p\0"
    "glTexCoord1iv\0"
    "\0"
-   /* _mesa_function_pool[582]: TexCoord4sv (offset 125) */
+   /* _mesa_function_pool[543]: TexCoord4sv (offset 125) */
    "p\0"
    "glTexCoord4sv\0"
    "\0"
-   /* _mesa_function_pool[599]: RasterPos4s (offset 84) */
+   /* _mesa_function_pool[560]: RasterPos4s (offset 84) */
    "iiii\0"
    "glRasterPos4s\0"
    "\0"
-   /* _mesa_function_pool[619]: PixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[580]: PixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[652]: ActiveTextureARB (offset 374) */
+   /* _mesa_function_pool[613]: ActiveTextureARB (offset 374) */
    "i\0"
    "glActiveTexture\0"
    "glActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[690]: BlitFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[651]: BlitFramebufferEXT (will be remapped) */
    "iiiiiiiiii\0"
    "glBlitFramebuffer\0"
    "glBlitFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[741]: TexCoord1f (offset 96) */
+   /* _mesa_function_pool[702]: TexCoord1f (offset 96) */
    "f\0"
    "glTexCoord1f\0"
    "\0"
-   /* _mesa_function_pool[757]: TexCoord1d (offset 94) */
+   /* _mesa_function_pool[718]: TexCoord1d (offset 94) */
    "d\0"
    "glTexCoord1d\0"
    "\0"
-   /* _mesa_function_pool[773]: VertexAttrib4ubvNV (will be remapped) */
+   /* _mesa_function_pool[734]: VertexAttrib4ubvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[798]: TexCoord1i (offset 98) */
+   /* _mesa_function_pool[759]: TexCoord1i (offset 98) */
    "i\0"
    "glTexCoord1i\0"
    "\0"
-   /* _mesa_function_pool[814]: GetProgramNamedParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[775]: GetProgramNamedParameterdvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[851]: Histogram (offset 367) */
+   /* _mesa_function_pool[812]: Histogram (offset 367) */
    "iiii\0"
    "glHistogram\0"
    "glHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[884]: TexCoord1s (offset 100) */
+   /* _mesa_function_pool[845]: TexCoord1s (offset 100) */
    "i\0"
    "glTexCoord1s\0"
    "\0"
-   /* _mesa_function_pool[900]: GetMapfv (offset 267) */
+   /* _mesa_function_pool[861]: GetMapfv (offset 267) */
    "iip\0"
    "glGetMapfv\0"
    "\0"
-   /* _mesa_function_pool[916]: EvalCoord1f (offset 230) */
+   /* _mesa_function_pool[877]: EvalCoord1f (offset 230) */
    "f\0"
    "glEvalCoord1f\0"
    "\0"
-   /* _mesa_function_pool[933]: TexImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[894]: TexImage4DSGIS (dynamic) */
    "iiiiiiiiiip\0"
    "glTexImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[963]: PolygonStipple (offset 175) */
+   /* _mesa_function_pool[924]: PolygonStipple (offset 175) */
    "p\0"
    "glPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[983]: WindowPos2dvMESA (will be remapped) */
+   /* _mesa_function_pool[944]: WindowPos2dvMESA (will be remapped) */
    "p\0"
    "glWindowPos2dv\0"
    "glWindowPos2dvARB\0"
    "glWindowPos2dvMESA\0"
    "\0"
-   /* _mesa_function_pool[1038]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[999]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1082]: BlendEquationSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[1043]: BlendEquationSeparateEXT (will be remapped) */
    "ii\0"
    "glBlendEquationSeparate\0"
    "glBlendEquationSeparateEXT\0"
    "glBlendEquationSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[1164]: ListParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[1125]: ListParameterfSGIX (dynamic) */
    "iif\0"
    "glListParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[1190]: SecondaryColor3bEXT (will be remapped) */
+   /* _mesa_function_pool[1151]: SecondaryColor3bEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3b\0"
    "glSecondaryColor3bEXT\0"
    "\0"
-   /* _mesa_function_pool[1236]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[1197]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1282]: GetPixelMapfv (offset 271) */
+   /* _mesa_function_pool[1243]: GetPixelMapfv (offset 271) */
    "ip\0"
    "glGetPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[1302]: Color3uiv (offset 22) */
+   /* _mesa_function_pool[1263]: Color3uiv (offset 22) */
    "p\0"
    "glColor3uiv\0"
    "\0"
-   /* _mesa_function_pool[1317]: IsEnabled (offset 286) */
+   /* _mesa_function_pool[1278]: IsEnabled (offset 286) */
    "i\0"
    "glIsEnabled\0"
    "\0"
-   /* _mesa_function_pool[1332]: VertexAttrib4svNV (will be remapped) */
+   /* _mesa_function_pool[1293]: VertexAttrib4svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4svNV\0"
    "\0"
-   /* _mesa_function_pool[1356]: EvalCoord2fv (offset 235) */
+   /* _mesa_function_pool[1317]: EvalCoord2fv (offset 235) */
    "p\0"
    "glEvalCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[1374]: GetBufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1335]: GetBufferSubDataARB (will be remapped) */
    "iiip\0"
    "glGetBufferSubData\0"
    "glGetBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1421]: BufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1382]: BufferSubDataARB (will be remapped) */
    "iiip\0"
    "glBufferSubData\0"
    "glBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1462]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1423]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1500]: AttachShader (will be remapped) */
+   /* _mesa_function_pool[1461]: AttachShader (will be remapped) */
    "ii\0"
    "glAttachShader\0"
    "\0"
-   /* _mesa_function_pool[1519]: VertexAttrib2fARB (will be remapped) */
+   /* _mesa_function_pool[1480]: VertexAttrib2fARB (will be remapped) */
    "iff\0"
    "glVertexAttrib2f\0"
    "glVertexAttrib2fARB\0"
    "\0"
-   /* _mesa_function_pool[1561]: GetDebugLogLengthMESA (dynamic) */
+   /* _mesa_function_pool[1522]: GetDebugLogLengthMESA (dynamic) */
    "iii\0"
    "glGetDebugLogLengthMESA\0"
    "\0"
-   /* _mesa_function_pool[1590]: GetMapiv (offset 268) */
+   /* _mesa_function_pool[1551]: GetMapiv (offset 268) */
    "iip\0"
    "glGetMapiv\0"
    "\0"
-   /* _mesa_function_pool[1606]: VertexAttrib3fARB (will be remapped) */
+   /* _mesa_function_pool[1567]: VertexAttrib3fARB (will be remapped) */
    "ifff\0"
    "glVertexAttrib3f\0"
    "glVertexAttrib3fARB\0"
    "\0"
-   /* _mesa_function_pool[1649]: Indexubv (offset 316) */
+   /* _mesa_function_pool[1610]: Indexubv (offset 316) */
    "p\0"
    "glIndexubv\0"
    "\0"
-   /* _mesa_function_pool[1663]: GetQueryivARB (will be remapped) */
+   /* _mesa_function_pool[1624]: GetQueryivARB (will be remapped) */
    "iip\0"
    "glGetQueryiv\0"
    "glGetQueryivARB\0"
    "\0"
-   /* _mesa_function_pool[1697]: TexImage3D (offset 371) */
+   /* _mesa_function_pool[1658]: TexImage3D (offset 371) */
    "iiiiiiiiip\0"
    "glTexImage3D\0"
    "glTexImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[1738]: ReplacementCodeuiVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1699]: ReplacementCodeuiVertex3fvSUN (dynamic) */
    "pp\0"
    "glReplacementCodeuiVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1774]: EdgeFlagPointer (offset 312) */
+   /* _mesa_function_pool[1735]: EdgeFlagPointer (offset 312) */
    "ip\0"
    "glEdgeFlagPointer\0"
    "\0"
-   /* _mesa_function_pool[1796]: Color3ubv (offset 20) */
+   /* _mesa_function_pool[1757]: Color3ubv (offset 20) */
    "p\0"
    "glColor3ubv\0"
    "\0"
-   /* _mesa_function_pool[1811]: GetQueryObjectivARB (will be remapped) */
+   /* _mesa_function_pool[1772]: GetQueryObjectivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectiv\0"
    "glGetQueryObjectivARB\0"
    "\0"
-   /* _mesa_function_pool[1857]: Vertex3dv (offset 135) */
+   /* _mesa_function_pool[1818]: Vertex3dv (offset 135) */
    "p\0"
    "glVertex3dv\0"
    "\0"
-   /* _mesa_function_pool[1872]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1833]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1919]: CompressedTexSubImage2DARB (will be remapped) */
+   /* _mesa_function_pool[1880]: CompressedTexSubImage2DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexSubImage2D\0"
    "glCompressedTexSubImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[1985]: CombinerOutputNV (will be remapped) */
+   /* _mesa_function_pool[1946]: CombinerOutputNV (will be remapped) */
    "iiiiiiiiii\0"
    "glCombinerOutputNV\0"
    "\0"
-   /* _mesa_function_pool[2016]: VertexAttribs3fvNV (will be remapped) */
+   /* _mesa_function_pool[1977]: VertexAttribs3fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3fvNV\0"
    "\0"
-   /* _mesa_function_pool[2042]: Uniform2fARB (will be remapped) */
+   /* _mesa_function_pool[2003]: Uniform2fARB (will be remapped) */
    "iff\0"
    "glUniform2f\0"
    "glUniform2fARB\0"
    "\0"
-   /* _mesa_function_pool[2074]: LightModeliv (offset 166) */
+   /* _mesa_function_pool[2035]: LightModeliv (offset 166) */
    "ip\0"
    "glLightModeliv\0"
    "\0"
-   /* _mesa_function_pool[2093]: VertexAttrib1svARB (will be remapped) */
+   /* _mesa_function_pool[2054]: VertexAttrib1svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1sv\0"
    "glVertexAttrib1svARB\0"
    "\0"
-   /* _mesa_function_pool[2136]: VertexAttribs1dvNV (will be remapped) */
+   /* _mesa_function_pool[2097]: VertexAttribs1dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1dvNV\0"
    "\0"
-   /* _mesa_function_pool[2162]: Uniform2ivARB (will be remapped) */
+   /* _mesa_function_pool[2123]: Uniform2ivARB (will be remapped) */
    "iip\0"
    "glUniform2iv\0"
    "glUniform2ivARB\0"
    "\0"
-   /* _mesa_function_pool[2196]: GetImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[2157]: GetImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[2234]: Normal3bv (offset 53) */
+   /* _mesa_function_pool[2195]: Normal3bv (offset 53) */
    "p\0"
    "glNormal3bv\0"
    "\0"
-   /* _mesa_function_pool[2249]: TexGeniv (offset 193) */
+   /* _mesa_function_pool[2210]: TexGeniv (offset 193) */
    "iip\0"
    "glTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[2265]: WeightubvARB (dynamic) */
+   /* _mesa_function_pool[2226]: WeightubvARB (dynamic) */
    "ip\0"
    "glWeightubvARB\0"
    "\0"
-   /* _mesa_function_pool[2284]: VertexAttrib1fvNV (will be remapped) */
+   /* _mesa_function_pool[2245]: VertexAttrib1fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1fvNV\0"
    "\0"
-   /* _mesa_function_pool[2308]: Vertex3iv (offset 139) */
+   /* _mesa_function_pool[2269]: Vertex3iv (offset 139) */
    "p\0"
    "glVertex3iv\0"
    "\0"
-   /* _mesa_function_pool[2323]: CopyConvolutionFilter1D (offset 354) */
+   /* _mesa_function_pool[2284]: CopyConvolutionFilter1D (offset 354) */
    "iiiii\0"
    "glCopyConvolutionFilter1D\0"
    "glCopyConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[2385]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[2346]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[2433]: DeleteSync (will be remapped) */
+   /* _mesa_function_pool[2394]: DeleteSync (will be remapped) */
    "i\0"
    "glDeleteSync\0"
    "\0"
-   /* _mesa_function_pool[2449]: FragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[2410]: FragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[2479]: BlendColor (offset 336) */
+   /* _mesa_function_pool[2440]: BlendColor (offset 336) */
    "ffff\0"
    "glBlendColor\0"
    "glBlendColorEXT\0"
    "\0"
-   /* _mesa_function_pool[2514]: UniformMatrix4fvARB (will be remapped) */
+   /* _mesa_function_pool[2475]: UniformMatrix4fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix4fv\0"
    "glUniformMatrix4fvARB\0"
    "\0"
-   /* _mesa_function_pool[2561]: DeleteVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[2522]: DeleteVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glDeleteVertexArrays\0"
    "glDeleteVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[2612]: ReadInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[2573]: ReadInstrumentsSGIX (dynamic) */
    "i\0"
    "glReadInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[2637]: CallLists (offset 3) */
+   /* _mesa_function_pool[2598]: CallLists (offset 3) */
    "iip\0"
    "glCallLists\0"
    "\0"
-   /* _mesa_function_pool[2654]: UniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[2615]: UniformMatrix2x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x4fv\0"
    "\0"
-   /* _mesa_function_pool[2681]: Color4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2642]: Color4ubVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2708]: Normal3iv (offset 59) */
+   /* _mesa_function_pool[2669]: Normal3iv (offset 59) */
    "p\0"
    "glNormal3iv\0"
    "\0"
-   /* _mesa_function_pool[2723]: PassThrough (offset 199) */
+   /* _mesa_function_pool[2684]: PassThrough (offset 199) */
    "f\0"
    "glPassThrough\0"
    "\0"
-   /* _mesa_function_pool[2740]: FramebufferTextureLayerEXT (will be remapped) */
+   /* _mesa_function_pool[2701]: FramebufferTextureLayerEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[2802]: GetListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[2763]: GetListParameterfvSGIX (dynamic) */
    "iip\0"
    "glGetListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[2832]: Viewport (offset 305) */
+   /* _mesa_function_pool[2793]: Viewport (offset 305) */
    "iiii\0"
    "glViewport\0"
    "\0"
-   /* _mesa_function_pool[2849]: VertexAttrib4NusvARB (will be remapped) */
+   /* _mesa_function_pool[2810]: VertexAttrib4NusvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nusv\0"
    "glVertexAttrib4NusvARB\0"
    "\0"
-   /* _mesa_function_pool[2896]: WindowPos4svMESA (will be remapped) */
+   /* _mesa_function_pool[2857]: WindowPos4svMESA (will be remapped) */
    "p\0"
    "glWindowPos4svMESA\0"
    "\0"
-   /* _mesa_function_pool[2918]: CreateProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[2879]: CreateProgramObjectARB (will be remapped) */
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[2945]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[2906]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
    "glDeleteTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[2976]: UniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[2937]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[3003]: PrioritizeTextures (offset 331) */
+   /* _mesa_function_pool[2964]: PrioritizeTextures (offset 331) */
    "ipp\0"
    "glPrioritizeTextures\0"
    "glPrioritizeTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[3053]: AsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[3014]: AsyncMarkerSGIX (dynamic) */
    "i\0"
    "glAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[3074]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[3035]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[3102]: ClearDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[3063]: ClearDebugLogMESA (dynamic) */
    "iii\0"
    "glClearDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[3127]: ResetHistogram (offset 369) */
+   /* _mesa_function_pool[3088]: ResetHistogram (offset 369) */
    "i\0"
    "glResetHistogram\0"
    "glResetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[3167]: GetProgramNamedParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[3128]: GetProgramNamedParameterfvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[3204]: PointParameterfEXT (will be remapped) */
+   /* _mesa_function_pool[3165]: PointParameterfEXT (will be remapped) */
    "if\0"
    "glPointParameterf\0"
    "glPointParameterfARB\0"
    "glPointParameterfEXT\0"
    "glPointParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[3290]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[3251]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[3326]: GenFencesNV (will be remapped) */
+   /* _mesa_function_pool[3287]: GenFencesNV (will be remapped) */
    "ip\0"
    "glGenFencesNV\0"
    "\0"
-   /* _mesa_function_pool[3344]: ImageTransformParameterfHP (dynamic) */
+   /* _mesa_function_pool[3305]: ImageTransformParameterfHP (dynamic) */
    "iif\0"
    "glImageTransformParameterfHP\0"
    "\0"
-   /* _mesa_function_pool[3378]: MatrixIndexusvARB (dynamic) */
+   /* _mesa_function_pool[3339]: MatrixIndexusvARB (dynamic) */
    "ip\0"
    "glMatrixIndexusvARB\0"
    "\0"
-   /* _mesa_function_pool[3402]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[3363]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[3434]: DisableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[3395]: DisableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[3494]: TexCoord2sv (offset 109) */
+   /* _mesa_function_pool[3455]: TexCoord2sv (offset 109) */
    "p\0"
    "glTexCoord2sv\0"
    "\0"
-   /* _mesa_function_pool[3511]: Vertex4dv (offset 143) */
+   /* _mesa_function_pool[3472]: Vertex4dv (offset 143) */
    "p\0"
    "glVertex4dv\0"
    "\0"
-   /* _mesa_function_pool[3526]: StencilMaskSeparate (will be remapped) */
+   /* _mesa_function_pool[3487]: StencilMaskSeparate (will be remapped) */
    "ii\0"
    "glStencilMaskSeparate\0"
    "\0"
-   /* _mesa_function_pool[3552]: ProgramLocalParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[3513]: ProgramLocalParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramLocalParameter4dARB\0"
    "\0"
-   /* _mesa_function_pool[3589]: CompressedTexImage3DARB (will be remapped) */
+   /* _mesa_function_pool[3550]: CompressedTexImage3DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexImage3D\0"
    "glCompressedTexImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[3649]: Color3sv (offset 18) */
+   /* _mesa_function_pool[3610]: Color3sv (offset 18) */
    "p\0"
    "glColor3sv\0"
    "\0"
-   /* _mesa_function_pool[3663]: GetConvolutionParameteriv (offset 358) */
+   /* _mesa_function_pool[3624]: GetConvolutionParameteriv (offset 358) */
    "iip\0"
    "glGetConvolutionParameteriv\0"
    "glGetConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[3727]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[3688]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[3768]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[3729]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[3783]: TestFenceNV (will be remapped) */
+   /* _mesa_function_pool[3744]: TestFenceNV (will be remapped) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[3800]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[3761]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[3845]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[3806]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[3862]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[3823]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[3896]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[3857]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[3934]: GetPixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[3895]: GetPixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[3970]: Color3fv (offset 14) */
+   /* _mesa_function_pool[3931]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[3984]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[3945]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[4010]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[3971]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[4036]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[3997]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[4057]: GetDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[4018]: GetDebugLogMESA (dynamic) */
    "iiiipp\0"
    "glGetDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[4083]: FogCoorddEXT (will be remapped) */
+   /* _mesa_function_pool[4044]: FogCoorddEXT (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[4113]: BeginConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[4074]: BeginConditionalRenderNV (will be remapped) */
    "ii\0"
    "glBeginConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[4144]: Color4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4105]: Color4ubVertex3fSUN (dynamic) */
    "iiiifff\0"
    "glColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4175]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[4136]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[4205]: PointSize (offset 173) */
+   /* _mesa_function_pool[4166]: PointSize (offset 173) */
    "f\0"
    "glPointSize\0"
    "\0"
-   /* _mesa_function_pool[4220]: TexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4181]: TexCoord2fVertex3fSUN (dynamic) */
    "fffff\0"
    "glTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4251]: PopName (offset 200) */
+   /* _mesa_function_pool[4212]: PopName (offset 200) */
    "\0"
    "glPopName\0"
    "\0"
-   /* _mesa_function_pool[4263]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[4224]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[4290]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[4251]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[4314]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[4275]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[4340]: VertexAttrib4NbvARB (will be remapped) */
+   /* _mesa_function_pool[4301]: VertexAttrib4NbvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[4385]: GetActiveAttribARB (will be remapped) */
+   /* _mesa_function_pool[4346]: GetActiveAttribARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[4433]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[4394]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[4448]: VertexAttrib4ubNV (will be remapped) */
+   /* _mesa_function_pool[4409]: VertexAttrib4ubNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4ubNV\0"
    "\0"
-   /* _mesa_function_pool[4475]: TextureRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[4436]: TextureRangeAPPLE (will be remapped) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[4500]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[4461]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[4519]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[4480]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[4547]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4508]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4600]: Indexub (offset 315) */
+   /* _mesa_function_pool[4561]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[4613]: ColorMaskIndexedEXT (will be remapped) */
-   "iiiii\0"
-   "glColorMaskIndexedEXT\0"
-   "\0"
-   /* _mesa_function_pool[4642]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[4574]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[4657]: GetClipPlane (offset 259) */
+   /* _mesa_function_pool[4589]: GetClipPlane (offset 259) */
    "ip\0"
    "glGetClipPlane\0"
    "\0"
-   /* _mesa_function_pool[4676]: CombinerParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[4608]: CombinerParameterfvNV (will be remapped) */
    "ip\0"
    "glCombinerParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[4704]: VertexAttribs3dvNV (will be remapped) */
+   /* _mesa_function_pool[4636]: VertexAttribs3dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3dvNV\0"
    "\0"
-   /* _mesa_function_pool[4730]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[4662]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[4756]: VertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[4688]: VertexArrayRangeNV (will be remapped) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[4781]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[4713]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[4807]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[4739]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[4830]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[4762]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[4849]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[4781]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[4878]: Scaled (offset 301) */
+   /* _mesa_function_pool[4810]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[4892]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[4824]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[4920]: Scalef (offset 302) */
+   /* _mesa_function_pool[4852]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[4934]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[4866]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[4972]: MultTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[4904]: MultTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[5024]: ObjectUnpurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[4956]: ColorMaskIndexedEXT (will be remapped) */
+   "iiiii\0"
+   "glColorMaskIndexedEXT\0"
+   "\0"
+   /* _mesa_function_pool[4985]: ObjectUnpurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectUnpurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[5054]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[5015]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[5070]: WindowPos2svMESA (will be remapped) */
+   /* _mesa_function_pool[5031]: WindowPos2svMESA (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[5125]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[5086]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[5139]: TexCoord2iv (offset 107) */
+   /* _mesa_function_pool[5100]: TexCoord2iv (offset 107) */
    "p\0"
    "glTexCoord2iv\0"
    "\0"
-   /* _mesa_function_pool[5156]: CompressedTexImage1DARB (will be remapped) */
+   /* _mesa_function_pool[5117]: CompressedTexImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[5214]: Rotated (offset 299) */
+   /* _mesa_function_pool[5175]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[5230]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[5191]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[5254]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[5215]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[5276]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[5237]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[5291]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[5252]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[5320]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[5281]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[5344]: Color4iv (offset 32) */
+   /* _mesa_function_pool[5305]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[5358]: TexParameterf (offset 178) */
+   /* _mesa_function_pool[5319]: TexParameterf (offset 178) */
    "iif\0"
    "glTexParameterf\0"
    "\0"
-   /* _mesa_function_pool[5379]: TexParameteri (offset 180) */
+   /* _mesa_function_pool[5340]: TexParameteri (offset 180) */
    "iii\0"
    "glTexParameteri\0"
    "\0"
-   /* _mesa_function_pool[5400]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[5361]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[5425]: MultiTexCoord3dARB (offset 392) */
+   /* _mesa_function_pool[5386]: MultiTexCoord3dARB (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[5470]: MultiTexCoord2iARB (offset 388) */
+   /* _mesa_function_pool[5431]: MultiTexCoord2iARB (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[5514]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[5475]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[5534]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5495]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5594]: MultiTexCoord2svARB (offset 391) */
+   /* _mesa_function_pool[5555]: MultiTexCoord2svARB (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[5639]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[5600]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[5666]: Uniform3iARB (will be remapped) */
+   /* _mesa_function_pool[5627]: Uniform3iARB (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[5699]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5660]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5727]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[5688]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[5760]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[5721]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[5785]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[5746]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[5803]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[5764]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[5828]: GlobalAlphaFactordSUN (dynamic) */
+   /* _mesa_function_pool[5789]: GlobalAlphaFactordSUN (dynamic) */
    "d\0"
    "glGlobalAlphaFactordSUN\0"
    "\0"
-   /* _mesa_function_pool[5855]: GetFinalCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[5816]: GetFinalCombinerInputParameterfvNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[5897]: GenerateMipmapEXT (will be remapped) */
+   /* _mesa_function_pool[5858]: GenerateMipmapEXT (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "\0"
-   /* _mesa_function_pool[5937]: GenLists (offset 5) */
+   /* _mesa_function_pool[5898]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[5951]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[5912]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[5986]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[5947]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[6020]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[5981]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[6047]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[6008]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[6075]: BufferDataARB (will be remapped) */
+   /* _mesa_function_pool[6036]: BufferDataARB (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[6110]: FlushVertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[6071]: FlushVertexArrayRangeNV (will be remapped) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[6138]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[6099]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[6158]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[6119]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[6178]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[6139]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[6198]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6159]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6224]: GetTexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[6185]: GetTexFilterFuncSGIS (dynamic) */
    "iip\0"
    "glGetTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[6252]: Scissor (offset 176) */
+   /* _mesa_function_pool[6213]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[6268]: Fogf (offset 153) */
+   /* _mesa_function_pool[6229]: Fogf (offset 153) */
    "if\0"
    "glFogf\0"
    "\0"
-   /* _mesa_function_pool[6279]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[6240]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6324]: TexSubImage1D (offset 332) */
+   /* _mesa_function_pool[6285]: TexSubImage1D (offset 332) */
    "iiiiiip\0"
    "glTexSubImage1D\0"
    "glTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[6368]: VertexAttrib1sARB (will be remapped) */
+   /* _mesa_function_pool[6329]: VertexAttrib1sARB (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[6409]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[6370]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[6425]: Color4usv (offset 40) */
+   /* _mesa_function_pool[6386]: Color4usv (offset 40) */
    "p\0"
    "glColor4usv\0"
    "\0"
-   /* _mesa_function_pool[6440]: Fogi (offset 155) */
+   /* _mesa_function_pool[6401]: Fogi (offset 155) */
    "ii\0"
    "glFogi\0"
    "\0"
-   /* _mesa_function_pool[6451]: DepthRange (offset 288) */
+   /* _mesa_function_pool[6412]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[6468]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[6429]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[6486]: FinalCombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[6447]: FinalCombinerInputNV (will be remapped) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[6515]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[6476]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[6532]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[6493]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[6550]: Color4ui (offset 37) */
+   /* _mesa_function_pool[6511]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[6567]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[6528]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[6586]: Color3usv (offset 24) */
+   /* _mesa_function_pool[6547]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[6601]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[6562]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[6621]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[6582]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[6638]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[6599]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[6687]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[6648]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[6704]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[6665]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[6723]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[6684]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[6742]: Uniform1fARB (will be remapped) */
+   /* _mesa_function_pool[6703]: Uniform1fARB (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[6773]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[6734]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[6825]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[6786]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[6842]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[6803]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[6891]: ColorTableParameteriv (offset 341) */
+   /* _mesa_function_pool[6852]: ColorTableParameteriv (offset 341) */
    "iip\0"
    "glColorTableParameteriv\0"
    "glColorTableParameterivSGI\0"
    "\0"
-   /* _mesa_function_pool[6947]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[6908]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[6978]: WindowPos3dMESA (will be remapped) */
+   /* _mesa_function_pool[6939]: WindowPos3dMESA (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[7032]: Color4us (offset 39) */
+   /* _mesa_function_pool[6993]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[7049]: PointParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[7010]: PointParameterfvEXT (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[7139]: Color3bv (offset 10) */
+   /* _mesa_function_pool[7100]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[7153]: WindowPos2fvMESA (will be remapped) */
+   /* _mesa_function_pool[7114]: WindowPos2fvMESA (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[7208]: SecondaryColor3bvEXT (will be remapped) */
+   /* _mesa_function_pool[7169]: SecondaryColor3bvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[7254]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[7215]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[7284]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[7245]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[7321]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[7282]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[7350]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[7311]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7392]: RenderbufferStorageEXT (will be remapped) */
+   /* _mesa_function_pool[7353]: RenderbufferStorageEXT (will be remapped) */
    "iiii\0"
    "glRenderbufferStorage\0"
    "glRenderbufferStorageEXT\0"
    "\0"
-   /* _mesa_function_pool[7445]: IsFenceNV (will be remapped) */
+   /* _mesa_function_pool[7406]: IsFenceNV (will be remapped) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[7460]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[7421]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[7482]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[7443]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[7512]: UniformMatrix2fvARB (will be remapped) */
+   /* _mesa_function_pool[7473]: UniformMatrix2fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[7559]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[7520]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[7603]: ColorTable (offset 339) */
+   /* _mesa_function_pool[7564]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[7656]: IndexPointer (offset 314) */
+   /* _mesa_function_pool[7617]: IndexPointer (offset 314) */
    "iip\0"
    "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[7676]: Accum (offset 213) */
+   /* _mesa_function_pool[7637]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[7688]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[7649]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[7709]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[7670]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[7741]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[7702]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[7797]: Finish (offset 216) */
+   /* _mesa_function_pool[7758]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[7808]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[7769]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[7832]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[7793]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[7850]: VertexAttrib3dvARB (will be remapped) */
+   /* _mesa_function_pool[7811]: VertexAttrib3dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[7893]: HintPGI (dynamic) */
+   /* _mesa_function_pool[7854]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[7907]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[7868]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[7965]: Color4s (offset 33) */
+   /* _mesa_function_pool[7926]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[7981]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[7942]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[8006]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[7967]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[8024]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[7985]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[8041]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[8002]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[8056]: CullParameterdvEXT (dynamic) */
+   /* _mesa_function_pool[8017]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[8081]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[8042]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[8118]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[8079]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[8147]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[8108]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[8204]: Color4i (offset 31) */
+   /* _mesa_function_pool[8165]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[8220]: Color4f (offset 29) */
+   /* _mesa_function_pool[8181]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[8236]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[8197]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[8254]: Color4d (offset 27) */
+   /* _mesa_function_pool[8215]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[8270]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[8231]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[8286]: Color4b (offset 25) */
+   /* _mesa_function_pool[8247]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[8302]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[8263]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[8319]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[8280]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[8349]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[8310]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[8367]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[8328]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[8425]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[8386]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[8446]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[8407]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[8465]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[8426]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[8492]: BeginTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[8453]: BeginTransformFeedbackEXT (will be remapped) */
    "i\0"
    "glBeginTransformFeedbackEXT\0"
    "glBeginTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[8548]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[8509]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[8570]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[8531]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[8586]: EndList (offset 1) */
+   /* _mesa_function_pool[8547]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[8598]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[8559]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[8622]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[8583]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[8652]: Uniform3fvARB (will be remapped) */
+   /* _mesa_function_pool[8613]: Uniform3fvARB (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[8686]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[8647]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[8704]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[8665]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[8755]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[8716]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[8774]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[8735]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[8789]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[8750]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[8817]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[8778]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[8845]: CheckFramebufferStatusEXT (will be remapped) */
+   /* _mesa_function_pool[8806]: CheckFramebufferStatusEXT (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "\0"
-   /* _mesa_function_pool[8901]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[8862]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[8929]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[8890]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[8947]: GetVertexAttribivARB (will be remapped) */
+   /* _mesa_function_pool[8908]: GetVertexAttribivARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[8995]: GetCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[8956]: GetCombinerInputParameterfvNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9034]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[8995]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[9052]: LoadTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[9013]: LoadTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[9104]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[9065]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[9138]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[9099]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[9166]: SecondaryColor3sEXT (will be remapped) */
+   /* _mesa_function_pool[9127]: SecondaryColor3sEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[9212]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[9173]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[9238]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[9199]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[9253]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[9214]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[9280]: Color3us (offset 23) */
+   /* _mesa_function_pool[9241]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[9296]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[9257]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[9331]: VertexAttrib4ivARB (will be remapped) */
+   /* _mesa_function_pool[9292]: VertexAttrib4ivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[9374]: End (offset 43) */
+   /* _mesa_function_pool[9335]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[9382]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[9343]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[9407]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[9368]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[9433]: GetQueryObjectui64vEXT (will be remapped) */
+   /* _mesa_function_pool[9394]: GetQueryObjectui64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[9463]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[9424]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[9508]: SecondaryColor3dEXT (will be remapped) */
+   /* _mesa_function_pool[9469]: SecondaryColor3dEXT (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[9554]: Color3ub (offset 19) */
+   /* _mesa_function_pool[9515]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[9570]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[9531]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9602]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[9563]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[9627]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[9588]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[9662]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[9623]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[9685]: Color3ui (offset 21) */
+   /* _mesa_function_pool[9646]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[9701]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[9662]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[9718]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[9679]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[9764]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[9725]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[9791]: GetTexParameterPointervAPPLE (will be remapped) */
+   /* _mesa_function_pool[9752]: GetTexParameterPointervAPPLE (will be remapped) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[9827]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[9788]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[9843]: GetTransformFeedbackVaryingEXT (will be remapped) */
+   /* _mesa_function_pool[9804]: GetTransformFeedbackVaryingEXT (will be remapped) */
    "iiipppp\0"
    "glGetTransformFeedbackVaryingEXT\0"
    "glGetTransformFeedbackVarying\0"
    "\0"
-   /* _mesa_function_pool[9915]: VertexAttrib4bvARB (will be remapped) */
+   /* _mesa_function_pool[9876]: VertexAttrib4bvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[9958]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[9919]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[9991]: GetIntegerIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[9952]: GetIntegerIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "\0"
-   /* _mesa_function_pool[10020]: MultiTexCoord4sARB (offset 406) */
+   /* _mesa_function_pool[9981]: MultiTexCoord4sARB (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[10066]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[10027]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[10099]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[10060]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[10123]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[10084]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "\0"
-   /* _mesa_function_pool[10148]: WindowPos2dMESA (will be remapped) */
+   /* _mesa_function_pool[10109]: WindowPos2dMESA (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[10201]: FramebufferTexture3DEXT (will be remapped) */
+   /* _mesa_function_pool[10162]: FramebufferTexture3DEXT (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "\0"
-   /* _mesa_function_pool[10258]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[10219]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "\0"
-   /* _mesa_function_pool[10296]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[10257]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[10321]: VertexAttrib3dARB (will be remapped) */
+   /* _mesa_function_pool[10282]: VertexAttrib3dARB (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[10364]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10325]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10428]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[10389]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[10472]: GetError (offset 261) */
+   /* _mesa_function_pool[10433]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[10485]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[10446]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[10504]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[10465]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[10521]: Indexdv (offset 45) */
+   /* _mesa_function_pool[10482]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[10534]: FramebufferTexture2DEXT (will be remapped) */
+   /* _mesa_function_pool[10495]: FramebufferTexture2DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "\0"
-   /* _mesa_function_pool[10590]: Normal3s (offset 60) */
+   /* _mesa_function_pool[10551]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[10606]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[10567]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[10640]: PushName (offset 201) */
+   /* _mesa_function_pool[10601]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[10654]: MultiTexCoord2dvARB (offset 385) */
+   /* _mesa_function_pool[10615]: MultiTexCoord2dvARB (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[10699]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[10660]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[10724]: Normal3i (offset 58) */
+   /* _mesa_function_pool[10685]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[10740]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[10701]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[10775]: SecondaryColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[10736]: SecondaryColorPointerEXT (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[10832]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[10793]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[10875]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[10836]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[10904]: GetActiveUniformARB (will be remapped) */
+   /* _mesa_function_pool[10865]: GetActiveUniformARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[10954]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[10915]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[10988]: Normal3b (offset 52) */
+   /* _mesa_function_pool[10949]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[11004]: Normal3d (offset 54) */
+   /* _mesa_function_pool[10965]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[11020]: Normal3f (offset 56) */
+   /* _mesa_function_pool[10981]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[11036]: MultiTexCoord1svARB (offset 383) */
+   /* _mesa_function_pool[10997]: MultiTexCoord1svARB (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[11081]: Indexi (offset 48) */
+   /* _mesa_function_pool[11042]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[11093]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[11054]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[11126]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[11087]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[11154]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[11115]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[11175]: DeformationMap3dSGIX (dynamic) */
-   "iddiiddiiddiip\0"
-   "glDeformationMap3dSGIX\0"
-   "\0"
-   /* _mesa_function_pool[11214]: BindBufferRangeEXT (will be remapped) */
+   /* _mesa_function_pool[11136]: BindBufferRangeEXT (will be remapped) */
    "iiiii\0"
    "glBindBufferRangeEXT\0"
    "glBindBufferRange\0"
    "\0"
-   /* _mesa_function_pool[11260]: DepthMask (offset 211) */
+   /* _mesa_function_pool[11182]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[11275]: IsShader (will be remapped) */
+   /* _mesa_function_pool[11197]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[11289]: Indexf (offset 46) */
+   /* _mesa_function_pool[11211]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[11301]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[11223]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[11339]: Indexd (offset 44) */
+   /* _mesa_function_pool[11261]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[11351]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[11273]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[11372]: StencilOp (offset 244) */
+   /* _mesa_function_pool[11294]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[11389]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[11311]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[11411]: FramebufferTextureLayer (dynamic) */
+   /* _mesa_function_pool[11333]: FramebufferTextureLayer (dynamic) */
    "iiiii\0"
    "glFramebufferTextureLayerARB\0"
    "\0"
-   /* _mesa_function_pool[11447]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[11369]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[11492]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[11414]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[11508]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[11430]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[11554]: Indexs (offset 50) */
+   /* _mesa_function_pool[11476]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[11566]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[11488]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[11586]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[11508]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[11608]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[11530]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[11646]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[11568]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[11678]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[11600]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[11705]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[11627]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[11720]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[11642]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[11737]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[11659]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[11752]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11674]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11805]: Color4bv (offset 26) */
+   /* _mesa_function_pool[11727]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[11819]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[11741]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[11841]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[11763]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[11889]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[11811]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[11914]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[11836]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[11962]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[11884]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[11986]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[11908]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[12021]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[11943]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[12039]: LogicOp (offset 242) */
+   /* _mesa_function_pool[11961]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[12052]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[11974]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[12076]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[11998]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[12091]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[12013]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[12167]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[12089]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[12184]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[12106]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[12204]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[12126]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[12231]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[12153]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[12276]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[12198]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[12291]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12213]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12323]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[12245]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[12351]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[12273]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[12375]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[12297]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[12436]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[12358]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[12460]: GenTextures (offset 328) */
+   /* _mesa_function_pool[12382]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[12495]: FramebufferTextureARB (will be remapped) */
+   /* _mesa_function_pool[12417]: FramebufferTextureARB (will be remapped) */
    "iiii\0"
    "glFramebufferTextureARB\0"
    "\0"
-   /* _mesa_function_pool[12525]: SetFenceNV (will be remapped) */
+   /* _mesa_function_pool[12447]: SetFenceNV (will be remapped) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[12542]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[12464]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[12598]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[12520]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[12637]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[12559]: MultiModeDrawArraysIBM (will be remapped) */
+   "pppii\0"
+   "glMultiModeDrawArraysIBM\0"
+   "\0"
+   /* _mesa_function_pool[12591]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[12670]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[12624]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[12692]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12646]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12720]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[12674]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[12738]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[12692]: GetCombinerOutputParameterfvNV (will be remapped) */
+   "iiip\0"
+   "glGetCombinerOutputParameterfvNV\0"
+   "\0"
+   /* _mesa_function_pool[12731]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[12756]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[12749]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[12771]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[12764]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[12787]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[12780]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[12804]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[12797]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[12828]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[12821]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[12845]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[12838]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[12900]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[12893]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[12915]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[12908]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[12934]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[12927]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[12963]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[12956]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[13006]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[12999]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[13050]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[13043]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[13066]: EndTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[13059]: EndTransformFeedbackEXT (will be remapped) */
    "\0"
    "glEndTransformFeedbackEXT\0"
    "glEndTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[13117]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[13110]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[13151]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[13144]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[13180]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[13173]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[13225]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[13218]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[13281]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[13274]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[13302]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[13295]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[13332]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[13325]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[13367]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[13360]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[13386]: Flush (offset 217) */
+   /* _mesa_function_pool[13379]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[13396]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[13389]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[13411]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[13404]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[13433]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[13426]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[13451]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[13444]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[13494]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[13487]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[13518]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[13511]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[13534]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[13527]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[13552]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[13545]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[13594]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[13587]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[13616]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[13609]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[13636]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[13629]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[13677]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[13670]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[13732]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[13725]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[13750]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[13743]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[13774]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[13767]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[13792]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[13785]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[13810]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[13803]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[13864]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[13857]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[13906]: Color4ub (offset 35) */
+   /* _mesa_function_pool[13899]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[13923]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[13916]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[13943]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[13936]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[13972]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[13965]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[13990]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[13983]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[14050]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[14043]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[14069]: Indexiv (offset 49) */
+   /* _mesa_function_pool[14062]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[14082]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[14075]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[14100]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[14093]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[14144]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[14137]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[14204]: Frustum (offset 289) */
+   /* _mesa_function_pool[14197]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[14222]: GetString (offset 275) */
+   /* _mesa_function_pool[14215]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[14237]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[14230]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[14263]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[14256]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[14278]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[14271]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[14296]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[14289]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[14326]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[14319]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[14344]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[14337]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[14389]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[14382]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[14433]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[14426]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[14476]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[14469]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[14517]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[14510]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[14545]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[14538]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[14580]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[14573]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[14598]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[14591]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[14629]: DrawArraysInstanced (will be remapped) */
+   /* _mesa_function_pool[14622]: DrawArraysInstanced (will be remapped) */
    "iiii\0"
    "glDrawArraysInstanced\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "\0"
-   /* _mesa_function_pool[14707]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[14700]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[14741]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[14734]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[14766]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[14759]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[14822]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[14815]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[14841]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[14834]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[14857]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[14850]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[14905]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[14898]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[14951]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[14944]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[14968]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[14961]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[14995]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[14988]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[15022]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[15015]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[15059]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[15052]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[15079]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[15072]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[15100]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[15093]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[15127]: Rectd (offset 86) */
+   /* _mesa_function_pool[15120]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[15141]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[15134]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[15167]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[15160]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[15204]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[15197]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[15251]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[15244]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[15270]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[15263]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[15315]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[15308]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[15340]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[15333]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[15370]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[15363]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[15417]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[15410]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[15465]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[15458]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[15523]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[15516]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[15557]: Lightfv (offset 160) */
+   /* _mesa_function_pool[15550]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[15572]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[15565]: PrimitiveRestartIndexNV (will be remapped) */
+   "i\0"
+   "glPrimitiveRestartIndexNV\0"
+   "\0"
+   /* _mesa_function_pool[15594]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[15588]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[15610]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[15608]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[15630]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[15630]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[15652]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[15673]: Color4fv (offset 30) */
+   /* _mesa_function_pool[15695]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[15687]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[15709]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[15732]: DrawElementsInstanced (will be remapped) */
+   /* _mesa_function_pool[15754]: DrawElementsInstanced (will be remapped) */
    "iiipi\0"
    "glDrawElementsInstanced\0"
    "glDrawElementsInstancedARB\0"
    "glDrawElementsInstancedEXT\0"
    "\0"
-   /* _mesa_function_pool[15817]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[15839]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[15838]: Rects (offset 92) */
+   /* _mesa_function_pool[15860]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[15852]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[15874]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[15886]: Lightiv (offset 162) */
+   /* _mesa_function_pool[15908]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[15901]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[15923]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[15945]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[15967]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[15993]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[16015]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[16018]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[16040]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[16042]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[16064]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[16087]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[16109]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[16130]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[16152]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[16156]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[16178]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[16182]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[16204]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[16200]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[16222]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[16243]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[16265]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[16297]: Rectdv (offset 87) */
+   /* _mesa_function_pool[16319]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[16310]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[16332]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[16336]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[16358]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[16395]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[16417]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[16423]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[16445]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[16468]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[16490]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[16495]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[16517]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[16522]: Materialiv (offset 172) */
+   /* _mesa_function_pool[16544]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[16540]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[16562]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[16562]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[16584]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[16597]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[16619]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[16643]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[16665]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[16696]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[16718]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[16742]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[16764]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[16760]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[16782]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[16824]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[16846]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[16851]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[16873]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[16878]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[16900]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[16906]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[16928]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[16944]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[16966]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[16962]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[16984]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[16986]: TexGeni (offset 192) */
+   /* _mesa_function_pool[17008]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[17001]: TexGenf (offset 190) */
+   /* _mesa_function_pool[17023]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[17016]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[17038]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[17049]: TexGend (offset 188) */
+   /* _mesa_function_pool[17071]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[17064]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[17086]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[17091]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[17113]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[17114]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[17136]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[17133]: BindBufferOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[17155]: BindBufferOffsetEXT (will be remapped) */
    "iiii\0"
    "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[17161]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[17183]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[17215]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[17237]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[17239]: DisableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[17261]: DisableIndexedEXT (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "\0"
-   /* _mesa_function_pool[17263]: BindBufferBaseEXT (will be remapped) */
+   /* _mesa_function_pool[17285]: BindBufferBaseEXT (will be remapped) */
    "iii\0"
    "glBindBufferBaseEXT\0"
    "glBindBufferBase\0"
    "\0"
-   /* _mesa_function_pool[17305]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[17327]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[17334]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[17356]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[17358]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[17380]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[17405]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[17427]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[17455]: PixelTexGenSGIX (will be remapped) */
+   /* _mesa_function_pool[17477]: PixelTexGenSGIX (will be remapped) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[17476]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[17498]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[17503]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[17525]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[17537]: Color4sv (offset 34) */
+   /* _mesa_function_pool[17559]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[17551]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[17573]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[17581]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[17603]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[17613]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[17635]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[17648]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[17670]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[17664]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[17686]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[17697]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[17719]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[17755]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[17777]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[17811]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[17833]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[17841]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[17863]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[17861]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[17883]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[17880]: Color3dv (offset 12) */
+   /* _mesa_function_pool[17902]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[17894]: IsTexture (offset 330) */
+   /* _mesa_function_pool[17916]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[17924]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[17946]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[17947]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[17969]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[17988]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[18010]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[18023]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[18045]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[18042]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[18064]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[18081]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[18103]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[18111]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[18133]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[18143]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[18165]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[18172]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[18194]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[18188]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[18210]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[18216]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[18238]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[18258]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[18280]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[18276]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[18298]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[18302]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[18324]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[18351]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[18373]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[18369]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[18391]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[18414]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[18436]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[18448]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[18470]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[18472]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[18494]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[18511]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[18533]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[18540]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[18562]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[18558]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[18580]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[18601]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[18623]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[18621]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[18643]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[18689]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[18711]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[18744]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[18766]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[18782]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[18804]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[18816]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[18838]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[18864]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[18886]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[18892]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[18914]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[18945]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[18967]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[18966]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[18988]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[18993]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[19015]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[19025]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[19047]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[19049]: TransformFeedbackVaryingsEXT (will be remapped) */
+   /* _mesa_function_pool[19071]: TransformFeedbackVaryingsEXT (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryingsEXT\0"
    "glTransformFeedbackVaryings\0"
    "\0"
-   /* _mesa_function_pool[19114]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[19136]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[19136]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[19158]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[19154]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[19176]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[19177]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[19199]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[19204]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[19226]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[19254]: Color3s (offset 17) */
+   /* _mesa_function_pool[19276]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[19269]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[19291]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[19303]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[19325]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[19356]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[19378]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[19375]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[19397]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[19399]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[19421]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[19443]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[19465]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[19466]: Color3i (offset 15) */
+   /* _mesa_function_pool[19488]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[19481]: FrontFace (offset 157) */
+   /* _mesa_function_pool[19503]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[19496]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[19518]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[19514]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[19536]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[19562]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[19584]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[19580]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[19602]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[19623]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[19645]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[19673]: Color3b (offset 9) */
+   /* _mesa_function_pool[19695]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[19688]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[19710]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[19732]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[19754]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[19756]: Color3f (offset 13) */
+   /* _mesa_function_pool[19778]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[19771]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[19793]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[19791]: Color3d (offset 11) */
+   /* _mesa_function_pool[19813]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[19806]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[19828]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[19821]: Lightf (offset 159) */
+   /* _mesa_function_pool[19843]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[19835]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[19857]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[19861]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[19883]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[19877]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[19899]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[19898]: Lighti (offset 161) */
+   /* _mesa_function_pool[19920]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[19912]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[19934]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[19943]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[19965]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[19980]: GetBooleanIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[20002]: GetBooleanIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "\0"
-   /* _mesa_function_pool[20009]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[20031]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[20094]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[20116]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[20129]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[20151]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[20174]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[20196]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[20209]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[20231]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[20226]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[20248]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[20243]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[20265]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[20260]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[20282]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[20303]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[20325]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[20334]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[20356]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[20389]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[20411]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[20414]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[20436]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[20440]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[20462]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[20485]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[20507]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[20512]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[20534]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[20534]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[20556]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[20561]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[20583]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[20590]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[20612]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[20616]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[20638]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[20639]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[20661]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[20658]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[20680]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[20685]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[20707]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[20703]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[20725]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[20748]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[20770]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[20791]: ClearColor (offset 206) */
+   /* _mesa_function_pool[20813]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[20810]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[20832]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[20829]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[20851]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[20878]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[20900]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[20905]: IsEnabledIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[20927]: IsEnabledIndexedEXT (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "\0"
-   /* _mesa_function_pool[20931]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[20953]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[20947]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[20969]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[20995]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[21017]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[21015]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[21037]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[21063]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[21085]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[21087]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[21109]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[21128]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[21150]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[21160]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[21182]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[21178]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[21200]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[21270]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[21292]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[21301]: Bitmap (offset 8) */
+   /* _mesa_function_pool[21323]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[21319]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[21341]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[21364]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[21386]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[21395]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[21417]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[21431]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[21453]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[21474]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[21496]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[21506]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[21528]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[21521]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[21543]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[21539]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[21561]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[21579]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[21601]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[21606]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[21628]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[21625]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[21647]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[21673]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[21695]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[21708]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[21730]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[21735]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[21757]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[21759]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[21781]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[21793]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[21815]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[21845]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[21867]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[21864]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[21886]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[21895]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[21917]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[21933]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[21955]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[21976]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[21998]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[21996]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[22018]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[22067]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[22089]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[22089]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[22111]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[22109]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[22131]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[22163]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[22185]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[22216]: ProgramParameteriARB (will be remapped) */
+   /* _mesa_function_pool[22238]: ProgramParameteriARB (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "\0"
-   /* _mesa_function_pool[22244]: Map1d (offset 220) */
+   /* _mesa_function_pool[22266]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[22260]: Map1f (offset 221) */
+   /* _mesa_function_pool[22282]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[22276]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[22298]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[22335]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[22357]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[22371]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[22393]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[22395]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[22417]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[22416]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[22438]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[22447]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[22469]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[22486]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[22508]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[22508]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[22530]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[22562]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[22584]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[22583]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[22605]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[22629]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[22651]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[22644]: Fogiv (offset 156) */
+   /* _mesa_function_pool[22666]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[22656]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[22678]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[22673]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[22695]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[22709]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[22731]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[22730]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[22752]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[22757]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[22779]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[22781]: Rotatef (offset 300) */
+   /* _mesa_function_pool[22803]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[22797]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[22819]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[22839]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[22861]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[22855]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[22877]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[22871]: Clear (offset 203) */
+   /* _mesa_function_pool[22893]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[22882]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[22904]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[22898]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[22920]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[22925]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[22947]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[22959]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[22981]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[22975]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[22997]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[23031]: Ortho (offset 296) */
+   /* _mesa_function_pool[23053]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[23047]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[23069]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[23068]: ListBase (offset 6) */
+   /* _mesa_function_pool[23090]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[23082]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[23104]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[23098]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[23120]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[23154]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[23176]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[23246]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[23268]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[23303]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[23325]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[23319]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[23341]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[23345]: Rectiv (offset 91) */
+   /* _mesa_function_pool[23367]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[23358]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[23380]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[23396]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[23418]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[23423]: EndConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[23445]: EndConditionalRenderNV (will be remapped) */
    "\0"
    "glEndConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[23450]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[23472]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[23473]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[23495]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[23492]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[23514]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[23511]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[23533]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[23531]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[23553]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[23577]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[23599]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[23592]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[23614]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[23637]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[23659]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[23682]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[23704]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[23728]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[23750]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[23763]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[23785]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[23778]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[23800]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[23826]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[23848]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[23861]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[23883]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[23904]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[23926]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[23921]: PauseTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[23943]: PauseTransformFeedback (will be remapped) */
    "\0"
    "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[23948]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[23970]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[23991]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[24013]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[24038]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[24060]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[24126]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[24148]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[24152]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[24174]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[24197]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[24219]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[24229]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[24251]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[24244]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[24266]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[24270]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[24292]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[24295]: LineWidth (offset 168) */
+   /* _mesa_function_pool[24317]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[24310]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[24332]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[24341]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[24363]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[24379]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[24401]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[24399]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[24421]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[24420]: TexGendv (offset 189) */
+   /* _mesa_function_pool[24442]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[24436]: EnableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[24458]: EnableIndexedEXT (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "\0"
-   /* _mesa_function_pool[24459]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[24481]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[24484]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[24506]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[24505]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[24527]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[24539]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[24561]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[24566]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[24588]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[24589]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[24611]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[24615]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[24637]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[24679]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[24701]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[24705]: MultiModeDrawArraysIBM (will be remapped) */
-   "pppii\0"
-   "glMultiModeDrawArraysIBM\0"
-   "\0"
-   /* _mesa_function_pool[24737]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[24727]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[24781]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[24771]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[24812]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[24802]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[24849]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[24839]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[24870]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[24860]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[24892]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[24882]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[24913]: CallList (offset 2) */
+   /* _mesa_function_pool[24903]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[24927]: Materialfv (offset 170) */
+   /* _mesa_function_pool[24917]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[24945]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[24935]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[24962]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[24952]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[24994]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[24984]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[25039]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[25029]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[25087]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[25077]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[25132]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[25122]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[25150]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[25140]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[25203]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[25193]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[25234]: Color3iv (offset 16) */
+   /* _mesa_function_pool[25224]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[25248]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[25238]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[25282]: DrawElements (offset 311) */
+   /* _mesa_function_pool[25272]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[25303]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[25293]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[25329]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[25319]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[25366]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[25356]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[25426]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[25416]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[25469]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[25459]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[25524]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[25514]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[25547]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[25537]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[25620]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[25610]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[25643]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[25633]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[25674]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[25664]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[25711]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[25701]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[25728]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[25718]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[25744]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[25734]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[25764]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[25754]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[25778]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[25768]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[25797]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[25787]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[25817]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[25807]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[25866]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[25856]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[25912]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[25902]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[25931]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[25921]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[25957]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[25947]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[26000]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[25990]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[26025]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[26015]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[26070]: Map2d (offset 222) */
+   /* _mesa_function_pool[26060]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[26090]: Map2f (offset 223) */
+   /* _mesa_function_pool[26080]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[26110]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[26100]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[26135]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[26125]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[26152]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[26142]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[26181]: FragmentLightModelivSGIX (dynamic) */
+   /* _mesa_function_pool[26171]: FragmentLightModelivSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelivSGIX\0"
    "\0"
-   /* _mesa_function_pool[26212]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[26202]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[26235]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[26225]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[26252]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[26242]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[26269]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[26259]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[26286]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[26276]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[26304]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[26294]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[26330]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[26320]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[26386]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[26376]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[26405]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[26395]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[26422]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[26412]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[26453]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[26443]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[26493]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[26483]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[26519]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[26509]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[26550]: Materialf (offset 169) */
+   /* _mesa_function_pool[26540]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[26567]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[26557]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[26612]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[26602]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[26637]: Materiali (offset 171) */
+   /* _mesa_function_pool[26627]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[26654]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[26644]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[26680]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[26670]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[26715]: Indexsv (offset 51) */
+   /* _mesa_function_pool[26705]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[26728]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[26718]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[26773]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[26763]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[26792]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[26782]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[26809]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[26799]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[26842]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[26832]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[26860]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[26850]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[26897]: Translated (offset 303) */
+   /* _mesa_function_pool[26887]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[26915]: Translatef (offset 304) */
+   /* _mesa_function_pool[26905]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[26933]: StencilMask (offset 209) */
+   /* _mesa_function_pool[26923]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[26950]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[26940]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[26970]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[26960]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[26988]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[26978]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[27014]: IsList (offset 287) */
+   /* _mesa_function_pool[27004]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[27026]: IsSync (will be remapped) */
+   /* _mesa_function_pool[27016]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[27038]: RenderMode (offset 196) */
+   /* _mesa_function_pool[27028]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[27054]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[27044]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[27087]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[27077]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "\0"
-   /* _mesa_function_pool[27139]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[27129]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[27176]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[27166]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[27204]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[27194]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[27246]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[27236]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[27289]: LoadName (offset 198) */
+   /* _mesa_function_pool[27279]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[27303]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[27293]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[27330]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[27320]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[27348]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[27338]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[27382]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[27372]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[27433]: CullFace (offset 152) */
+   /* _mesa_function_pool[27423]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[27447]: BindTexture (offset 307) */
+   /* _mesa_function_pool[27437]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[27482]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[27472]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[27509]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[27499]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[27555]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[27545]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[27581]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[27571]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[27600]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[27590]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[27620]: Rectsv (offset 93) */
+   /* _mesa_function_pool[27610]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[27633]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[27623]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[27660]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[27650]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[27718]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[27708]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[27744]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[27734]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[27807]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[27797]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[27862]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[27852]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[27889]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[27879]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[27910]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[27900]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[27932]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[27922]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[27960]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[27950]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[27984]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[27974]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[28029]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[28019]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[28048]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[28038]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[28075]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[28065]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[28091]: Recti (offset 90) */
+   /* _mesa_function_pool[28081]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[28105]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[28095]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[28144]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[28134]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[28173]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[28163]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[28212]: PixelTransformParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[28202]: PixelTransformParameterfvEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[28248]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[28238]: PrimitiveRestartNV (will be remapped) */
+   "\0"
+   "glPrimitiveRestartNV\0"
+   "\0"
+   /* _mesa_function_pool[28261]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[28270]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[28283]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[28291]: Rectf (offset 88) */
+   /* _mesa_function_pool[28304]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[28305]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[28318]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[28328]: Indexfv (offset 47) */
+   /* _mesa_function_pool[28341]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[28341]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[28354]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[28387]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[28400]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[28439]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[28452]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[28474]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[28487]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[28494]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[28507]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[28521]: IndexMask (offset 212) */
+   /* _mesa_function_pool[28534]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[28536]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[28549]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[28573]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[28586]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[28616]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[28629]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[28632]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[28645]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[28658]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[28671]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[28677]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[28690]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[28699]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[28712]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[28718]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[28731]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[28735]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[28748]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[28762]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[28775]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[28776]: Fogfv (offset 154) */
+   /* _mesa_function_pool[28789]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[28788]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[28801]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[28822]: InitNames (offset 197) */
+   /* _mesa_function_pool[28835]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[28836]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[28849]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[28851]: Minmax (offset 368) */
+   /* _mesa_function_pool[28864]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[28877]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[28890]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[28896]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[28909]: DeformationMap3dSGIX (dynamic) */
+   "iddiiddiiddiip\0"
+   "glDeformationMap3dSGIX\0"
+   "\0"
+   /* _mesa_function_pool[28948]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[28915]: FogCoorddvEXT (will be remapped) */
+   /* _mesa_function_pool[28967]: FogCoorddvEXT (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[28947]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[28999]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[28969]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[29021]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[28999]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[29051]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[29019]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[29071]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[29037]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[29089]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[29074]: Hint (offset 158) */
+   /* _mesa_function_pool[29126]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[29085]: Color4dv (offset 28) */
+   /* _mesa_function_pool[29137]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[29099]: VertexAttrib2svARB (will be remapped) */
+   /* _mesa_function_pool[29151]: VertexAttrib2svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[29142]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[29194]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[29171]: WindowPos3svMESA (will be remapped) */
+   /* _mesa_function_pool[29223]: WindowPos3svMESA (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[29226]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[29278]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[29276]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[29328]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[29294]: DeleteRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[29346]: DeleteRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[29345]: VertexAttrib4NubvARB (will be remapped) */
+   /* _mesa_function_pool[29397]: VertexAttrib4NubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[29392]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[29444]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[29416]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[29468]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[29447]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[29499]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[29462]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[29514]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[29497]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[29549]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[29514]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[29566]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[29534]: Begin (offset 7) */
+   /* _mesa_function_pool[29586]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[29545]: LightModeli (offset 165) */
+   /* _mesa_function_pool[29597]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[29563]: Rectfv (offset 89) */
+   /* _mesa_function_pool[29615]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[29576]: LightModelf (offset 163) */
+   /* _mesa_function_pool[29628]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[29594]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[29646]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[29619]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[29671]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[29637]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[29689]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[29673]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[29725]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[29699]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[29751]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[29722]: GetCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[29774]: GetCombinerInputParameterivNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[29761]: Disable (offset 214) */
+   /* _mesa_function_pool[29813]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[29774]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[29826]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[29819]: GetRenderbufferParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[29871]: GetRenderbufferParameterivEXT (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[29885]: CombinerParameterivNV (will be remapped) */
+   /* _mesa_function_pool[29937]: CombinerParameterivNV (will be remapped) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[29913]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[29965]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[29940]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[29992]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[29974]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[30026]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[29993]: VertexAttrib2sARB (will be remapped) */
+   /* _mesa_function_pool[30045]: VertexAttrib2sARB (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[30035]: ColorMask (offset 210) */
+   /* _mesa_function_pool[30087]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[30053]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[30105]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[30078]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[30130]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[30097]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[30149]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[30127]: BindBufferARB (will be remapped) */
+   /* _mesa_function_pool[30179]: BindBufferARB (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[30160]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[30212]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[30182]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[30234]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[30200]: Enable (offset 215) */
+   /* _mesa_function_pool[30252]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[30212]: LineStipple (offset 167) */
+   /* _mesa_function_pool[30264]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[30230]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[30282]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[30256]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[30308]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[30286]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[30338]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[30313]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[30365]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[30367]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[30419]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[30410]: GenBuffersARB (will be remapped) */
+   /* _mesa_function_pool[30462]: GenBuffersARB (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[30443]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[30495]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[30469]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[30521]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[30484]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[30536]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[30515]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[30567]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[30536]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[30588]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[30566]: IsRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[30618]: IsRenderbufferEXT (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[30606]: GenProgramsNV (will be remapped) */
+   /* _mesa_function_pool[30658]: GenProgramsNV (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[30643]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[30695]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[30667]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[30719]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[30692]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[30744]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[30713]: WindowPos2fMESA (will be remapped) */
+   /* _mesa_function_pool[30765]: WindowPos2fMESA (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
@@ -4468,533 +4476,535 @@ static const char _mesa_function_pool[] =
 
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   {  1500, AttachShader_remap_index },
-   {  9034, CreateProgram_remap_index },
-   { 21160, CreateShader_remap_index },
-   { 23473, DeleteProgram_remap_index },
-   { 16944, DeleteShader_remap_index },
-   { 21606, DetachShader_remap_index },
-   { 16468, GetAttachedShaders_remap_index },
-   {  4314, GetProgramInfoLog_remap_index },
-   {   400, GetProgramiv_remap_index },
-   {  5760, GetShaderInfoLog_remap_index },
-   { 28658, GetShaderiv_remap_index },
-   { 12276, IsProgram_remap_index },
-   { 11275, IsShader_remap_index },
-   {  9138, StencilFuncSeparate_remap_index },
-   {  3526, StencilMaskSeparate_remap_index },
-   {  6842, StencilOpSeparate_remap_index },
-   { 20485, UniformMatrix2x3fv_remap_index },
-   {  2654, UniformMatrix2x4fv_remap_index },
-   { 30286, UniformMatrix3x2fv_remap_index },
-   { 28048, UniformMatrix3x4fv_remap_index },
-   { 14968, UniformMatrix4x2fv_remap_index },
-   {  2976, UniformMatrix4x3fv_remap_index },
-   { 14629, DrawArraysInstanced_remap_index },
-   { 15732, DrawElementsInstanced_remap_index },
-   {  9052, LoadTransposeMatrixdARB_remap_index },
-   { 28387, LoadTransposeMatrixfARB_remap_index },
-   {  4972, MultTransposeMatrixdARB_remap_index },
-   { 21793, MultTransposeMatrixfARB_remap_index },
-   {   211, SampleCoverageARB_remap_index },
-   {  5156, CompressedTexImage1DARB_remap_index },
-   { 22276, CompressedTexImage2DARB_remap_index },
-   {  3589, CompressedTexImage3DARB_remap_index },
-   { 16760, CompressedTexSubImage1DARB_remap_index },
-   {  1919, CompressedTexSubImage2DARB_remap_index },
-   { 18621, CompressedTexSubImage3DARB_remap_index },
-   { 26330, GetCompressedTexImageARB_remap_index },
-   {  3434, DisableVertexAttribArrayARB_remap_index },
-   { 27660, EnableVertexAttribArrayARB_remap_index },
-   { 29462, GetProgramEnvParameterdvARB_remap_index },
-   { 21673, GetProgramEnvParameterfvARB_remap_index },
-   { 25329, GetProgramLocalParameterdvARB_remap_index },
-   {  7284, GetProgramLocalParameterfvARB_remap_index },
-   { 16851, GetProgramStringARB_remap_index },
-   { 25524, GetProgramivARB_remap_index },
-   { 18816, GetVertexAttribdvARB_remap_index },
-   { 14857, GetVertexAttribfvARB_remap_index },
-   {  8947, GetVertexAttribivARB_remap_index },
-   { 17697, ProgramEnvParameter4dARB_remap_index },
-   { 23246, ProgramEnvParameter4dvARB_remap_index },
-   { 15465, ProgramEnvParameter4fARB_remap_index },
-   {  8147, ProgramEnvParameter4fvARB_remap_index },
-   {  3552, ProgramLocalParameter4dARB_remap_index },
-   { 11986, ProgramLocalParameter4dvARB_remap_index },
-   { 27139, ProgramLocalParameter4fARB_remap_index },
-   { 23826, ProgramLocalParameter4fvARB_remap_index },
-   { 26110, ProgramStringARB_remap_index },
-   { 17947, VertexAttrib1dARB_remap_index },
-   { 14433, VertexAttrib1dvARB_remap_index },
-   {  3727, VertexAttrib1fARB_remap_index },
-   { 30367, VertexAttrib1fvARB_remap_index },
-   {  6368, VertexAttrib1sARB_remap_index },
-   {  2093, VertexAttrib1svARB_remap_index },
-   { 13864, VertexAttrib2dARB_remap_index },
-   { 16087, VertexAttrib2dvARB_remap_index },
-   {  1519, VertexAttrib2fARB_remap_index },
-   { 16200, VertexAttrib2fvARB_remap_index },
-   { 29993, VertexAttrib2sARB_remap_index },
-   { 29099, VertexAttrib2svARB_remap_index },
-   { 10321, VertexAttrib3dARB_remap_index },
-   {  7850, VertexAttrib3dvARB_remap_index },
-   {  1606, VertexAttrib3fARB_remap_index },
-   { 20748, VertexAttrib3fvARB_remap_index },
-   { 25957, VertexAttrib3sARB_remap_index },
-   { 18558, VertexAttrib3svARB_remap_index },
-   {  4340, VertexAttrib4NbvARB_remap_index },
-   { 16423, VertexAttrib4NivARB_remap_index },
-   { 20703, VertexAttrib4NsvARB_remap_index },
-   { 21625, VertexAttrib4NubARB_remap_index },
-   { 29345, VertexAttrib4NubvARB_remap_index },
-   { 17358, VertexAttrib4NuivARB_remap_index },
-   {  2849, VertexAttrib4NusvARB_remap_index },
-   {  9915, VertexAttrib4bvARB_remap_index },
-   { 24737, VertexAttrib4dARB_remap_index },
-   { 19580, VertexAttrib4dvARB_remap_index },
-   { 10428, VertexAttrib4fARB_remap_index },
-   { 10832, VertexAttrib4fvARB_remap_index },
-   {  9331, VertexAttrib4ivARB_remap_index },
-   { 15901, VertexAttrib4sARB_remap_index },
-   { 28573, VertexAttrib4svARB_remap_index },
-   { 15270, VertexAttrib4ubvARB_remap_index },
-   { 27984, VertexAttrib4uivARB_remap_index },
-   { 18369, VertexAttrib4usvARB_remap_index },
-   { 20334, VertexAttribPointerARB_remap_index },
-   { 30127, BindBufferARB_remap_index },
-   {  6075, BufferDataARB_remap_index },
-   {  1421, BufferSubDataARB_remap_index },
-   { 28173, DeleteBuffersARB_remap_index },
-   { 30410, GenBuffersARB_remap_index },
-   { 16243, GetBufferParameterivARB_remap_index },
-   { 15417, GetBufferPointervARB_remap_index },
-   {  1374, GetBufferSubDataARB_remap_index },
-   { 27932, IsBufferARB_remap_index },
-   { 24310, MapBufferARB_remap_index },
-   { 28788, UnmapBufferARB_remap_index },
-   {   307, BeginQueryARB_remap_index },
-   { 18042, DeleteQueriesARB_remap_index },
-   { 11126, EndQueryARB_remap_index },
-   { 26809, GenQueriesARB_remap_index },
-   {  1811, GetQueryObjectivARB_remap_index },
-   { 15945, GetQueryObjectuivARB_remap_index },
-   {  1663, GetQueryivARB_remap_index },
-   { 18276, IsQueryARB_remap_index },
-   {  7460, AttachObjectARB_remap_index },
-   { 16906, CompileShaderARB_remap_index },
-   {  2918, CreateProgramObjectARB_remap_index },
-   {  6020, CreateShaderObjectARB_remap_index },
-   { 13281, DeleteObjectARB_remap_index },
-   { 22067, DetachObjectARB_remap_index },
-   { 10904, GetActiveUniformARB_remap_index },
-   {  8622, GetAttachedObjectsARB_remap_index },
-   {  8929, GetHandleARB_remap_index },
-   { 30160, GetInfoLogARB_remap_index },
-   { 29416, GetObjectParameterfvARB_remap_index },
-   { 25203, GetObjectParameterivARB_remap_index },
-   { 26567, GetShaderSourceARB_remap_index },
-   { 25817, GetUniformLocationARB_remap_index },
-   { 21895, GetUniformfvARB_remap_index },
-   { 11608, GetUniformivARB_remap_index },
-   { 18414, LinkProgramARB_remap_index },
-   { 18472, ShaderSourceARB_remap_index },
-   {  6742, Uniform1fARB_remap_index },
-   { 27348, Uniform1fvARB_remap_index },
-   { 20303, Uniform1iARB_remap_index },
-   { 19269, Uniform1ivARB_remap_index },
-   {  2042, Uniform2fARB_remap_index },
-   { 13117, Uniform2fvARB_remap_index },
-   { 24197, Uniform2iARB_remap_index },
-   {  2162, Uniform2ivARB_remap_index },
-   { 17016, Uniform3fARB_remap_index },
-   {  8652, Uniform3fvARB_remap_index },
-   {  5666, Uniform3iARB_remap_index },
-   { 15523, Uniform3ivARB_remap_index },
-   { 17503, Uniform4fARB_remap_index },
-   { 21759, Uniform4fvARB_remap_index },
-   { 22925, Uniform4iARB_remap_index },
-   { 18782, Uniform4ivARB_remap_index },
-   {  7512, UniformMatrix2fvARB_remap_index },
+   {  1461, AttachShader_remap_index },
+   {  8995, CreateProgram_remap_index },
+   { 21182, CreateShader_remap_index },
+   { 23495, DeleteProgram_remap_index },
+   { 16966, DeleteShader_remap_index },
+   { 21628, DetachShader_remap_index },
+   { 16490, GetAttachedShaders_remap_index },
+   {  4275, GetProgramInfoLog_remap_index },
+   {   361, GetProgramiv_remap_index },
+   {  5721, GetShaderInfoLog_remap_index },
+   { 28671, GetShaderiv_remap_index },
+   { 12198, IsProgram_remap_index },
+   { 11197, IsShader_remap_index },
+   {  9099, StencilFuncSeparate_remap_index },
+   {  3487, StencilMaskSeparate_remap_index },
+   {  6803, StencilOpSeparate_remap_index },
+   { 20507, UniformMatrix2x3fv_remap_index },
+   {  2615, UniformMatrix2x4fv_remap_index },
+   { 30338, UniformMatrix3x2fv_remap_index },
+   { 28038, UniformMatrix3x4fv_remap_index },
+   { 14961, UniformMatrix4x2fv_remap_index },
+   {  2937, UniformMatrix4x3fv_remap_index },
+   { 14622, DrawArraysInstanced_remap_index },
+   { 15754, DrawElementsInstanced_remap_index },
+   {  9013, LoadTransposeMatrixdARB_remap_index },
+   { 28400, LoadTransposeMatrixfARB_remap_index },
+   {  4904, MultTransposeMatrixdARB_remap_index },
+   { 21815, MultTransposeMatrixfARB_remap_index },
+   {   172, SampleCoverageARB_remap_index },
+   {  5117, CompressedTexImage1DARB_remap_index },
+   { 22298, CompressedTexImage2DARB_remap_index },
+   {  3550, CompressedTexImage3DARB_remap_index },
+   { 16782, CompressedTexSubImage1DARB_remap_index },
+   {  1880, CompressedTexSubImage2DARB_remap_index },
+   { 18643, CompressedTexSubImage3DARB_remap_index },
+   { 26320, GetCompressedTexImageARB_remap_index },
+   {  3395, DisableVertexAttribArrayARB_remap_index },
+   { 27650, EnableVertexAttribArrayARB_remap_index },
+   { 29514, GetProgramEnvParameterdvARB_remap_index },
+   { 21695, GetProgramEnvParameterfvARB_remap_index },
+   { 25319, GetProgramLocalParameterdvARB_remap_index },
+   {  7245, GetProgramLocalParameterfvARB_remap_index },
+   { 16873, GetProgramStringARB_remap_index },
+   { 25514, GetProgramivARB_remap_index },
+   { 18838, GetVertexAttribdvARB_remap_index },
+   { 14850, GetVertexAttribfvARB_remap_index },
+   {  8908, GetVertexAttribivARB_remap_index },
+   { 17719, ProgramEnvParameter4dARB_remap_index },
+   { 23268, ProgramEnvParameter4dvARB_remap_index },
+   { 15458, ProgramEnvParameter4fARB_remap_index },
+   {  8108, ProgramEnvParameter4fvARB_remap_index },
+   {  3513, ProgramLocalParameter4dARB_remap_index },
+   { 11908, ProgramLocalParameter4dvARB_remap_index },
+   { 27129, ProgramLocalParameter4fARB_remap_index },
+   { 23848, ProgramLocalParameter4fvARB_remap_index },
+   { 26100, ProgramStringARB_remap_index },
+   { 17969, VertexAttrib1dARB_remap_index },
+   { 14426, VertexAttrib1dvARB_remap_index },
+   {  3688, VertexAttrib1fARB_remap_index },
+   { 30419, VertexAttrib1fvARB_remap_index },
+   {  6329, VertexAttrib1sARB_remap_index },
+   {  2054, VertexAttrib1svARB_remap_index },
+   { 13857, VertexAttrib2dARB_remap_index },
+   { 16109, VertexAttrib2dvARB_remap_index },
+   {  1480, VertexAttrib2fARB_remap_index },
+   { 16222, VertexAttrib2fvARB_remap_index },
+   { 30045, VertexAttrib2sARB_remap_index },
+   { 29151, VertexAttrib2svARB_remap_index },
+   { 10282, VertexAttrib3dARB_remap_index },
+   {  7811, VertexAttrib3dvARB_remap_index },
+   {  1567, VertexAttrib3fARB_remap_index },
+   { 20770, VertexAttrib3fvARB_remap_index },
+   { 25947, VertexAttrib3sARB_remap_index },
+   { 18580, VertexAttrib3svARB_remap_index },
+   {  4301, VertexAttrib4NbvARB_remap_index },
+   { 16445, VertexAttrib4NivARB_remap_index },
+   { 20725, VertexAttrib4NsvARB_remap_index },
+   { 21647, VertexAttrib4NubARB_remap_index },
+   { 29397, VertexAttrib4NubvARB_remap_index },
+   { 17380, VertexAttrib4NuivARB_remap_index },
+   {  2810, VertexAttrib4NusvARB_remap_index },
+   {  9876, VertexAttrib4bvARB_remap_index },
+   { 24727, VertexAttrib4dARB_remap_index },
+   { 19602, VertexAttrib4dvARB_remap_index },
+   { 10389, VertexAttrib4fARB_remap_index },
+   { 10793, VertexAttrib4fvARB_remap_index },
+   {  9292, VertexAttrib4ivARB_remap_index },
+   { 15923, VertexAttrib4sARB_remap_index },
+   { 28586, VertexAttrib4svARB_remap_index },
+   { 15263, VertexAttrib4ubvARB_remap_index },
+   { 27974, VertexAttrib4uivARB_remap_index },
+   { 18391, VertexAttrib4usvARB_remap_index },
+   { 20356, VertexAttribPointerARB_remap_index },
+   { 30179, BindBufferARB_remap_index },
+   {  6036, BufferDataARB_remap_index },
+   {  1382, BufferSubDataARB_remap_index },
+   { 28163, DeleteBuffersARB_remap_index },
+   { 30462, GenBuffersARB_remap_index },
+   { 16265, GetBufferParameterivARB_remap_index },
+   { 15410, GetBufferPointervARB_remap_index },
+   {  1335, GetBufferSubDataARB_remap_index },
+   { 27922, IsBufferARB_remap_index },
+   { 24332, MapBufferARB_remap_index },
+   { 28801, UnmapBufferARB_remap_index },
+   {   268, BeginQueryARB_remap_index },
+   { 18064, DeleteQueriesARB_remap_index },
+   { 11087, EndQueryARB_remap_index },
+   { 26799, GenQueriesARB_remap_index },
+   {  1772, GetQueryObjectivARB_remap_index },
+   { 15967, GetQueryObjectuivARB_remap_index },
+   {  1624, GetQueryivARB_remap_index },
+   { 18298, IsQueryARB_remap_index },
+   {  7421, AttachObjectARB_remap_index },
+   { 16928, CompileShaderARB_remap_index },
+   {  2879, CreateProgramObjectARB_remap_index },
+   {  5981, CreateShaderObjectARB_remap_index },
+   { 13274, DeleteObjectARB_remap_index },
+   { 22089, DetachObjectARB_remap_index },
+   { 10865, GetActiveUniformARB_remap_index },
+   {  8583, GetAttachedObjectsARB_remap_index },
+   {  8890, GetHandleARB_remap_index },
+   { 30212, GetInfoLogARB_remap_index },
+   { 29468, GetObjectParameterfvARB_remap_index },
+   { 25193, GetObjectParameterivARB_remap_index },
+   { 26557, GetShaderSourceARB_remap_index },
+   { 25807, GetUniformLocationARB_remap_index },
+   { 21917, GetUniformfvARB_remap_index },
+   { 11530, GetUniformivARB_remap_index },
+   { 18436, LinkProgramARB_remap_index },
+   { 18494, ShaderSourceARB_remap_index },
+   {  6703, Uniform1fARB_remap_index },
+   { 27338, Uniform1fvARB_remap_index },
+   { 20325, Uniform1iARB_remap_index },
+   { 19291, Uniform1ivARB_remap_index },
+   {  2003, Uniform2fARB_remap_index },
+   { 13110, Uniform2fvARB_remap_index },
+   { 24219, Uniform2iARB_remap_index },
+   {  2123, Uniform2ivARB_remap_index },
+   { 17038, Uniform3fARB_remap_index },
+   {  8613, Uniform3fvARB_remap_index },
+   {  5627, Uniform3iARB_remap_index },
+   { 15516, Uniform3ivARB_remap_index },
+   { 17525, Uniform4fARB_remap_index },
+   { 21781, Uniform4fvARB_remap_index },
+   { 22947, Uniform4iARB_remap_index },
+   { 18804, Uniform4ivARB_remap_index },
+   {  7473, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
-   {  2514, UniformMatrix4fvARB_remap_index },
-   { 23358, UseProgramObjectARB_remap_index },
-   { 13552, ValidateProgramARB_remap_index },
-   { 19623, BindAttribLocationARB_remap_index },
-   {  4385, GetActiveAttribARB_remap_index },
-   { 15204, GetAttribLocationARB_remap_index },
-   { 27087, DrawBuffersARB_remap_index },
-   { 12091, RenderbufferStorageMultisample_remap_index },
-   { 12495, FramebufferTextureARB_remap_index },
-   { 23728, FramebufferTextureFaceARB_remap_index },
-   { 22216, ProgramParameteriARB_remap_index },
-   { 17551, FlushMappedBufferRange_remap_index },
-   { 25620, MapBufferRange_remap_index },
-   { 15079, BindVertexArray_remap_index },
-   { 13411, GenVertexArrays_remap_index },
-   { 27862, CopyBufferSubData_remap_index },
-   { 28677, ClientWaitSync_remap_index },
-   {  2433, DeleteSync_remap_index },
-   {  6409, FenceSync_remap_index },
-   { 13923, GetInteger64v_remap_index },
-   { 20810, GetSynciv_remap_index },
-   { 27026, IsSync_remap_index },
-   {  8570, WaitSync_remap_index },
-   {  3402, DrawElementsBaseVertex_remap_index },
-   { 28105, DrawRangeElementsBaseVertex_remap_index },
-   { 24341, MultiDrawElementsBaseVertex_remap_index },
-   {  4519, BindTransformFeedback_remap_index },
-   {  2945, DeleteTransformFeedbacks_remap_index },
-   {  5699, DrawTransformFeedback_remap_index },
-   {  8789, GenTransformFeedbacks_remap_index },
-   { 26000, IsTransformFeedback_remap_index },
-   { 23921, PauseTransformFeedback_remap_index },
-   {  4892, ResumeTransformFeedback_remap_index },
-   {  4807, PolygonOffsetEXT_remap_index },
-   { 21395, GetPixelTexGenParameterfvSGIS_remap_index },
-   {  3934, GetPixelTexGenParameterivSGIS_remap_index },
-   { 21128, PixelTexGenParameterfSGIS_remap_index },
-   {   619, PixelTexGenParameterfvSGIS_remap_index },
-   { 11646, PixelTexGenParameteriSGIS_remap_index },
-   { 12637, PixelTexGenParameterivSGIS_remap_index },
-   { 15167, SampleMaskSGIS_remap_index },
-   { 18216, SamplePatternSGIS_remap_index },
-   { 24270, ColorPointerEXT_remap_index },
-   { 16130, EdgeFlagPointerEXT_remap_index },
-   {  5320, IndexPointerEXT_remap_index },
-   {  5400, NormalPointerEXT_remap_index },
-   { 14517, TexCoordPointerEXT_remap_index },
-   {  6198, VertexPointerEXT_remap_index },
-   {  3204, PointParameterfEXT_remap_index },
-   {  7049, PointParameterfvEXT_remap_index },
-   { 29514, LockArraysEXT_remap_index },
-   { 13616, UnlockArraysEXT_remap_index },
-   {  1190, SecondaryColor3bEXT_remap_index },
-   {  7208, SecondaryColor3bvEXT_remap_index },
-   {  9508, SecondaryColor3dEXT_remap_index },
-   { 23531, SecondaryColor3dvEXT_remap_index },
-   { 25866, SecondaryColor3fEXT_remap_index },
-   { 16696, SecondaryColor3fvEXT_remap_index },
-   {   465, SecondaryColor3iEXT_remap_index },
-   { 14905, SecondaryColor3ivEXT_remap_index },
-   {  9166, SecondaryColor3sEXT_remap_index },
-   { 28341, SecondaryColor3svEXT_remap_index },
-   { 25039, SecondaryColor3ubEXT_remap_index },
-   { 19514, SecondaryColor3ubvEXT_remap_index },
-   { 11841, SecondaryColor3uiEXT_remap_index },
-   { 21015, SecondaryColor3uivEXT_remap_index },
-   { 23778, SecondaryColor3usEXT_remap_index },
-   { 11914, SecondaryColor3usvEXT_remap_index },
-   { 10775, SecondaryColorPointerEXT_remap_index },
-   { 23592, MultiDrawArraysEXT_remap_index },
-   { 19204, MultiDrawElementsEXT_remap_index },
-   { 19399, FogCoordPointerEXT_remap_index },
-   {  4083, FogCoorddEXT_remap_index },
-   { 28915, FogCoorddvEXT_remap_index },
-   {  4175, FogCoordfEXT_remap_index },
-   { 24962, FogCoordfvEXT_remap_index },
-   { 17455, PixelTexGenSGIX_remap_index },
-   { 25547, BlendFuncSeparateEXT_remap_index },
-   {  6110, FlushVertexArrayRangeNV_remap_index },
-   {  4756, VertexArrayRangeNV_remap_index },
-   { 25931, CombinerInputNV_remap_index },
-   {  1985, CombinerOutputNV_remap_index },
-   { 28494, CombinerParameterfNV_remap_index },
-   {  4676, CombinerParameterfvNV_remap_index },
-   { 20534, CombinerParameteriNV_remap_index },
-   { 29885, CombinerParameterivNV_remap_index },
-   {  6486, FinalCombinerInputNV_remap_index },
-   {  8995, GetCombinerInputParameterfvNV_remap_index },
-   { 29722, GetCombinerInputParameterivNV_remap_index },
-   {   172, GetCombinerOutputParameterfvNV_remap_index },
-   { 12598, GetCombinerOutputParameterivNV_remap_index },
-   {  5855, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 22797, GetFinalCombinerInputParameterivNV_remap_index },
-   { 11586, ResizeBuffersMESA_remap_index },
-   { 10148, WindowPos2dMESA_remap_index },
-   {   983, WindowPos2dvMESA_remap_index },
-   { 30713, WindowPos2fMESA_remap_index },
-   {  7153, WindowPos2fvMESA_remap_index },
-   { 16643, WindowPos2iMESA_remap_index },
-   { 18689, WindowPos2ivMESA_remap_index },
-   { 19303, WindowPos2sMESA_remap_index },
-   {  5070, WindowPos2svMESA_remap_index },
-   {  6978, WindowPos3dMESA_remap_index },
-   { 12845, WindowPos3dvMESA_remap_index },
-   {   511, WindowPos3fMESA_remap_index },
-   { 13677, WindowPos3fvMESA_remap_index },
-   { 22109, WindowPos3iMESA_remap_index },
-   { 27807, WindowPos3ivMESA_remap_index },
-   { 17161, WindowPos3sMESA_remap_index },
-   { 29171, WindowPos3svMESA_remap_index },
-   { 10099, WindowPos4dMESA_remap_index },
-   { 15608, WindowPos4dvMESA_remap_index },
-   { 12804, WindowPos4fMESA_remap_index },
-   { 28248, WindowPos4fvMESA_remap_index },
-   { 27960, WindowPos4iMESA_remap_index },
-   { 11389, WindowPos4ivMESA_remap_index },
-   { 17334, WindowPos4sMESA_remap_index },
-   {  2896, WindowPos4svMESA_remap_index },
-   { 24705, MultiModeDrawArraysIBM_remap_index },
-   { 26680, MultiModeDrawElementsIBM_remap_index },
-   { 11154, DeleteFencesNV_remap_index },
-   { 25778, FinishFenceNV_remap_index },
-   {  3326, GenFencesNV_remap_index },
-   { 15588, GetFenceivNV_remap_index },
-   {  7445, IsFenceNV_remap_index },
-   { 12525, SetFenceNV_remap_index },
-   {  3783, TestFenceNV_remap_index },
-   { 29142, AreProgramsResidentNV_remap_index },
-   { 28536, BindProgramNV_remap_index },
-   { 23861, DeleteProgramsNV_remap_index },
-   { 19732, ExecuteProgramNV_remap_index },
-   { 30606, GenProgramsNV_remap_index },
-   { 21474, GetProgramParameterdvNV_remap_index },
-   {  9570, GetProgramParameterfvNV_remap_index },
-   { 24244, GetProgramStringNV_remap_index },
-   { 22486, GetProgramivNV_remap_index },
-   { 21708, GetTrackMatrixivNV_remap_index },
-   { 24038, GetVertexAttribPointervNV_remap_index },
-   { 22730, GetVertexAttribdvNV_remap_index },
-   {  8465, GetVertexAttribfvNV_remap_index },
-   { 16824, GetVertexAttribivNV_remap_index },
-   { 17581, IsProgramNV_remap_index },
-   {  8548, LoadProgramNV_remap_index },
-   { 25643, ProgramParameters4dvNV_remap_index },
-   { 22416, ProgramParameters4fvNV_remap_index },
-   { 18993, RequestResidentProgramsNV_remap_index },
-   { 20512, TrackMatrixNV_remap_index },
-   { 29699, VertexAttrib1dNV_remap_index },
-   { 12436, VertexAttrib1dvNV_remap_index },
-   { 26212, VertexAttrib1fNV_remap_index },
-   {  2284, VertexAttrib1fvNV_remap_index },
-   { 28305, VertexAttrib1sNV_remap_index },
-   { 13750, VertexAttrib1svNV_remap_index },
-   {  4290, VertexAttrib2dNV_remap_index },
-   { 12351, VertexAttrib2dvNV_remap_index },
-   { 18448, VertexAttrib2fNV_remap_index },
-   { 11962, VertexAttrib2fvNV_remap_index },
-   {  5230, VertexAttrib2sNV_remap_index },
-   { 17215, VertexAttrib2svNV_remap_index },
-   { 10296, VertexAttrib3dNV_remap_index },
-   { 29392, VertexAttrib3dvNV_remap_index },
-   {  9382, VertexAttrib3fNV_remap_index },
-   { 22757, VertexAttrib3fvNV_remap_index },
-   { 20389, VertexAttrib3sNV_remap_index },
-   { 21735, VertexAttrib3svNV_remap_index },
-   { 26654, VertexAttrib4dNV_remap_index },
-   { 30643, VertexAttrib4dvNV_remap_index },
-   {  3984, VertexAttrib4fNV_remap_index },
-   {  8598, VertexAttrib4fvNV_remap_index },
-   { 24589, VertexAttrib4sNV_remap_index },
-   {  1332, VertexAttrib4svNV_remap_index },
-   {  4448, VertexAttrib4ubNV_remap_index },
-   {   773, VertexAttrib4ubvNV_remap_index },
-   { 19912, VertexAttribPointerNV_remap_index },
-   {  2136, VertexAttribs1dvNV_remap_index },
-   { 24126, VertexAttribs1fvNV_remap_index },
-   { 30443, VertexAttribs1svNV_remap_index },
-   {  9407, VertexAttribs2dvNV_remap_index },
-   { 23319, VertexAttribs2fvNV_remap_index },
-   { 16156, VertexAttribs2svNV_remap_index },
-   {  4704, VertexAttribs3dvNV_remap_index },
-   {  2016, VertexAttribs3fvNV_remap_index },
-   { 27555, VertexAttribs3svNV_remap_index },
-   { 24679, VertexAttribs4dvNV_remap_index },
-   {  4730, VertexAttribs4fvNV_remap_index },
-   { 30230, VertexAttribs4svNV_remap_index },
-   { 27303, VertexAttribs4ubvNV_remap_index },
-   { 24781, GetTexBumpParameterfvATI_remap_index },
-   { 30484, GetTexBumpParameterivATI_remap_index },
-   { 16878, TexBumpParameterfvATI_remap_index },
-   { 18864, TexBumpParameterivATI_remap_index },
-   { 14296, AlphaFragmentOp1ATI_remap_index },
-   {  9958, AlphaFragmentOp2ATI_remap_index },
-   { 22673, AlphaFragmentOp3ATI_remap_index },
-   { 27482, BeginFragmentShaderATI_remap_index },
-   { 28735, BindFragmentShaderATI_remap_index },
-   { 21864, ColorFragmentOp1ATI_remap_index },
-   {  3862, ColorFragmentOp2ATI_remap_index },
-   { 29037, ColorFragmentOp3ATI_remap_index },
-   {  4849, DeleteFragmentShaderATI_remap_index },
-   { 30667, EndFragmentShaderATI_remap_index },
-   { 29913, GenFragmentShadersATI_remap_index },
-   { 23450, PassTexCoordATI_remap_index },
-   {  6178, SampleMapATI_remap_index },
-   {  5951, SetFragmentShaderConstantATI_remap_index },
-   {   358, PointParameteriNV_remap_index },
-   { 13006, PointParameterivNV_remap_index },
-   { 26493, ActiveStencilFaceEXT_remap_index },
-   { 25303, BindVertexArrayAPPLE_remap_index },
-   {  2561, DeleteVertexArraysAPPLE_remap_index },
-   { 16495, GenVertexArraysAPPLE_remap_index },
-   { 21539, IsVertexArrayAPPLE_remap_index },
-   {   814, GetProgramNamedParameterdvNV_remap_index },
-   {  3167, GetProgramNamedParameterfvNV_remap_index },
-   { 24812, ProgramNamedParameter4dNV_remap_index },
-   { 13332, ProgramNamedParameter4dvNV_remap_index },
-   {  8081, ProgramNamedParameter4fNV_remap_index },
-   { 10740, ProgramNamedParameter4fvNV_remap_index },
-   { 22395, DepthBoundsEXT_remap_index },
-   {  1082, BlendEquationSeparateEXT_remap_index },
-   { 13451, BindFramebufferEXT_remap_index },
-   { 23637, BindRenderbufferEXT_remap_index },
-   {  8845, CheckFramebufferStatusEXT_remap_index },
-   { 20829, DeleteFramebuffersEXT_remap_index },
-   { 29294, DeleteRenderbuffersEXT_remap_index },
-   { 12375, FramebufferRenderbufferEXT_remap_index },
-   { 12542, FramebufferTexture1DEXT_remap_index },
-   { 10534, FramebufferTexture2DEXT_remap_index },
-   { 10201, FramebufferTexture3DEXT_remap_index },
-   { 21431, GenFramebuffersEXT_remap_index },
-   { 16042, GenRenderbuffersEXT_remap_index },
-   {  5897, GenerateMipmapEXT_remap_index },
-   { 20009, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 29819, GetRenderbufferParameterivEXT_remap_index },
-   { 18744, IsFramebufferEXT_remap_index },
-   { 30566, IsRenderbufferEXT_remap_index },
-   {  7392, RenderbufferStorageEXT_remap_index },
-   {   690, BlitFramebufferEXT_remap_index },
-   { 13151, BufferParameteriAPPLE_remap_index },
-   { 17613, FlushMappedBufferRangeAPPLE_remap_index },
-   {  2740, FramebufferTextureLayerEXT_remap_index },
-   {  4613, ColorMaskIndexedEXT_remap_index },
-   { 17239, DisableIndexedEXT_remap_index },
-   { 24436, EnableIndexedEXT_remap_index },
-   { 19980, GetBooleanIndexedvEXT_remap_index },
-   {  9991, GetIntegerIndexedvEXT_remap_index },
-   { 20905, IsEnabledIndexedEXT_remap_index },
-   {  4113, BeginConditionalRenderNV_remap_index },
-   { 23423, EndConditionalRenderNV_remap_index },
-   {  8492, BeginTransformFeedbackEXT_remap_index },
-   { 17263, BindBufferBaseEXT_remap_index },
-   { 17133, BindBufferOffsetEXT_remap_index },
-   { 11214, BindBufferRangeEXT_remap_index },
-   { 13066, EndTransformFeedbackEXT_remap_index },
-   {  9843, GetTransformFeedbackVaryingEXT_remap_index },
-   { 19049, TransformFeedbackVaryingsEXT_remap_index },
-   { 27204, ProvokingVertexEXT_remap_index },
-   {  9791, GetTexParameterPointervAPPLE_remap_index },
-   {  4475, TextureRangeAPPLE_remap_index },
-   { 10606, GetObjectParameterivAPPLE_remap_index },
-   { 18188, ObjectPurgeableAPPLE_remap_index },
-   {  5024, ObjectUnpurgeableAPPLE_remap_index },
-   { 26519, StencilFuncSeparateATI_remap_index },
-   { 16562, ProgramEnvParameters4fvEXT_remap_index },
-   { 19943, ProgramLocalParameters4fvEXT_remap_index },
-   { 12934, GetQueryObjecti64vEXT_remap_index },
-   {  9433, GetQueryObjectui64vEXT_remap_index },
-   { 21933, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 11093, EGLImageTargetTexture2DOES_remap_index },
+   {  2475, UniformMatrix4fvARB_remap_index },
+   { 23380, UseProgramObjectARB_remap_index },
+   { 13545, ValidateProgramARB_remap_index },
+   { 19645, BindAttribLocationARB_remap_index },
+   {  4346, GetActiveAttribARB_remap_index },
+   { 15197, GetAttribLocationARB_remap_index },
+   { 27077, DrawBuffersARB_remap_index },
+   { 12013, RenderbufferStorageMultisample_remap_index },
+   { 12417, FramebufferTextureARB_remap_index },
+   { 23750, FramebufferTextureFaceARB_remap_index },
+   { 22238, ProgramParameteriARB_remap_index },
+   { 17573, FlushMappedBufferRange_remap_index },
+   { 25610, MapBufferRange_remap_index },
+   { 15072, BindVertexArray_remap_index },
+   { 13404, GenVertexArrays_remap_index },
+   { 27852, CopyBufferSubData_remap_index },
+   { 28690, ClientWaitSync_remap_index },
+   {  2394, DeleteSync_remap_index },
+   {  6370, FenceSync_remap_index },
+   { 13916, GetInteger64v_remap_index },
+   { 20832, GetSynciv_remap_index },
+   { 27016, IsSync_remap_index },
+   {  8531, WaitSync_remap_index },
+   {  3363, DrawElementsBaseVertex_remap_index },
+   { 28095, DrawRangeElementsBaseVertex_remap_index },
+   { 24363, MultiDrawElementsBaseVertex_remap_index },
+   {  4480, BindTransformFeedback_remap_index },
+   {  2906, DeleteTransformFeedbacks_remap_index },
+   {  5660, DrawTransformFeedback_remap_index },
+   {  8750, GenTransformFeedbacks_remap_index },
+   { 25990, IsTransformFeedback_remap_index },
+   { 23943, PauseTransformFeedback_remap_index },
+   {  4824, ResumeTransformFeedback_remap_index },
+   {  4739, PolygonOffsetEXT_remap_index },
+   { 21417, GetPixelTexGenParameterfvSGIS_remap_index },
+   {  3895, GetPixelTexGenParameterivSGIS_remap_index },
+   { 21150, PixelTexGenParameterfSGIS_remap_index },
+   {   580, PixelTexGenParameterfvSGIS_remap_index },
+   { 11568, PixelTexGenParameteriSGIS_remap_index },
+   { 12591, PixelTexGenParameterivSGIS_remap_index },
+   { 15160, SampleMaskSGIS_remap_index },
+   { 18238, SamplePatternSGIS_remap_index },
+   { 24292, ColorPointerEXT_remap_index },
+   { 16152, EdgeFlagPointerEXT_remap_index },
+   {  5281, IndexPointerEXT_remap_index },
+   {  5361, NormalPointerEXT_remap_index },
+   { 14510, TexCoordPointerEXT_remap_index },
+   {  6159, VertexPointerEXT_remap_index },
+   {  3165, PointParameterfEXT_remap_index },
+   {  7010, PointParameterfvEXT_remap_index },
+   { 29566, LockArraysEXT_remap_index },
+   { 13609, UnlockArraysEXT_remap_index },
+   {  1151, SecondaryColor3bEXT_remap_index },
+   {  7169, SecondaryColor3bvEXT_remap_index },
+   {  9469, SecondaryColor3dEXT_remap_index },
+   { 23553, SecondaryColor3dvEXT_remap_index },
+   { 25856, SecondaryColor3fEXT_remap_index },
+   { 16718, SecondaryColor3fvEXT_remap_index },
+   {   426, SecondaryColor3iEXT_remap_index },
+   { 14898, SecondaryColor3ivEXT_remap_index },
+   {  9127, SecondaryColor3sEXT_remap_index },
+   { 28354, SecondaryColor3svEXT_remap_index },
+   { 25029, SecondaryColor3ubEXT_remap_index },
+   { 19536, SecondaryColor3ubvEXT_remap_index },
+   { 11763, SecondaryColor3uiEXT_remap_index },
+   { 21037, SecondaryColor3uivEXT_remap_index },
+   { 23800, SecondaryColor3usEXT_remap_index },
+   { 11836, SecondaryColor3usvEXT_remap_index },
+   { 10736, SecondaryColorPointerEXT_remap_index },
+   { 23614, MultiDrawArraysEXT_remap_index },
+   { 19226, MultiDrawElementsEXT_remap_index },
+   { 19421, FogCoordPointerEXT_remap_index },
+   {  4044, FogCoorddEXT_remap_index },
+   { 28967, FogCoorddvEXT_remap_index },
+   {  4136, FogCoordfEXT_remap_index },
+   { 24952, FogCoordfvEXT_remap_index },
+   { 17477, PixelTexGenSGIX_remap_index },
+   { 25537, BlendFuncSeparateEXT_remap_index },
+   {  6071, FlushVertexArrayRangeNV_remap_index },
+   {  4688, VertexArrayRangeNV_remap_index },
+   { 25921, CombinerInputNV_remap_index },
+   {  1946, CombinerOutputNV_remap_index },
+   { 28507, CombinerParameterfNV_remap_index },
+   {  4608, CombinerParameterfvNV_remap_index },
+   { 20556, CombinerParameteriNV_remap_index },
+   { 29937, CombinerParameterivNV_remap_index },
+   {  6447, FinalCombinerInputNV_remap_index },
+   {  8956, GetCombinerInputParameterfvNV_remap_index },
+   { 29774, GetCombinerInputParameterivNV_remap_index },
+   { 12692, GetCombinerOutputParameterfvNV_remap_index },
+   { 12520, GetCombinerOutputParameterivNV_remap_index },
+   {  5816, GetFinalCombinerInputParameterfvNV_remap_index },
+   { 22819, GetFinalCombinerInputParameterivNV_remap_index },
+   { 11508, ResizeBuffersMESA_remap_index },
+   { 10109, WindowPos2dMESA_remap_index },
+   {   944, WindowPos2dvMESA_remap_index },
+   { 30765, WindowPos2fMESA_remap_index },
+   {  7114, WindowPos2fvMESA_remap_index },
+   { 16665, WindowPos2iMESA_remap_index },
+   { 18711, WindowPos2ivMESA_remap_index },
+   { 19325, WindowPos2sMESA_remap_index },
+   {  5031, WindowPos2svMESA_remap_index },
+   {  6939, WindowPos3dMESA_remap_index },
+   { 12838, WindowPos3dvMESA_remap_index },
+   {   472, WindowPos3fMESA_remap_index },
+   { 13670, WindowPos3fvMESA_remap_index },
+   { 22131, WindowPos3iMESA_remap_index },
+   { 27797, WindowPos3ivMESA_remap_index },
+   { 17183, WindowPos3sMESA_remap_index },
+   { 29223, WindowPos3svMESA_remap_index },
+   { 10060, WindowPos4dMESA_remap_index },
+   { 15630, WindowPos4dvMESA_remap_index },
+   { 12797, WindowPos4fMESA_remap_index },
+   { 28261, WindowPos4fvMESA_remap_index },
+   { 27950, WindowPos4iMESA_remap_index },
+   { 11311, WindowPos4ivMESA_remap_index },
+   { 17356, WindowPos4sMESA_remap_index },
+   {  2857, WindowPos4svMESA_remap_index },
+   { 12559, MultiModeDrawArraysIBM_remap_index },
+   { 26670, MultiModeDrawElementsIBM_remap_index },
+   { 11115, DeleteFencesNV_remap_index },
+   { 25768, FinishFenceNV_remap_index },
+   {  3287, GenFencesNV_remap_index },
+   { 15610, GetFenceivNV_remap_index },
+   {  7406, IsFenceNV_remap_index },
+   { 12447, SetFenceNV_remap_index },
+   {  3744, TestFenceNV_remap_index },
+   { 29194, AreProgramsResidentNV_remap_index },
+   { 28549, BindProgramNV_remap_index },
+   { 23883, DeleteProgramsNV_remap_index },
+   { 19754, ExecuteProgramNV_remap_index },
+   { 30658, GenProgramsNV_remap_index },
+   { 21496, GetProgramParameterdvNV_remap_index },
+   {  9531, GetProgramParameterfvNV_remap_index },
+   { 24266, GetProgramStringNV_remap_index },
+   { 22508, GetProgramivNV_remap_index },
+   { 21730, GetTrackMatrixivNV_remap_index },
+   { 24060, GetVertexAttribPointervNV_remap_index },
+   { 22752, GetVertexAttribdvNV_remap_index },
+   {  8426, GetVertexAttribfvNV_remap_index },
+   { 16846, GetVertexAttribivNV_remap_index },
+   { 17603, IsProgramNV_remap_index },
+   {  8509, LoadProgramNV_remap_index },
+   { 25633, ProgramParameters4dvNV_remap_index },
+   { 22438, ProgramParameters4fvNV_remap_index },
+   { 19015, RequestResidentProgramsNV_remap_index },
+   { 20534, TrackMatrixNV_remap_index },
+   { 29751, VertexAttrib1dNV_remap_index },
+   { 12358, VertexAttrib1dvNV_remap_index },
+   { 26202, VertexAttrib1fNV_remap_index },
+   {  2245, VertexAttrib1fvNV_remap_index },
+   { 28318, VertexAttrib1sNV_remap_index },
+   { 13743, VertexAttrib1svNV_remap_index },
+   {  4251, VertexAttrib2dNV_remap_index },
+   { 12273, VertexAttrib2dvNV_remap_index },
+   { 18470, VertexAttrib2fNV_remap_index },
+   { 11884, VertexAttrib2fvNV_remap_index },
+   {  5191, VertexAttrib2sNV_remap_index },
+   { 17237, VertexAttrib2svNV_remap_index },
+   { 10257, VertexAttrib3dNV_remap_index },
+   { 29444, VertexAttrib3dvNV_remap_index },
+   {  9343, VertexAttrib3fNV_remap_index },
+   { 22779, VertexAttrib3fvNV_remap_index },
+   { 20411, VertexAttrib3sNV_remap_index },
+   { 21757, VertexAttrib3svNV_remap_index },
+   { 26644, VertexAttrib4dNV_remap_index },
+   { 30695, VertexAttrib4dvNV_remap_index },
+   {  3945, VertexAttrib4fNV_remap_index },
+   {  8559, VertexAttrib4fvNV_remap_index },
+   { 24611, VertexAttrib4sNV_remap_index },
+   {  1293, VertexAttrib4svNV_remap_index },
+   {  4409, VertexAttrib4ubNV_remap_index },
+   {   734, VertexAttrib4ubvNV_remap_index },
+   { 19934, VertexAttribPointerNV_remap_index },
+   {  2097, VertexAttribs1dvNV_remap_index },
+   { 24148, VertexAttribs1fvNV_remap_index },
+   { 30495, VertexAttribs1svNV_remap_index },
+   {  9368, VertexAttribs2dvNV_remap_index },
+   { 23341, VertexAttribs2fvNV_remap_index },
+   { 16178, VertexAttribs2svNV_remap_index },
+   {  4636, VertexAttribs3dvNV_remap_index },
+   {  1977, VertexAttribs3fvNV_remap_index },
+   { 27545, VertexAttribs3svNV_remap_index },
+   { 24701, VertexAttribs4dvNV_remap_index },
+   {  4662, VertexAttribs4fvNV_remap_index },
+   { 30282, VertexAttribs4svNV_remap_index },
+   { 27293, VertexAttribs4ubvNV_remap_index },
+   { 24771, GetTexBumpParameterfvATI_remap_index },
+   { 30536, GetTexBumpParameterivATI_remap_index },
+   { 16900, TexBumpParameterfvATI_remap_index },
+   { 18886, TexBumpParameterivATI_remap_index },
+   { 14289, AlphaFragmentOp1ATI_remap_index },
+   {  9919, AlphaFragmentOp2ATI_remap_index },
+   { 22695, AlphaFragmentOp3ATI_remap_index },
+   { 27472, BeginFragmentShaderATI_remap_index },
+   { 28748, BindFragmentShaderATI_remap_index },
+   { 21886, ColorFragmentOp1ATI_remap_index },
+   {  3823, ColorFragmentOp2ATI_remap_index },
+   { 29089, ColorFragmentOp3ATI_remap_index },
+   {  4781, DeleteFragmentShaderATI_remap_index },
+   { 30719, EndFragmentShaderATI_remap_index },
+   { 29965, GenFragmentShadersATI_remap_index },
+   { 23472, PassTexCoordATI_remap_index },
+   {  6139, SampleMapATI_remap_index },
+   {  5912, SetFragmentShaderConstantATI_remap_index },
+   {   319, PointParameteriNV_remap_index },
+   { 12999, PointParameterivNV_remap_index },
+   { 26483, ActiveStencilFaceEXT_remap_index },
+   { 25293, BindVertexArrayAPPLE_remap_index },
+   {  2522, DeleteVertexArraysAPPLE_remap_index },
+   { 16517, GenVertexArraysAPPLE_remap_index },
+   { 21561, IsVertexArrayAPPLE_remap_index },
+   {   775, GetProgramNamedParameterdvNV_remap_index },
+   {  3128, GetProgramNamedParameterfvNV_remap_index },
+   { 24802, ProgramNamedParameter4dNV_remap_index },
+   { 13325, ProgramNamedParameter4dvNV_remap_index },
+   {  8042, ProgramNamedParameter4fNV_remap_index },
+   { 10701, ProgramNamedParameter4fvNV_remap_index },
+   { 15565, PrimitiveRestartIndexNV_remap_index },
+   { 28238, PrimitiveRestartNV_remap_index },
+   { 22417, DepthBoundsEXT_remap_index },
+   {  1043, BlendEquationSeparateEXT_remap_index },
+   { 13444, BindFramebufferEXT_remap_index },
+   { 23659, BindRenderbufferEXT_remap_index },
+   {  8806, CheckFramebufferStatusEXT_remap_index },
+   { 20851, DeleteFramebuffersEXT_remap_index },
+   { 29346, DeleteRenderbuffersEXT_remap_index },
+   { 12297, FramebufferRenderbufferEXT_remap_index },
+   { 12464, FramebufferTexture1DEXT_remap_index },
+   { 10495, FramebufferTexture2DEXT_remap_index },
+   { 10162, FramebufferTexture3DEXT_remap_index },
+   { 21453, GenFramebuffersEXT_remap_index },
+   { 16064, GenRenderbuffersEXT_remap_index },
+   {  5858, GenerateMipmapEXT_remap_index },
+   { 20031, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 29871, GetRenderbufferParameterivEXT_remap_index },
+   { 18766, IsFramebufferEXT_remap_index },
+   { 30618, IsRenderbufferEXT_remap_index },
+   {  7353, RenderbufferStorageEXT_remap_index },
+   {   651, BlitFramebufferEXT_remap_index },
+   { 13144, BufferParameteriAPPLE_remap_index },
+   { 17635, FlushMappedBufferRangeAPPLE_remap_index },
+   {  2701, FramebufferTextureLayerEXT_remap_index },
+   {  4956, ColorMaskIndexedEXT_remap_index },
+   { 17261, DisableIndexedEXT_remap_index },
+   { 24458, EnableIndexedEXT_remap_index },
+   { 20002, GetBooleanIndexedvEXT_remap_index },
+   {  9952, GetIntegerIndexedvEXT_remap_index },
+   { 20927, IsEnabledIndexedEXT_remap_index },
+   {  4074, BeginConditionalRenderNV_remap_index },
+   { 23445, EndConditionalRenderNV_remap_index },
+   {  8453, BeginTransformFeedbackEXT_remap_index },
+   { 17285, BindBufferBaseEXT_remap_index },
+   { 17155, BindBufferOffsetEXT_remap_index },
+   { 11136, BindBufferRangeEXT_remap_index },
+   { 13059, EndTransformFeedbackEXT_remap_index },
+   {  9804, GetTransformFeedbackVaryingEXT_remap_index },
+   { 19071, TransformFeedbackVaryingsEXT_remap_index },
+   { 27194, ProvokingVertexEXT_remap_index },
+   {  9752, GetTexParameterPointervAPPLE_remap_index },
+   {  4436, TextureRangeAPPLE_remap_index },
+   { 10567, GetObjectParameterivAPPLE_remap_index },
+   { 18210, ObjectPurgeableAPPLE_remap_index },
+   {  4985, ObjectUnpurgeableAPPLE_remap_index },
+   { 26509, StencilFuncSeparateATI_remap_index },
+   { 16584, ProgramEnvParameters4fvEXT_remap_index },
+   { 19965, ProgramLocalParameters4fvEXT_remap_index },
+   { 12927, GetQueryObjecti64vEXT_remap_index },
+   {  9394, GetQueryObjectui64vEXT_remap_index },
+   { 21955, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 11054, EGLImageTargetTexture2DOES_remap_index },
    {    -1, -1 }
 };
 
 /* these functions are in the ABI, but have alternative names */
 static const struct gl_function_remap MESA_alt_functions[] = {
    /* from GL_EXT_blend_color */
-   {  2479, _gloffset_BlendColor },
+   {  2440, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 10258, _gloffset_BlendEquation },
+   { 10219, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 15630, _gloffset_ColorSubTable },
-   { 29226, _gloffset_CopyColorSubTable },
+   { 15652, _gloffset_ColorSubTable },
+   { 29278, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
-   {   252, _gloffset_ConvolutionFilter1D },
-   {  2323, _gloffset_CopyConvolutionFilter1D },
-   {  3663, _gloffset_GetConvolutionParameteriv },
-   {  7741, _gloffset_ConvolutionFilter2D },
-   {  7907, _gloffset_ConvolutionParameteriv },
-   {  8367, _gloffset_ConvolutionParameterfv },
-   { 18892, _gloffset_GetSeparableFilter },
-   { 22163, _gloffset_SeparableFilter2D },
-   { 22975, _gloffset_ConvolutionParameteri },
-   { 23098, _gloffset_ConvolutionParameterf },
-   { 24615, _gloffset_GetConvolutionParameterfv },
-   { 25469, _gloffset_GetConvolutionFilter },
-   { 27744, _gloffset_CopyConvolutionFilter2D },
+   {   213, _gloffset_ConvolutionFilter1D },
+   {  2284, _gloffset_CopyConvolutionFilter1D },
+   {  3624, _gloffset_GetConvolutionParameteriv },
+   {  7702, _gloffset_ConvolutionFilter2D },
+   {  7868, _gloffset_ConvolutionParameteriv },
+   {  8328, _gloffset_ConvolutionParameterfv },
+   { 18914, _gloffset_GetSeparableFilter },
+   { 22185, _gloffset_SeparableFilter2D },
+   { 22997, _gloffset_ConvolutionParameteri },
+   { 23120, _gloffset_ConvolutionParameterf },
+   { 24637, _gloffset_GetConvolutionParameterfv },
+   { 25459, _gloffset_GetConvolutionFilter },
+   { 27734, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 13810, _gloffset_CopyTexSubImage3D },
-   { 15370, _gloffset_CopyTexImage2D },
-   { 22583, _gloffset_CopyTexImage1D },
-   { 25150, _gloffset_CopyTexSubImage2D },
-   { 27382, _gloffset_CopyTexSubImage1D },
+   { 13803, _gloffset_CopyTexSubImage3D },
+   { 15363, _gloffset_CopyTexImage2D },
+   { 22605, _gloffset_CopyTexImage1D },
+   { 25140, _gloffset_CopyTexSubImage2D },
+   { 27372, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
-   {  8704, _gloffset_DrawRangeElements },
+   {  8665, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
-   {   851, _gloffset_Histogram },
-   {  3127, _gloffset_ResetHistogram },
-   {  9104, _gloffset_GetMinmax },
-   { 14144, _gloffset_GetHistogramParameterfv },
-   { 22508, _gloffset_GetMinmaxParameteriv },
-   { 24505, _gloffset_ResetMinmax },
-   { 25366, _gloffset_GetHistogramParameteriv },
-   { 26453, _gloffset_GetHistogram },
-   { 28851, _gloffset_Minmax },
-   { 30313, _gloffset_GetMinmaxParameterfv },
+   {   812, _gloffset_Histogram },
+   {  3088, _gloffset_ResetHistogram },
+   {  9065, _gloffset_GetMinmax },
+   { 14137, _gloffset_GetHistogramParameterfv },
+   { 22530, _gloffset_GetMinmaxParameteriv },
+   { 24527, _gloffset_ResetMinmax },
+   { 25356, _gloffset_GetHistogramParameteriv },
+   { 26443, _gloffset_GetHistogram },
+   { 28864, _gloffset_Minmax },
+   { 30365, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
-   {  7603, _gloffset_ColorTable },
-   { 13990, _gloffset_GetColorTable },
-   { 21178, _gloffset_GetColorTableParameterfv },
-   { 23154, _gloffset_GetColorTableParameteriv },
+   {  7564, _gloffset_ColorTable },
+   { 13983, _gloffset_GetColorTable },
+   { 21200, _gloffset_GetColorTableParameterfv },
+   { 23176, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
-   {  6324, _gloffset_TexSubImage1D },
-   {  9718, _gloffset_TexSubImage2D },
+   {  6285, _gloffset_TexSubImage1D },
+   {  9679, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
-   {  1697, _gloffset_TexImage3D },
-   { 20947, _gloffset_TexSubImage3D },
+   {  1658, _gloffset_TexImage3D },
+   { 20969, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
-   {  3003, _gloffset_PrioritizeTextures },
-   {  6773, _gloffset_AreTexturesResident },
-   { 12460, _gloffset_GenTextures },
-   { 14476, _gloffset_DeleteTextures },
-   { 17894, _gloffset_IsTexture },
-   { 27447, _gloffset_BindTexture },
+   {  2964, _gloffset_PrioritizeTextures },
+   {  6734, _gloffset_AreTexturesResident },
+   { 12382, _gloffset_GenTextures },
+   { 14469, _gloffset_DeleteTextures },
+   { 17916, _gloffset_IsTexture },
+   { 27437, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 22335, _gloffset_ArrayElement },
-   { 28439, _gloffset_GetPointerv },
-   { 29940, _gloffset_DrawArrays },
+   { 22357, _gloffset_ArrayElement },
+   { 28452, _gloffset_GetPointerv },
+   { 29992, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
-   {  6891, _gloffset_ColorTableParameteriv },
-   {  7603, _gloffset_ColorTable },
-   { 13990, _gloffset_GetColorTable },
-   { 14100, _gloffset_CopyColorTable },
-   { 17755, _gloffset_ColorTableParameterfv },
-   { 21178, _gloffset_GetColorTableParameterfv },
-   { 23154, _gloffset_GetColorTableParameteriv },
+   {  6852, _gloffset_ColorTableParameteriv },
+   {  7564, _gloffset_ColorTable },
+   { 13983, _gloffset_GetColorTable },
+   { 14093, _gloffset_CopyColorTable },
+   { 17777, _gloffset_ColorTableParameterfv },
+   { 21200, _gloffset_GetColorTableParameterfv },
+   { 23176, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
-   {   420, _gloffset_MultiTexCoord3sARB },
-   {   652, _gloffset_ActiveTextureARB },
-   {  3800, _gloffset_MultiTexCoord1fvARB },
-   {  5425, _gloffset_MultiTexCoord3dARB },
-   {  5470, _gloffset_MultiTexCoord2iARB },
-   {  5594, _gloffset_MultiTexCoord2svARB },
-   {  7559, _gloffset_MultiTexCoord2fARB },
-   {  9463, _gloffset_MultiTexCoord3fvARB },
-   { 10020, _gloffset_MultiTexCoord4sARB },
-   { 10654, _gloffset_MultiTexCoord2dvARB },
-   { 11036, _gloffset_MultiTexCoord1svARB },
-   { 11447, _gloffset_MultiTexCoord3svARB },
-   { 11508, _gloffset_MultiTexCoord4iARB },
-   { 12231, _gloffset_MultiTexCoord3iARB },
-   { 12963, _gloffset_MultiTexCoord1dARB },
-   { 13180, _gloffset_MultiTexCoord3dvARB },
-   { 14344, _gloffset_MultiTexCoord3ivARB },
-   { 14389, _gloffset_MultiTexCoord2sARB },
-   { 15687, _gloffset_MultiTexCoord4ivARB },
-   { 17405, _gloffset_ClientActiveTextureARB },
-   { 19688, _gloffset_MultiTexCoord2dARB },
-   { 20129, _gloffset_MultiTexCoord4dvARB },
-   { 20440, _gloffset_MultiTexCoord4fvARB },
-   { 21319, _gloffset_MultiTexCoord3fARB },
-   { 23682, _gloffset_MultiTexCoord4dARB },
-   { 23948, _gloffset_MultiTexCoord1sARB },
-   { 24152, _gloffset_MultiTexCoord1dvARB },
-   { 24994, _gloffset_MultiTexCoord1ivARB },
-   { 25087, _gloffset_MultiTexCoord2ivARB },
-   { 25426, _gloffset_MultiTexCoord1iARB },
-   { 26728, _gloffset_MultiTexCoord4svARB },
-   { 27246, _gloffset_MultiTexCoord1fARB },
-   { 27509, _gloffset_MultiTexCoord4fARB },
-   { 29774, _gloffset_MultiTexCoord2fvARB },
+   {   381, _gloffset_MultiTexCoord3sARB },
+   {   613, _gloffset_ActiveTextureARB },
+   {  3761, _gloffset_MultiTexCoord1fvARB },
+   {  5386, _gloffset_MultiTexCoord3dARB },
+   {  5431, _gloffset_MultiTexCoord2iARB },
+   {  5555, _gloffset_MultiTexCoord2svARB },
+   {  7520, _gloffset_MultiTexCoord2fARB },
+   {  9424, _gloffset_MultiTexCoord3fvARB },
+   {  9981, _gloffset_MultiTexCoord4sARB },
+   { 10615, _gloffset_MultiTexCoord2dvARB },
+   { 10997, _gloffset_MultiTexCoord1svARB },
+   { 11369, _gloffset_MultiTexCoord3svARB },
+   { 11430, _gloffset_MultiTexCoord4iARB },
+   { 12153, _gloffset_MultiTexCoord3iARB },
+   { 12956, _gloffset_MultiTexCoord1dARB },
+   { 13173, _gloffset_MultiTexCoord3dvARB },
+   { 14337, _gloffset_MultiTexCoord3ivARB },
+   { 14382, _gloffset_MultiTexCoord2sARB },
+   { 15709, _gloffset_MultiTexCoord4ivARB },
+   { 17427, _gloffset_ClientActiveTextureARB },
+   { 19710, _gloffset_MultiTexCoord2dARB },
+   { 20151, _gloffset_MultiTexCoord4dvARB },
+   { 20462, _gloffset_MultiTexCoord4fvARB },
+   { 21341, _gloffset_MultiTexCoord3fARB },
+   { 23704, _gloffset_MultiTexCoord4dARB },
+   { 23970, _gloffset_MultiTexCoord1sARB },
+   { 24174, _gloffset_MultiTexCoord1dvARB },
+   { 24984, _gloffset_MultiTexCoord1ivARB },
+   { 25077, _gloffset_MultiTexCoord2ivARB },
+   { 25416, _gloffset_MultiTexCoord1iARB },
+   { 26718, _gloffset_MultiTexCoord4svARB },
+   { 27236, _gloffset_MultiTexCoord1fARB },
+   { 27499, _gloffset_MultiTexCoord4fARB },
+   { 29826, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 
@@ -5002,7 +5012,7 @@ static const struct gl_function_remap MESA_alt_functions[] = {
 
 #if defined(need_GL_3DFX_tbuffer)
 static const struct gl_function_remap GL_3DFX_tbuffer_functions[] = {
-   {  8425, -1 }, /* TbufferMask3DFX */
+   {  8386, -1 }, /* TbufferMask3DFX */
    {    -1, -1 }
 };
 #endif
@@ -5073,7 +5083,7 @@ static const struct gl_function_remap GL_ARB_framebuffer_object_functions[] = {
 #if defined(need_GL_ARB_geometry_shader4)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_ARB_geometry_shader4_functions[] = {
-   { 11411, -1 }, /* FramebufferTextureLayer */
+   { 11333, -1 }, /* FramebufferTextureLayer */
    {    -1, -1 }
 };
 #endif
@@ -5087,11 +5097,11 @@ static const struct gl_function_remap GL_ARB_map_buffer_range_functions[] = {
 
 #if defined(need_GL_ARB_matrix_palette)
 static const struct gl_function_remap GL_ARB_matrix_palette_functions[] = {
-   {  3378, -1 }, /* MatrixIndexusvARB */
-   { 12052, -1 }, /* MatrixIndexuivARB */
-   { 13302, -1 }, /* MatrixIndexPointerARB */
-   { 18143, -1 }, /* CurrentPaletteMatrixARB */
-   { 21063, -1 }, /* MatrixIndexubvARB */
+   {  3339, -1 }, /* MatrixIndexusvARB */
+   { 11974, -1 }, /* MatrixIndexuivARB */
+   { 13295, -1 }, /* MatrixIndexPointerARB */
+   { 18165, -1 }, /* CurrentPaletteMatrixARB */
+   { 21085, -1 }, /* MatrixIndexubvARB */
    {    -1, -1 }
 };
 #endif
@@ -5168,16 +5178,16 @@ static const struct gl_function_remap GL_ARB_vertex_array_object_functions[] = {
 
 #if defined(need_GL_ARB_vertex_blend)
 static const struct gl_function_remap GL_ARB_vertex_blend_functions[] = {
-   {  2265, -1 }, /* WeightubvARB */
-   {  5785, -1 }, /* WeightivARB */
-   { 10123, -1 }, /* WeightPointerARB */
-   { 12720, -1 }, /* WeightfvARB */
-   { 16182, -1 }, /* WeightbvARB */
-   { 19356, -1 }, /* WeightusvARB */
-   { 22089, -1 }, /* VertexBlendARB */
-   { 27330, -1 }, /* WeightsvARB */
-   { 29276, -1 }, /* WeightdvARB */
-   { 29974, -1 }, /* WeightuivARB */
+   {  2226, -1 }, /* WeightubvARB */
+   {  5746, -1 }, /* WeightivARB */
+   { 10084, -1 }, /* WeightPointerARB */
+   { 12674, -1 }, /* WeightfvARB */
+   { 16204, -1 }, /* WeightbvARB */
+   { 19378, -1 }, /* WeightusvARB */
+   { 22111, -1 }, /* VertexBlendARB */
+   { 27320, -1 }, /* WeightsvARB */
+   { 29328, -1 }, /* WeightdvARB */
+   { 30026, -1 }, /* WeightuivARB */
    {    -1, -1 }
 };
 #endif
@@ -5247,7 +5257,7 @@ static const struct gl_function_remap GL_ATI_separate_stencil_functions[] = {
 
 #if defined(need_GL_EXT_blend_color)
 static const struct gl_function_remap GL_EXT_blend_color_functions[] = {
-   {  2479, _gloffset_BlendColor },
+   {  2440, _gloffset_BlendColor },
    {    -1, -1 }
 };
 #endif
@@ -5268,15 +5278,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[] = {
-   { 10258, _gloffset_BlendEquation },
+   { 10219, _gloffset_BlendEquation },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_color_subtable)
 static const struct gl_function_remap GL_EXT_color_subtable_functions[] = {
-   { 15630, _gloffset_ColorSubTable },
-   { 29226, _gloffset_CopyColorSubTable },
+   { 15652, _gloffset_ColorSubTable },
+   { 29278, _gloffset_CopyColorSubTable },
    {    -1, -1 }
 };
 #endif
@@ -5290,66 +5300,66 @@ static const struct gl_function_remap GL_EXT_compiled_vertex_array_functions[] =
 
 #if defined(need_GL_EXT_convolution)
 static const struct gl_function_remap GL_EXT_convolution_functions[] = {
-   {   252, _gloffset_ConvolutionFilter1D },
-   {  2323, _gloffset_CopyConvolutionFilter1D },
-   {  3663, _gloffset_GetConvolutionParameteriv },
-   {  7741, _gloffset_ConvolutionFilter2D },
-   {  7907, _gloffset_ConvolutionParameteriv },
-   {  8367, _gloffset_ConvolutionParameterfv },
-   { 18892, _gloffset_GetSeparableFilter },
-   { 22163, _gloffset_SeparableFilter2D },
-   { 22975, _gloffset_ConvolutionParameteri },
-   { 23098, _gloffset_ConvolutionParameterf },
-   { 24615, _gloffset_GetConvolutionParameterfv },
-   { 25469, _gloffset_GetConvolutionFilter },
-   { 27744, _gloffset_CopyConvolutionFilter2D },
+   {   213, _gloffset_ConvolutionFilter1D },
+   {  2284, _gloffset_CopyConvolutionFilter1D },
+   {  3624, _gloffset_GetConvolutionParameteriv },
+   {  7702, _gloffset_ConvolutionFilter2D },
+   {  7868, _gloffset_ConvolutionParameteriv },
+   {  8328, _gloffset_ConvolutionParameterfv },
+   { 18914, _gloffset_GetSeparableFilter },
+   { 22185, _gloffset_SeparableFilter2D },
+   { 22997, _gloffset_ConvolutionParameteri },
+   { 23120, _gloffset_ConvolutionParameterf },
+   { 24637, _gloffset_GetConvolutionParameterfv },
+   { 25459, _gloffset_GetConvolutionFilter },
+   { 27734, _gloffset_CopyConvolutionFilter2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_coordinate_frame)
 static const struct gl_function_remap GL_EXT_coordinate_frame_functions[] = {
-   {  9602, -1 }, /* TangentPointerEXT */
-   { 11566, -1 }, /* Binormal3ivEXT */
-   { 12184, -1 }, /* Tangent3sEXT */
-   { 13367, -1 }, /* Tangent3fvEXT */
-   { 17114, -1 }, /* Tangent3dvEXT */
-   { 17841, -1 }, /* Binormal3bvEXT */
-   { 18945, -1 }, /* Binormal3dEXT */
-   { 20995, -1 }, /* Tangent3fEXT */
-   { 23047, -1 }, /* Binormal3sEXT */
-   { 23492, -1 }, /* Tangent3ivEXT */
-   { 23511, -1 }, /* Tangent3dEXT */
-   { 24379, -1 }, /* Binormal3svEXT */
-   { 24892, -1 }, /* Binormal3fEXT */
-   { 25744, -1 }, /* Binormal3dvEXT */
-   { 26950, -1 }, /* Tangent3iEXT */
-   { 28029, -1 }, /* Tangent3bvEXT */
-   { 28474, -1 }, /* Tangent3bEXT */
-   { 28999, -1 }, /* Binormal3fvEXT */
-   { 29673, -1 }, /* BinormalPointerEXT */
-   { 30078, -1 }, /* Tangent3svEXT */
-   { 30515, -1 }, /* Binormal3bEXT */
-   { 30692, -1 }, /* Binormal3iEXT */
+   {  9563, -1 }, /* TangentPointerEXT */
+   { 11488, -1 }, /* Binormal3ivEXT */
+   { 12106, -1 }, /* Tangent3sEXT */
+   { 13360, -1 }, /* Tangent3fvEXT */
+   { 17136, -1 }, /* Tangent3dvEXT */
+   { 17863, -1 }, /* Binormal3bvEXT */
+   { 18967, -1 }, /* Binormal3dEXT */
+   { 21017, -1 }, /* Tangent3fEXT */
+   { 23069, -1 }, /* Binormal3sEXT */
+   { 23514, -1 }, /* Tangent3ivEXT */
+   { 23533, -1 }, /* Tangent3dEXT */
+   { 24401, -1 }, /* Binormal3svEXT */
+   { 24882, -1 }, /* Binormal3fEXT */
+   { 25734, -1 }, /* Binormal3dvEXT */
+   { 26940, -1 }, /* Tangent3iEXT */
+   { 28019, -1 }, /* Tangent3bvEXT */
+   { 28487, -1 }, /* Tangent3bEXT */
+   { 29051, -1 }, /* Binormal3fvEXT */
+   { 29725, -1 }, /* BinormalPointerEXT */
+   { 30130, -1 }, /* Tangent3svEXT */
+   { 30567, -1 }, /* Binormal3bEXT */
+   { 30744, -1 }, /* Binormal3iEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_copy_texture)
 static const struct gl_function_remap GL_EXT_copy_texture_functions[] = {
-   { 13810, _gloffset_CopyTexSubImage3D },
-   { 15370, _gloffset_CopyTexImage2D },
-   { 22583, _gloffset_CopyTexImage1D },
-   { 25150, _gloffset_CopyTexSubImage2D },
-   { 27382, _gloffset_CopyTexSubImage1D },
+   { 13803, _gloffset_CopyTexSubImage3D },
+   { 15363, _gloffset_CopyTexImage2D },
+   { 22605, _gloffset_CopyTexImage1D },
+   { 25140, _gloffset_CopyTexSubImage2D },
+   { 27372, _gloffset_CopyTexSubImage1D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_cull_vertex)
 static const struct gl_function_remap GL_EXT_cull_vertex_functions[] = {
-   {  8056, -1 }, /* CullParameterdvEXT */
-   { 10699, -1 }, /* CullParameterfvEXT */
+   {  8017, -1 }, /* CullParameterdvEXT */
+   { 10660, -1 }, /* CullParameterfvEXT */
    {    -1, -1 }
 };
 #endif
@@ -5377,7 +5387,7 @@ static const struct gl_function_remap GL_EXT_draw_instanced_functions[] = {
 
 #if defined(need_GL_EXT_draw_range_elements)
 static const struct gl_function_remap GL_EXT_draw_range_elements_functions[] = {
-   {  8704, _gloffset_DrawRangeElements },
+   {  8665, _gloffset_DrawRangeElements },
    {    -1, -1 }
 };
 #endif
@@ -5419,39 +5429,39 @@ static const struct gl_function_remap GL_EXT_gpu_program_parameters_functions[]
 
 #if defined(need_GL_EXT_histogram)
 static const struct gl_function_remap GL_EXT_histogram_functions[] = {
-   {   851, _gloffset_Histogram },
-   {  3127, _gloffset_ResetHistogram },
-   {  9104, _gloffset_GetMinmax },
-   { 14144, _gloffset_GetHistogramParameterfv },
-   { 22508, _gloffset_GetMinmaxParameteriv },
-   { 24505, _gloffset_ResetMinmax },
-   { 25366, _gloffset_GetHistogramParameteriv },
-   { 26453, _gloffset_GetHistogram },
-   { 28851, _gloffset_Minmax },
-   { 30313, _gloffset_GetMinmaxParameterfv },
+   {   812, _gloffset_Histogram },
+   {  3088, _gloffset_ResetHistogram },
+   {  9065, _gloffset_GetMinmax },
+   { 14137, _gloffset_GetHistogramParameterfv },
+   { 22530, _gloffset_GetMinmaxParameteriv },
+   { 24527, _gloffset_ResetMinmax },
+   { 25356, _gloffset_GetHistogramParameteriv },
+   { 26443, _gloffset_GetHistogram },
+   { 28864, _gloffset_Minmax },
+   { 30365, _gloffset_GetMinmaxParameterfv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_func)
 static const struct gl_function_remap GL_EXT_index_func_functions[] = {
-   { 10485, -1 }, /* IndexFuncEXT */
+   { 10446, -1 }, /* IndexFuncEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_material)
 static const struct gl_function_remap GL_EXT_index_material_functions[] = {
-   { 19443, -1 }, /* IndexMaterialEXT */
+   { 19465, -1 }, /* IndexMaterialEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_light_texture)
 static const struct gl_function_remap GL_EXT_light_texture_functions[] = {
-   { 24399, -1 }, /* ApplyTextureEXT */
-   { 24459, -1 }, /* TextureMaterialEXT */
-   { 24484, -1 }, /* TextureLightEXT */
+   { 24421, -1 }, /* ApplyTextureEXT */
+   { 24481, -1 }, /* TextureMaterialEXT */
+   { 24506, -1 }, /* TextureLightEXT */
    {    -1, -1 }
 };
 #endif
@@ -5472,20 +5482,20 @@ static const struct gl_function_remap GL_EXT_multisample_functions[] = {
 
 #if defined(need_GL_EXT_paletted_texture)
 static const struct gl_function_remap GL_EXT_paletted_texture_functions[] = {
-   {  7603, _gloffset_ColorTable },
-   { 13990, _gloffset_GetColorTable },
-   { 21178, _gloffset_GetColorTableParameterfv },
-   { 23154, _gloffset_GetColorTableParameteriv },
+   {  7564, _gloffset_ColorTable },
+   { 13983, _gloffset_GetColorTable },
+   { 21200, _gloffset_GetColorTableParameterfv },
+   { 23176, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_pixel_transform)
 static const struct gl_function_remap GL_EXT_pixel_transform_functions[] = {
-   { 20094, -1 }, /* PixelTransformParameterfEXT */
-   { 20174, -1 }, /* PixelTransformParameteriEXT */
-   { 28212, -1 }, /* PixelTransformParameterfvEXT */
-   { 29637, -1 }, /* PixelTransformParameterivEXT */
+   { 20116, -1 }, /* PixelTransformParameterfEXT */
+   { 20196, -1 }, /* PixelTransformParameteriEXT */
+   { 28202, -1 }, /* PixelTransformParameterfvEXT */
+   { 29689, -1 }, /* PixelTransformParameterivEXT */
    {    -1, -1 }
 };
 #endif
@@ -5527,16 +5537,16 @@ static const struct gl_function_remap GL_EXT_stencil_two_side_functions[] = {
 
 #if defined(need_GL_EXT_subtexture)
 static const struct gl_function_remap GL_EXT_subtexture_functions[] = {
-   {  6324, _gloffset_TexSubImage1D },
-   {  9718, _gloffset_TexSubImage2D },
+   {  6285, _gloffset_TexSubImage1D },
+   {  9679, _gloffset_TexSubImage2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_texture3D)
 static const struct gl_function_remap GL_EXT_texture3D_functions[] = {
-   {  1697, _gloffset_TexImage3D },
-   { 20947, _gloffset_TexSubImage3D },
+   {  1658, _gloffset_TexImage3D },
+   { 20969, _gloffset_TexSubImage3D },
    {    -1, -1 }
 };
 #endif
@@ -5550,19 +5560,19 @@ static const struct gl_function_remap GL_EXT_texture_array_functions[] = {
 
 #if defined(need_GL_EXT_texture_object)
 static const struct gl_function_remap GL_EXT_texture_object_functions[] = {
-   {  3003, _gloffset_PrioritizeTextures },
-   {  6773, _gloffset_AreTexturesResident },
-   { 12460, _gloffset_GenTextures },
-   { 14476, _gloffset_DeleteTextures },
-   { 17894, _gloffset_IsTexture },
-   { 27447, _gloffset_BindTexture },
+   {  2964, _gloffset_PrioritizeTextures },
+   {  6734, _gloffset_AreTexturesResident },
+   { 12382, _gloffset_GenTextures },
+   { 14469, _gloffset_DeleteTextures },
+   { 17916, _gloffset_IsTexture },
+   { 27437, _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[] = {
-   { 12670, -1 }, /* TextureNormalEXT */
+   { 12624, -1 }, /* TextureNormalEXT */
    {    -1, -1 }
 };
 #endif
@@ -5584,30 +5594,30 @@ static const struct gl_function_remap GL_EXT_transform_feedback_functions[] = {
 #if defined(need_GL_EXT_vertex_array)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_EXT_vertex_array_functions[] = {
-   { 22335, _gloffset_ArrayElement },
-   { 28439, _gloffset_GetPointerv },
-   { 29940, _gloffset_DrawArrays },
+   { 22357, _gloffset_ArrayElement },
+   { 28452, _gloffset_GetPointerv },
+   { 29992, _gloffset_DrawArrays },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_vertex_weighting)
 static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
-   { 17924, -1 }, /* VertexWeightfvEXT */
-   { 24870, -1 }, /* VertexWeightfEXT */
-   { 26422, -1 }, /* VertexWeightPointerEXT */
+   { 17946, -1 }, /* VertexWeightfvEXT */
+   { 24860, -1 }, /* VertexWeightfEXT */
+   { 26412, -1 }, /* VertexWeightPointerEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_HP_image_transform)
 static const struct gl_function_remap GL_HP_image_transform_functions[] = {
-   {  2196, -1 }, /* GetImageTransformParameterfvHP */
-   {  3344, -1 }, /* ImageTransformParameterfHP */
-   {  9296, -1 }, /* ImageTransformParameterfvHP */
-   { 10954, -1 }, /* ImageTransformParameteriHP */
-   { 11301, -1 }, /* GetImageTransformParameterivHP */
-   { 17988, -1 }, /* ImageTransformParameterivHP */
+   {  2157, -1 }, /* GetImageTransformParameterfvHP */
+   {  3305, -1 }, /* ImageTransformParameterfHP */
+   {  9257, -1 }, /* ImageTransformParameterfvHP */
+   { 10915, -1 }, /* ImageTransformParameteriHP */
+   { 11223, -1 }, /* GetImageTransformParameterivHP */
+   { 18010, -1 }, /* ImageTransformParameterivHP */
    {    -1, -1 }
 };
 #endif
@@ -5621,14 +5631,14 @@ static const struct gl_function_remap GL_IBM_multimode_draw_arrays_functions[] =
 
 #if defined(need_GL_IBM_vertex_array_lists)
 static const struct gl_function_remap GL_IBM_vertex_array_lists_functions[] = {
-   {  3896, -1 }, /* SecondaryColorPointerListIBM */
-   {  5291, -1 }, /* NormalPointerListIBM */
-   {  6947, -1 }, /* FogCoordPointerListIBM */
-   {  7254, -1 }, /* VertexPointerListIBM */
-   { 10875, -1 }, /* ColorPointerListIBM */
-   { 12291, -1 }, /* TexCoordPointerListIBM */
-   { 12692, -1 }, /* IndexPointerListIBM */
-   { 30256, -1 }, /* EdgeFlagPointerListIBM */
+   {  3857, -1 }, /* SecondaryColorPointerListIBM */
+   {  5252, -1 }, /* NormalPointerListIBM */
+   {  6908, -1 }, /* FogCoordPointerListIBM */
+   {  7215, -1 }, /* VertexPointerListIBM */
+   { 10836, -1 }, /* ColorPointerListIBM */
+   { 12213, -1 }, /* TexCoordPointerListIBM */
+   { 12646, -1 }, /* IndexPointerListIBM */
+   { 30308, -1 }, /* EdgeFlagPointerListIBM */
    {    -1, -1 }
 };
 #endif
@@ -5642,10 +5652,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[] = {
-   { 11678, -1 }, /* VertexPointervINTEL */
-   { 14237, -1 }, /* ColorPointervINTEL */
-   { 27718, -1 }, /* NormalPointervINTEL */
-   { 28144, -1 }, /* TexCoordPointervINTEL */
+   { 11600, -1 }, /* VertexPointervINTEL */
+   { 14230, -1 }, /* ColorPointervINTEL */
+   { 27708, -1 }, /* NormalPointervINTEL */
+   { 28134, -1 }, /* TexCoordPointervINTEL */
    {    -1, -1 }
 };
 #endif
@@ -5659,10 +5669,10 @@ static const struct gl_function_remap GL_MESA_resize_buffers_functions[] = {
 
 #if defined(need_GL_MESA_shader_debug)
 static const struct gl_function_remap GL_MESA_shader_debug_functions[] = {
-   {  1561, -1 }, /* GetDebugLogLengthMESA */
-   {  3102, -1 }, /* ClearDebugLogMESA */
-   {  4057, -1 }, /* GetDebugLogMESA */
-   { 28632, -1 }, /* CreateDebugObjectMESA */
+   {  1522, -1 }, /* GetDebugLogLengthMESA */
+   {  3063, -1 }, /* ClearDebugLogMESA */
+   {  4018, -1 }, /* GetDebugLogMESA */
+   { 28645, -1 }, /* CreateDebugObjectMESA */
    {    -1, -1 }
 };
 #endif
@@ -5683,15 +5693,15 @@ static const struct gl_function_remap GL_NV_condtitional_render_functions[] = {
 
 #if defined(need_GL_NV_evaluators)
 static const struct gl_function_remap GL_NV_evaluators_functions[] = {
-   {  5986, -1 }, /* GetMapAttribParameterivNV */
-   {  7709, -1 }, /* MapControlPointsNV */
-   {  7808, -1 }, /* MapParameterfvNV */
-   {  9701, -1 }, /* EvalMapsNV */
-   { 15852, -1 }, /* GetMapAttribParameterfvNV */
-   { 16018, -1 }, /* MapParameterivNV */
-   { 22898, -1 }, /* GetMapParameterivNV */
-   { 23396, -1 }, /* GetMapParameterfvNV */
-   { 27054, -1 }, /* GetMapControlPointsNV */
+   {  5947, -1 }, /* GetMapAttribParameterivNV */
+   {  7670, -1 }, /* MapControlPointsNV */
+   {  7769, -1 }, /* MapParameterfvNV */
+   {  9662, -1 }, /* EvalMapsNV */
+   { 15874, -1 }, /* GetMapAttribParameterfvNV */
+   { 16040, -1 }, /* MapParameterivNV */
+   { 22920, -1 }, /* GetMapParameterivNV */
+   { 23418, -1 }, /* GetMapParameterfvNV */
+   { 27044, -1 }, /* GetMapControlPointsNV */
    {    -1, -1 }
 };
 #endif
@@ -5717,6 +5727,13 @@ static const struct gl_function_remap GL_NV_point_sprite_functions[] = {
 };
 #endif
 
+#if defined(need_GL_NV_primitive_restart)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_NV_primitive_restart_functions[] = {
+   {    -1, -1 }
+};
+#endif
+
 #if defined(need_GL_NV_register_combiners)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_NV_register_combiners_functions[] = {
@@ -5726,8 +5743,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[] = {
-   { 14707, -1 }, /* CombinerStageParameterfvNV */
-   { 15022, -1 }, /* GetCombinerStageParameterfvNV */
+   { 14700, -1 }, /* CombinerStageParameterfvNV */
+   { 15015, -1 }, /* GetCombinerStageParameterfvNV */
    {    -1, -1 }
 };
 #endif
@@ -5755,23 +5772,23 @@ static const struct gl_function_remap GL_OES_EGL_image_functions[] = {
 
 #if defined(need_GL_PGI_misc_hints)
 static const struct gl_function_remap GL_PGI_misc_hints_functions[] = {
-   {  7893, -1 }, /* HintPGI */
+   {  7854, -1 }, /* HintPGI */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_detail_texture)
 static const struct gl_function_remap GL_SGIS_detail_texture_functions[] = {
-   { 14995, -1 }, /* GetDetailTexFuncSGIS */
-   { 15315, -1 }, /* DetailTexFuncSGIS */
+   { 14988, -1 }, /* GetDetailTexFuncSGIS */
+   { 15308, -1 }, /* DetailTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_fog_function)
 static const struct gl_function_remap GL_SGIS_fog_function_functions[] = {
-   { 25132, -1 }, /* FogFuncSGIS */
-   { 25797, -1 }, /* GetFogFuncSGIS */
+   { 25122, -1 }, /* FogFuncSGIS */
+   { 25787, -1 }, /* GetFogFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5799,112 +5816,112 @@ static const struct gl_function_remap GL_SGIS_point_parameters_functions[] = {
 
 #if defined(need_GL_SGIS_sharpen_texture)
 static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
-   {  6047, -1 }, /* GetSharpenTexFuncSGIS */
-   { 20414, -1 }, /* SharpenTexFuncSGIS */
+   {  6008, -1 }, /* GetSharpenTexFuncSGIS */
+   { 20436, -1 }, /* SharpenTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture4D)
 static const struct gl_function_remap GL_SGIS_texture4D_functions[] = {
-   {   933, -1 }, /* TexImage4DSGIS */
-   { 14545, -1 }, /* TexSubImage4DSGIS */
+   {   894, -1 }, /* TexImage4DSGIS */
+   { 14538, -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[] = {
-   { 13943, -1 }, /* TextureColorMaskSGIS */
+   { 13936, -1 }, /* TextureColorMaskSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_filter4)
 static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {
-   {  6224, -1 }, /* GetTexFilterFuncSGIS */
-   { 15141, -1 }, /* TexFilterFuncSGIS */
+   {  6185, -1 }, /* GetTexFilterFuncSGIS */
+   { 15134, -1 }, /* TexFilterFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_async)
 static const struct gl_function_remap GL_SGIX_async_functions[] = {
-   {  3053, -1 }, /* AsyncMarkerSGIX */
-   {  4036, -1 }, /* FinishAsyncSGIX */
-   {  4830, -1 }, /* PollAsyncSGIX */
-   { 20561, -1 }, /* DeleteAsyncMarkersSGIX */
-   { 20616, -1 }, /* IsAsyncMarkerSGIX */
-   { 30053, -1 }, /* GenAsyncMarkersSGIX */
+   {  3014, -1 }, /* AsyncMarkerSGIX */
+   {  3997, -1 }, /* FinishAsyncSGIX */
+   {  4762, -1 }, /* PollAsyncSGIX */
+   { 20583, -1 }, /* DeleteAsyncMarkersSGIX */
+   { 20638, -1 }, /* IsAsyncMarkerSGIX */
+   { 30105, -1 }, /* GenAsyncMarkersSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_flush_raster)
 static const struct gl_function_remap GL_SGIX_flush_raster_functions[] = {
-   {  6601, -1 }, /* FlushRasterSGIX */
+   {  6562, -1 }, /* FlushRasterSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_fragment_lighting)
 static const struct gl_function_remap GL_SGIX_fragment_lighting_functions[] = {
-   {  2449, -1 }, /* FragmentMaterialfvSGIX */
-   {  4781, -1 }, /* FragmentLightiSGIX */
-   {  5727, -1 }, /* GetFragmentMaterialfvSGIX */
-   {  7321, -1 }, /* FragmentMaterialfSGIX */
-   {  7482, -1 }, /* GetFragmentLightivSGIX */
-   {  8319, -1 }, /* FragmentLightModeliSGIX */
-   {  9764, -1 }, /* FragmentLightivSGIX */
-   { 10066, -1 }, /* GetFragmentMaterialivSGIX */
-   { 17811, -1 }, /* FragmentLightModelfSGIX */
-   { 18111, -1 }, /* FragmentColorMaterialSGIX */
-   { 18511, -1 }, /* FragmentMaterialiSGIX */
-   { 19771, -1 }, /* LightEnviSGIX */
-   { 21270, -1 }, /* FragmentLightModelfvSGIX */
-   { 21579, -1 }, /* FragmentLightfvSGIX */
-   { 26181, -1 }, /* FragmentLightModelivSGIX */
-   { 26304, -1 }, /* FragmentLightfSGIX */
-   { 28969, -1 }, /* GetFragmentLightfvSGIX */
-   { 30536, -1 }, /* FragmentMaterialivSGIX */
+   {  2410, -1 }, /* FragmentMaterialfvSGIX */
+   {  4713, -1 }, /* FragmentLightiSGIX */
+   {  5688, -1 }, /* GetFragmentMaterialfvSGIX */
+   {  7282, -1 }, /* FragmentMaterialfSGIX */
+   {  7443, -1 }, /* GetFragmentLightivSGIX */
+   {  8280, -1 }, /* FragmentLightModeliSGIX */
+   {  9725, -1 }, /* FragmentLightivSGIX */
+   { 10027, -1 }, /* GetFragmentMaterialivSGIX */
+   { 17833, -1 }, /* FragmentLightModelfSGIX */
+   { 18133, -1 }, /* FragmentColorMaterialSGIX */
+   { 18533, -1 }, /* FragmentMaterialiSGIX */
+   { 19793, -1 }, /* LightEnviSGIX */
+   { 21292, -1 }, /* FragmentLightModelfvSGIX */
+   { 21601, -1 }, /* FragmentLightfvSGIX */
+   { 26171, -1 }, /* FragmentLightModelivSGIX */
+   { 26294, -1 }, /* FragmentLightfSGIX */
+   { 29021, -1 }, /* GetFragmentLightfvSGIX */
+   { 30588, -1 }, /* FragmentMaterialivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_framezoom)
 static const struct gl_function_remap GL_SGIX_framezoom_functions[] = {
-   { 20639, -1 }, /* FrameZoomSGIX */
+   { 20661, -1 }, /* FrameZoomSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_igloo_interface)
 static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
-   { 26612, -1 }, /* IglooInterfaceSGIX */
+   { 26602, -1 }, /* IglooInterfaceSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_instruments)
 static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
-   {  2612, -1 }, /* ReadInstrumentsSGIX */
-   {  5803, -1 }, /* PollInstrumentsSGIX */
-   {  9662, -1 }, /* GetInstrumentsSGIX */
-   { 11889, -1 }, /* StartInstrumentsSGIX */
-   { 14741, -1 }, /* StopInstrumentsSGIX */
-   { 16395, -1 }, /* InstrumentsBufferSGIX */
+   {  2573, -1 }, /* ReadInstrumentsSGIX */
+   {  5764, -1 }, /* PollInstrumentsSGIX */
+   {  9623, -1 }, /* GetInstrumentsSGIX */
+   { 11811, -1 }, /* StartInstrumentsSGIX */
+   { 14734, -1 }, /* StopInstrumentsSGIX */
+   { 16417, -1 }, /* InstrumentsBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_list_priority)
 static const struct gl_function_remap GL_SGIX_list_priority_functions[] = {
-   {  1164, -1 }, /* ListParameterfSGIX */
-   {  2802, -1 }, /* GetListParameterfvSGIX */
-   { 16310, -1 }, /* ListParameteriSGIX */
-   { 17064, -1 }, /* ListParameterfvSGIX */
-   { 19177, -1 }, /* ListParameterivSGIX */
-   { 30097, -1 }, /* GetListParameterivSGIX */
+   {  1125, -1 }, /* ListParameterfSGIX */
+   {  2763, -1 }, /* GetListParameterfvSGIX */
+   { 16332, -1 }, /* ListParameteriSGIX */
+   { 17086, -1 }, /* ListParameterfvSGIX */
+   { 19199, -1 }, /* ListParameterivSGIX */
+   { 30149, -1 }, /* GetListParameterivSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5918,134 +5935,134 @@ static const struct gl_function_remap GL_SGIX_pixel_texture_functions[] = {
 
 #if defined(need_GL_SGIX_polynomial_ffd)
 static const struct gl_function_remap GL_SGIX_polynomial_ffd_functions[] = {
-   {  3290, -1 }, /* LoadIdentityDeformationMapSGIX */
-   { 11175, -1 }, /* DeformationMap3dSGIX */
-   { 14841, -1 }, /* DeformSGIX */
-   { 22447, -1 }, /* DeformationMap3fSGIX */
+   {  3251, -1 }, /* LoadIdentityDeformationMapSGIX */
+   { 14834, -1 }, /* DeformSGIX */
+   { 22469, -1 }, /* DeformationMap3fSGIX */
+   { 28909, -1 }, /* DeformationMap3dSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_reference_plane)
 static const struct gl_function_remap GL_SGIX_reference_plane_functions[] = {
-   { 13494, -1 }, /* ReferencePlaneSGIX */
+   { 13487, -1 }, /* ReferencePlaneSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_sprite)
 static const struct gl_function_remap GL_SGIX_sprite_functions[] = {
-   {  8817, -1 }, /* SpriteParameterfvSGIX */
-   { 18966, -1 }, /* SpriteParameteriSGIX */
-   { 24539, -1 }, /* SpriteParameterfSGIX */
-   { 27176, -1 }, /* SpriteParameterivSGIX */
+   {  8778, -1 }, /* SpriteParameterfvSGIX */
+   { 18988, -1 }, /* SpriteParameteriSGIX */
+   { 24561, -1 }, /* SpriteParameterfSGIX */
+   { 27166, -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[] = {
-   { 19025, -1 }, /* TagSampleBufferSGIX */
+   { 19047, -1 }, /* TagSampleBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGI_color_table)
 static const struct gl_function_remap GL_SGI_color_table_functions[] = {
-   {  6891, _gloffset_ColorTableParameteriv },
-   {  7603, _gloffset_ColorTable },
-   { 13990, _gloffset_GetColorTable },
-   { 14100, _gloffset_CopyColorTable },
-   { 17755, _gloffset_ColorTableParameterfv },
-   { 21178, _gloffset_GetColorTableParameterfv },
-   { 23154, _gloffset_GetColorTableParameteriv },
+   {  6852, _gloffset_ColorTableParameteriv },
+   {  7564, _gloffset_ColorTable },
+   { 13983, _gloffset_GetColorTable },
+   { 14093, _gloffset_CopyColorTable },
+   { 17777, _gloffset_ColorTableParameterfv },
+   { 21200, _gloffset_GetColorTableParameterfv },
+   { 23176, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUNX_constant_data)
 static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
-   { 28947, -1 }, /* FinishTextureSUNX */
+   { 28999, -1 }, /* FinishTextureSUNX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_global_alpha)
 static const struct gl_function_remap GL_SUN_global_alpha_functions[] = {
-   {  3074, -1 }, /* GlobalAlphaFactorubSUN */
-   {  4263, -1 }, /* GlobalAlphaFactoriSUN */
-   {  5828, -1 }, /* GlobalAlphaFactordSUN */
-   {  8901, -1 }, /* GlobalAlphaFactoruiSUN */
-   {  9253, -1 }, /* GlobalAlphaFactorbSUN */
-   { 12204, -1 }, /* GlobalAlphaFactorfSUN */
-   { 12323, -1 }, /* GlobalAlphaFactorusSUN */
-   { 20878, -1 }, /* GlobalAlphaFactorsSUN */
+   {  3035, -1 }, /* GlobalAlphaFactorubSUN */
+   {  4224, -1 }, /* GlobalAlphaFactoriSUN */
+   {  5789, -1 }, /* GlobalAlphaFactordSUN */
+   {  8862, -1 }, /* GlobalAlphaFactoruiSUN */
+   {  9214, -1 }, /* GlobalAlphaFactorbSUN */
+   { 12126, -1 }, /* GlobalAlphaFactorfSUN */
+   { 12245, -1 }, /* GlobalAlphaFactorusSUN */
+   { 20900, -1 }, /* GlobalAlphaFactorsSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_mesh_array)
 static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
-   { 26988, -1 }, /* DrawMeshArraysSUN */
+   { 26978, -1 }, /* DrawMeshArraysSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_triangle_list)
 static const struct gl_function_remap GL_SUN_triangle_list_functions[] = {
-   {  4010, -1 }, /* ReplacementCodeubSUN */
-   {  5639, -1 }, /* ReplacementCodeubvSUN */
-   { 17476, -1 }, /* ReplacementCodeusvSUN */
-   { 17664, -1 }, /* ReplacementCodePointerSUN */
-   { 19835, -1 }, /* ReplacementCodeuiSUN */
-   { 20590, -1 }, /* ReplacementCodeusSUN */
-   { 27633, -1 }, /* ReplacementCodeuivSUN */
+   {  3971, -1 }, /* ReplacementCodeubSUN */
+   {  5600, -1 }, /* ReplacementCodeubvSUN */
+   { 17498, -1 }, /* ReplacementCodeusvSUN */
+   { 17686, -1 }, /* ReplacementCodePointerSUN */
+   { 19857, -1 }, /* ReplacementCodeuiSUN */
+   { 20612, -1 }, /* ReplacementCodeusSUN */
+   { 27623, -1 }, /* ReplacementCodeuivSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_vertex)
 static const struct gl_function_remap GL_SUN_vertex_functions[] = {
-   {  1038, -1 }, /* ReplacementCodeuiColor3fVertex3fvSUN */
-   {  1236, -1 }, /* TexCoord4fColor4fNormal3fVertex4fvSUN */
-   {  1462, -1 }, /* TexCoord2fColor4ubVertex3fvSUN */
-   {  1738, -1 }, /* ReplacementCodeuiVertex3fvSUN */
-   {  1872, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fvSUN */
-   {  2385, -1 }, /* ReplacementCodeuiNormal3fVertex3fSUN */
-   {  2681, -1 }, /* Color4ubVertex3fvSUN */
-   {  4144, -1 }, /* Color4ubVertex3fSUN */
-   {  4220, -1 }, /* TexCoord2fVertex3fSUN */
-   {  4547, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
-   {  4934, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
-   {  5534, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
-   {  6279, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
-   {  6638, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
-   {  7350, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
-   {  8118, -1 }, /* Color3fVertex3fSUN */
-   {  9212, -1 }, /* Color3fVertex3fvSUN */
-   {  9627, -1 }, /* Color4fNormal3fVertex3fvSUN */
-   { 10364, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 11752, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
-   { 13225, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
-   { 13636, -1 }, /* TexCoord2fColor3fVertex3fSUN */
-   { 14766, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
-   { 15100, -1 }, /* Color4ubVertex2fvSUN */
-   { 15340, -1 }, /* Normal3fVertex3fSUN */
-   { 16336, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
-   { 16597, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 17305, -1 }, /* TexCoord2fVertex3fvSUN */
-   { 18081, -1 }, /* Color4ubVertex2fSUN */
-   { 18302, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
-   { 20260, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
-   { 20658, -1 }, /* Normal3fVertex3fvSUN */
-   { 21087, -1 }, /* Color4fNormal3fVertex3fSUN */
-   { 21996, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
-   { 23991, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
-   { 25248, -1 }, /* TexCoord4fVertex4fSUN */
-   { 25674, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
-   { 26025, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
-   { 26152, -1 }, /* TexCoord4fVertex4fvSUN */
-   { 26860, -1 }, /* ReplacementCodeuiVertex3fSUN */
+   {   999, -1 }, /* ReplacementCodeuiColor3fVertex3fvSUN */
+   {  1197, -1 }, /* TexCoord4fColor4fNormal3fVertex4fvSUN */
+   {  1423, -1 }, /* TexCoord2fColor4ubVertex3fvSUN */
+   {  1699, -1 }, /* ReplacementCodeuiVertex3fvSUN */
+   {  1833, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fvSUN */
+   {  2346, -1 }, /* ReplacementCodeuiNormal3fVertex3fSUN */
+   {  2642, -1 }, /* Color4ubVertex3fvSUN */
+   {  4105, -1 }, /* Color4ubVertex3fSUN */
+   {  4181, -1 }, /* TexCoord2fVertex3fSUN */
+   {  4508, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
+   {  4866, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
+   {  5495, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
+   {  6240, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
+   {  6599, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
+   {  7311, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
+   {  8079, -1 }, /* Color3fVertex3fSUN */
+   {  9173, -1 }, /* Color3fVertex3fvSUN */
+   {  9588, -1 }, /* Color4fNormal3fVertex3fvSUN */
+   { 10325, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 11674, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
+   { 13218, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
+   { 13629, -1 }, /* TexCoord2fColor3fVertex3fSUN */
+   { 14759, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
+   { 15093, -1 }, /* Color4ubVertex2fvSUN */
+   { 15333, -1 }, /* Normal3fVertex3fSUN */
+   { 16358, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
+   { 16619, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 17327, -1 }, /* TexCoord2fVertex3fvSUN */
+   { 18103, -1 }, /* Color4ubVertex2fSUN */
+   { 18324, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
+   { 20282, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
+   { 20680, -1 }, /* Normal3fVertex3fvSUN */
+   { 21109, -1 }, /* Color4fNormal3fVertex3fSUN */
+   { 22018, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
+   { 24013, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
+   { 25238, -1 }, /* TexCoord4fVertex4fSUN */
+   { 25664, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
+   { 26015, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
+   { 26142, -1 }, /* TexCoord4fVertex4fvSUN */
+   { 26850, -1 }, /* ReplacementCodeuiVertex3fSUN */
    {    -1, -1 }
 };
 #endif
@@ -6053,40 +6070,40 @@ static const struct gl_function_remap GL_SUN_vertex_functions[] = {
 #if defined(need_GL_VERSION_1_3)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_VERSION_1_3_functions[] = {
-   {   420, _gloffset_MultiTexCoord3sARB },
-   {   652, _gloffset_ActiveTextureARB },
-   {  3800, _gloffset_MultiTexCoord1fvARB },
-   {  5425, _gloffset_MultiTexCoord3dARB },
-   {  5470, _gloffset_MultiTexCoord2iARB },
-   {  5594, _gloffset_MultiTexCoord2svARB },
-   {  7559, _gloffset_MultiTexCoord2fARB },
-   {  9463, _gloffset_MultiTexCoord3fvARB },
-   { 10020, _gloffset_MultiTexCoord4sARB },
-   { 10654, _gloffset_MultiTexCoord2dvARB },
-   { 11036, _gloffset_MultiTexCoord1svARB },
-   { 11447, _gloffset_MultiTexCoord3svARB },
-   { 11508, _gloffset_MultiTexCoord4iARB },
-   { 12231, _gloffset_MultiTexCoord3iARB },
-   { 12963, _gloffset_MultiTexCoord1dARB },
-   { 13180, _gloffset_MultiTexCoord3dvARB },
-   { 14344, _gloffset_MultiTexCoord3ivARB },
-   { 14389, _gloffset_MultiTexCoord2sARB },
-   { 15687, _gloffset_MultiTexCoord4ivARB },
-   { 17405, _gloffset_ClientActiveTextureARB },
-   { 19688, _gloffset_MultiTexCoord2dARB },
-   { 20129, _gloffset_MultiTexCoord4dvARB },
-   { 20440, _gloffset_MultiTexCoord4fvARB },
-   { 21319, _gloffset_MultiTexCoord3fARB },
-   { 23682, _gloffset_MultiTexCoord4dARB },
-   { 23948, _gloffset_MultiTexCoord1sARB },
-   { 24152, _gloffset_MultiTexCoord1dvARB },
-   { 24994, _gloffset_MultiTexCoord1ivARB },
-   { 25087, _gloffset_MultiTexCoord2ivARB },
-   { 25426, _gloffset_MultiTexCoord1iARB },
-   { 26728, _gloffset_MultiTexCoord4svARB },
-   { 27246, _gloffset_MultiTexCoord1fARB },
-   { 27509, _gloffset_MultiTexCoord4fARB },
-   { 29774, _gloffset_MultiTexCoord2fvARB },
+   {   381, _gloffset_MultiTexCoord3sARB },
+   {   613, _gloffset_ActiveTextureARB },
+   {  3761, _gloffset_MultiTexCoord1fvARB },
+   {  5386, _gloffset_MultiTexCoord3dARB },
+   {  5431, _gloffset_MultiTexCoord2iARB },
+   {  5555, _gloffset_MultiTexCoord2svARB },
+   {  7520, _gloffset_MultiTexCoord2fARB },
+   {  9424, _gloffset_MultiTexCoord3fvARB },
+   {  9981, _gloffset_MultiTexCoord4sARB },
+   { 10615, _gloffset_MultiTexCoord2dvARB },
+   { 10997, _gloffset_MultiTexCoord1svARB },
+   { 11369, _gloffset_MultiTexCoord3svARB },
+   { 11430, _gloffset_MultiTexCoord4iARB },
+   { 12153, _gloffset_MultiTexCoord3iARB },
+   { 12956, _gloffset_MultiTexCoord1dARB },
+   { 13173, _gloffset_MultiTexCoord3dvARB },
+   { 14337, _gloffset_MultiTexCoord3ivARB },
+   { 14382, _gloffset_MultiTexCoord2sARB },
+   { 15709, _gloffset_MultiTexCoord4ivARB },
+   { 17427, _gloffset_ClientActiveTextureARB },
+   { 19710, _gloffset_MultiTexCoord2dARB },
+   { 20151, _gloffset_MultiTexCoord4dvARB },
+   { 20462, _gloffset_MultiTexCoord4fvARB },
+   { 21341, _gloffset_MultiTexCoord3fARB },
+   { 23704, _gloffset_MultiTexCoord4dARB },
+   { 23970, _gloffset_MultiTexCoord1sARB },
+   { 24174, _gloffset_MultiTexCoord1dvARB },
+   { 24984, _gloffset_MultiTexCoord1ivARB },
+   { 25077, _gloffset_MultiTexCoord2ivARB },
+   { 25416, _gloffset_MultiTexCoord1iARB },
+   { 26718, _gloffset_MultiTexCoord4svARB },
+   { 27236, _gloffset_MultiTexCoord1fARB },
+   { 27499, _gloffset_MultiTexCoord4fARB },
+   { 29826, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 #endif
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index acab9e0e92..56749355cd 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1315,15 +1315,16 @@ _mesa_MultiModeDrawElementsIBM( const GLenum * mode, const GLsizei * count,
 
 
 /**
- * GL 3.1 glPrimitiveRestartIndex().
+ * GL_NV_primitive_restart and GL 3.1
  */
 void GLAPIENTRY
 _mesa_PrimitiveRestartIndex(GLuint index)
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glPrimitiveRestartIndex()");
+   if (!ctx->Extensions.NV_primitive_restart &&
+       ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glPrimitiveRestartIndexNV()");
       return;
    }
 
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index 13b1aa9e50..9236bf81a2 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -92,7 +92,10 @@ install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt )
 
    SET_Begin(tab, vfmt->Begin);
    SET_End(tab, vfmt->End);
+   SET_PrimitiveRestartNV(tab, vfmt->PrimitiveRestartNV);
+
    SET_Rectf(tab, vfmt->Rectf);
+
    SET_DrawArrays(tab, vfmt->DrawArrays);
    SET_DrawElements(tab, vfmt->DrawElements);
    SET_DrawRangeElements(tab, vfmt->DrawRangeElements);
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index f6f5bb1793..5387499eb9 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -703,6 +703,9 @@ st_draw_vbo(struct gl_context *ctx,
       }
    }
 
+   info.primitive_restart = st->ctx->Array.PrimitiveRestart;
+   info.restart_index = st->ctx->Array.RestartIndex;
+
    /* do actual drawing */
    for (i = 0; i < nr_prims; i++) {
       info.mode = translate_prim( ctx, prims[i].mode );
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 96e4efcafa..2720f44645 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -432,6 +432,10 @@ void st_init_extensions(struct st_context *st)
       ctx->Extensions.ARB_geometry_shader4 = GL_TRUE;
    }
 
+   if (screen->get_param(screen, PIPE_CAP_PRIMITIVE_RESTART)) {
+      ctx->Extensions.NV_primitive_restart = GL_TRUE;
+   }
+
    if (screen->get_param(screen, PIPE_CAP_DEPTH_CLAMP)) {
       ctx->Extensions.ARB_depth_clamp = GL_TRUE;
    }
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 80ca1d866e..1ef4917419 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -568,6 +568,28 @@ static void GLAPIENTRY vbo_exec_End( void )
 }
 
 
+/**
+ * Called via glPrimitiveRestartNV()
+ */
+static void GLAPIENTRY
+vbo_exec_PrimitiveRestartNV(void)
+{
+   GLenum curPrim;
+   GET_CURRENT_CONTEXT( ctx ); 
+
+   curPrim = ctx->Driver.CurrentExecPrimitive;
+
+   if (curPrim == PRIM_OUTSIDE_BEGIN_END) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glPrimitiveRestartNV" );
+   }
+   else {
+      vbo_exec_End();
+      vbo_exec_Begin(curPrim);
+   }
+}
+
+
+
 static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
 {
    GLvertexformat *vfmt = &exec->vtxfmt;
@@ -576,6 +598,7 @@ static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
 
    vfmt->Begin = vbo_exec_Begin;
    vfmt->End = vbo_exec_End;
+   vfmt->PrimitiveRestartNV = vbo_exec_PrimitiveRestartNV;
 
    _MESA_INIT_DLIST_VTXFMT(vfmt, _mesa_);
    _MESA_INIT_EVAL_VTXFMT(vfmt, vbo_exec_);
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index f46ba636fe..dd36cc32a7 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -41,6 +41,8 @@
 /**
  * Compute min and max elements by scanning the index buffer for
  * glDraw[Range]Elements() calls.
+ * If primitive restart is enabled, we need to ignore restart
+ * indexes when computing min/max.
  */
 void
 vbo_get_minmax_index(struct gl_context *ctx,
@@ -48,9 +50,11 @@ vbo_get_minmax_index(struct gl_context *ctx,
 		     const struct _mesa_index_buffer *ib,
 		     GLuint *min_index, GLuint *max_index)
 {
-   GLuint i;
-   GLuint count = prim->count;
+   const GLboolean restart = ctx->Array.PrimitiveRestart;
+   const GLuint restartIndex = ctx->Array.RestartIndex;
+   const GLuint count = prim->count;
    const void *indices;
+   GLuint i;
 
    if (_mesa_is_bufferobj(ib->obj)) {
       const GLvoid *map =
@@ -64,11 +68,21 @@ vbo_get_minmax_index(struct gl_context *ctx,
    switch (ib->type) {
    case GL_UNSIGNED_INT: {
       const GLuint *ui_indices = (const GLuint *)indices;
-      GLuint max_ui = ui_indices[count-1];
-      GLuint min_ui = ui_indices[0];
-      for (i = 0; i < count; i++) {
-	 if (ui_indices[i] > max_ui) max_ui = ui_indices[i];
-	 if (ui_indices[i] < min_ui) min_ui = ui_indices[i];
+      GLuint max_ui = 0;
+      GLuint min_ui = ~0U;
+      if (restart) {
+         for (i = 0; i < count; i++) {
+            if (ui_indices[i] != restartIndex) {
+               if (ui_indices[i] > max_ui) max_ui = ui_indices[i];
+               if (ui_indices[i] < min_ui) min_ui = ui_indices[i];
+            }
+         }
+      }
+      else {
+         for (i = 0; i < count; i++) {
+            if (ui_indices[i] > max_ui) max_ui = ui_indices[i];
+            if (ui_indices[i] < min_ui) min_ui = ui_indices[i];
+         }
       }
       *min_index = min_ui;
       *max_index = max_ui;
@@ -76,11 +90,21 @@ vbo_get_minmax_index(struct gl_context *ctx,
    }
    case GL_UNSIGNED_SHORT: {
       const GLushort *us_indices = (const GLushort *)indices;
-      GLuint max_us = us_indices[count-1];
-      GLuint min_us = us_indices[0];
-      for (i = 0; i < count; i++) {
-	 if (us_indices[i] > max_us) max_us = us_indices[i];
-	 if (us_indices[i] < min_us) min_us = us_indices[i];
+      GLuint max_us = 0;
+      GLuint min_us = ~0U;
+      if (restart) {
+         for (i = 0; i < count; i++) {
+            if (us_indices[i] != restartIndex) {
+               if (us_indices[i] > max_us) max_us = us_indices[i];
+               if (us_indices[i] < min_us) min_us = us_indices[i];
+            }
+         }
+      }
+      else {
+         for (i = 0; i < count; i++) {
+            if (us_indices[i] > max_us) max_us = us_indices[i];
+            if (us_indices[i] < min_us) min_us = us_indices[i];
+         }
       }
       *min_index = min_us;
       *max_index = max_us;
@@ -88,11 +112,21 @@ vbo_get_minmax_index(struct gl_context *ctx,
    }
    case GL_UNSIGNED_BYTE: {
       const GLubyte *ub_indices = (const GLubyte *)indices;
-      GLuint max_ub = ub_indices[count-1];
-      GLuint min_ub = ub_indices[0];
-      for (i = 0; i < count; i++) {
-	 if (ub_indices[i] > max_ub) max_ub = ub_indices[i];
-	 if (ub_indices[i] < min_ub) min_ub = ub_indices[i];
+      GLuint max_ub = 0;
+      GLuint min_ub = ~0U;
+      if (restart) {
+         for (i = 0; i < count; i++) {
+            if (ub_indices[i] != restartIndex) {
+               if (ub_indices[i] > max_ub) max_ub = ub_indices[i];
+               if (ub_indices[i] < min_ub) min_ub = ub_indices[i];
+            }
+         }
+      }
+      else {
+         for (i = 0; i < count; i++) {
+            if (ub_indices[i] > max_ub) max_ub = ub_indices[i];
+            if (ub_indices[i] < min_ub) min_ub = ub_indices[i];
+         }
       }
       *min_index = min_ub;
       *max_index = max_ub;
@@ -254,9 +288,11 @@ check_draw_arrays_data(struct gl_context *ctx, GLint start, GLsizei count)
  * Print info/data for glDrawArrays(), for debugging.
  */
 static void
-print_draw_arrays(struct gl_context *ctx, struct vbo_exec_context *exec,
+print_draw_arrays(struct gl_context *ctx,
                   GLenum mode, GLint start, GLsizei count)
 {
+   struct vbo_context *vbo = vbo_context(ctx);
+   struct vbo_exec_context *exec = &vbo->exec;
    int i;
 
    printf("vbo_exec_DrawArrays(mode 0x%x, start %d, count %d):\n",
@@ -471,6 +507,90 @@ bind_arrays(struct gl_context *ctx)
 }
 
 
+/**
+ * Helper function called by the other DrawArrays() functions below.
+ * This is where we handle primitive restart for drawing non-indexed
+ * arrays.  If primitive restart is enabled, it typically means
+ * splitting one DrawArrays() into two.
+ */
+static void
+vbo_draw_arrays(struct gl_context *ctx, GLenum mode, GLint start,
+                GLsizei count, GLuint numInstances)
+{
+   struct vbo_context *vbo = vbo_context(ctx);
+   struct vbo_exec_context *exec = &vbo->exec;
+   struct _mesa_prim prim[2];
+
+   bind_arrays(ctx);
+
+   /* Again... because we may have changed the bitmask of per-vertex varying
+    * attributes.  If we regenerate the fixed-function vertex program now
+    * we may be able to prune down the number of vertex attributes which we
+    * need in the shader.
+    */
+   if (ctx->NewState)
+      _mesa_update_state(ctx);
+
+   prim[0].begin = 1;
+   prim[0].end = 1;
+   prim[0].weak = 0;
+   prim[0].pad = 0;
+   prim[0].mode = mode;
+   prim[0].start = 0; /* filled in below */
+   prim[0].count = 0; /* filled in below */
+   prim[0].indexed = 0;
+   prim[0].basevertex = 0;
+   prim[0].num_instances = numInstances;
+
+   /* Implement the primitive restart index */
+   if (ctx->Array.PrimitiveRestart && ctx->Array.RestartIndex < count) {
+      GLuint primCount = 0;
+
+      if (ctx->Array.RestartIndex == start) {
+         /* special case: RestartIndex at beginning */
+         if (count > 1) {
+            prim[0].start = start + 1;
+            prim[0].count = count - 1;
+            primCount = 1;
+         }
+      }
+      else if (ctx->Array.RestartIndex == start + count - 1) {
+         /* special case: RestartIndex at end */
+         if (count > 1) {
+            prim[0].start = start;
+            prim[0].count = count - 1;
+            primCount = 1;
+         }
+      }
+      else {
+         /* general case: RestartIndex in middle, split into two prims */
+         prim[0].start = start;
+         prim[0].count = ctx->Array.RestartIndex - start;
+
+         prim[1] = prim[0];
+         prim[1].start = ctx->Array.RestartIndex + 1;
+         prim[1].count = count - prim[1].start;
+
+         primCount = 2;
+      }
+
+      if (primCount > 0) {
+         /* draw one or two prims */
+         vbo->draw_prims(ctx, exec->array.inputs, prim, primCount, NULL,
+                         GL_TRUE, start, start + count - 1);
+      }
+   }
+   else {
+      /* no prim restart */
+      prim[0].start = start;
+      prim[0].count = count;
+
+      vbo->draw_prims(ctx, exec->array.inputs, prim, 1, NULL,
+                      GL_TRUE, start, start + count - 1);
+   }
+}
+
+
 
 /**
  * Called from glDrawArrays when in immediate mode (not display list mode).
@@ -479,9 +599,6 @@ static void GLAPIENTRY
 vbo_exec_DrawArrays(GLenum mode, GLint start, GLsizei count)
 {
    GET_CURRENT_CONTEXT(ctx);
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_exec_context *exec = &vbo->exec;
-   struct _mesa_prim prim[1];
 
    if (MESA_VERBOSE & VERBOSE_DRAW)
       _mesa_debug(ctx, "glDrawArrays(%s, %d, %d)\n",
@@ -496,41 +613,13 @@ vbo_exec_DrawArrays(GLenum mode, GLint start, GLsizei count)
       return;
    }
 
-#if 0
-   check_draw_arrays_data(ctx, start, count);
-#else
-   (void) check_draw_arrays_data;
-#endif
-
-   bind_arrays( ctx );
-
-   /* Again... because we may have changed the bitmask of per-vertex varying
-    * attributes.  If we regenerate the fixed-function vertex program now
-    * we may be able to prune down the number of vertex attributes which we
-    * need in the shader.
-    */
-   if (ctx->NewState)
-      _mesa_update_state( ctx );
-
-   prim[0].begin = 1;
-   prim[0].end = 1;
-   prim[0].weak = 0;
-   prim[0].pad = 0;
-   prim[0].mode = mode;
-   prim[0].start = start;
-   prim[0].count = count;
-   prim[0].indexed = 0;
-   prim[0].basevertex = 0;
-   prim[0].num_instances = 1;
+   if (0)
+      check_draw_arrays_data(ctx, start, count);
 
-   vbo->draw_prims( ctx, exec->array.inputs, prim, 1, NULL,
-                    GL_TRUE, start, start + count - 1 );
+   vbo_draw_arrays(ctx, mode, start, count, 1);
 
-#if 0
-   print_draw_arrays(ctx, exec, mode, start, count);
-#else
-   (void) print_draw_arrays;
-#endif
+   if (0)
+      print_draw_arrays(ctx, mode, start, count);
 }
 
 
@@ -543,9 +632,6 @@ vbo_exec_DrawArraysInstanced(GLenum mode, GLint start, GLsizei count,
                              GLsizei primcount)
 {
    GET_CURRENT_CONTEXT(ctx);
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_exec_context *exec = &vbo->exec;
-   struct _mesa_prim prim[1];
 
    if (MESA_VERBOSE & VERBOSE_DRAW)
       _mesa_debug(ctx, "glDrawArraysInstanced(%s, %d, %d, %d)\n",
@@ -560,37 +646,13 @@ vbo_exec_DrawArraysInstanced(GLenum mode, GLint start, GLsizei count,
       return;
    }
 
-#if 0 /* debug */
-   check_draw_arrays_data(ctx, start, count);
-#endif
+   if (0)
+      check_draw_arrays_data(ctx, start, count);
 
-   bind_arrays( ctx );
+   vbo_draw_arrays(ctx, mode, start, count, primcount);
 
-   /* Again... because we may have changed the bitmask of per-vertex varying
-    * attributes.  If we regenerate the fixed-function vertex program now
-    * we may be able to prune down the number of vertex attributes which we
-    * need in the shader.
-    */
-   if (ctx->NewState)
-      _mesa_update_state( ctx );
-
-   prim[0].begin = 1;
-   prim[0].end = 1;
-   prim[0].weak = 0;
-   prim[0].pad = 0;
-   prim[0].mode = mode;
-   prim[0].start = start;
-   prim[0].count = count;
-   prim[0].indexed = 0;
-   prim[0].basevertex = 0;
-   prim[0].num_instances = primcount;
-
-   vbo->draw_prims( ctx, exec->array.inputs, prim, 1, NULL,
-                    GL_TRUE, start, start + count - 1 );
-
-#if 0 /* debug */
-   print_draw_arrays(ctx, exec, mode, start, count);
-#endif
+   if (0)
+      print_draw_arrays(ctx, mode, start, count);
 }
 
 
@@ -1003,6 +1065,8 @@ vbo_validated_multidrawelements(struct gl_context *ctx, GLenum mode,
    /* Check if we can handle this thing as a bunch of index offsets from the
     * same index pointer.  If we can't, then we have to fall back to doing
     * a draw_prims per primitive.
+    * Check that the difference between each prim's indexes is a multiple of
+    * the index/element size.
     */
    if (index_type_size != 1) {
       for (i = 0; i < primcount; i++) {
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 8d66e14ab3..19c4b15d5f 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -896,6 +896,18 @@ static void GLAPIENTRY _save_Begin( GLenum mode )
 }
 
 
+static void GLAPIENTRY _save_PrimitiveRestartNV( void )
+{
+   GLenum curPrim;
+   GET_CURRENT_CONTEXT( ctx ); 
+
+   curPrim = ctx->Driver.CurrentSavePrimitive;
+
+   _save_End();
+   _save_Begin(curPrim);
+}
+
+
 /* Unlike the functions above, these are to be hooked into the vtxfmt
  * maintained in ctx->ListState, active when the list is known or
  * suspected to be outside any begin/end primitive.
@@ -1003,6 +1015,7 @@ static void _save_vtxfmt_init( struct gl_context *ctx )
    vfmt->Color4fv = _save_Color4fv;
    vfmt->EdgeFlag = _save_EdgeFlag;
    vfmt->End = _save_End;
+   vfmt->PrimitiveRestartNV = _save_PrimitiveRestartNV;
    vfmt->FogCoordfEXT = _save_FogCoordfEXT;
    vfmt->FogCoordfvEXT = _save_FogCoordfvEXT;
    vfmt->Indexf = _save_Indexf;
author	Brian Paul <brianp@vmware.com>	2010-10-21 19:05:40 -0600
committer	Brian Paul <brianp@vmware.com>	2010-10-21 19:05:47 -0600
commit	69a07be3e527dbc2148a4e20c50e60266225f5f2 (patch)
tree	82583b98708fc7a6c33b471d45670e2566ed0daf /src
parent	1d91f8d9164b38b4c924f43ec4fc5ceb65c96a78 (diff)
parent	b2d4dfe5cc5b24743175bf35285dfc57f86bc09d (diff)