From 92033a9516942d7272ce4bf36ecd422009bbaf60 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 31 Aug 2009 08:50:15 -0600
Subject: mesa: new assertions, comments about buffer mapping

Since ctx->Driver.MapBuffer() and ctx->Driver.MapBufferRange() may be called
from other places in Mesa (such as VBO) it's important that the driver
callbacks set all the buffer object fields properly (Pointer, Offset, Length,
etc).  Add assertions to make sure that the driver does that.
---
 src/mesa/main/bufferobj.c | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index f96185a4b5..715a6e650b 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1165,6 +1165,8 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object * bufObj;
    GLbitfield accessFlags;
+   void *map;
+
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
 
    switch (access) {
@@ -1197,14 +1199,21 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
    }
 
    ASSERT(ctx->Driver.MapBuffer);
-   bufObj->Pointer = ctx->Driver.MapBuffer( ctx, target, access, bufObj );
-   if (!_mesa_bufferobj_mapped(bufObj)) {
+   map = ctx->Driver.MapBuffer( ctx, target, access, bufObj );
+   if (!map) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(access)");
    }
 
-   bufObj->AccessFlags = accessFlags;
-   bufObj->Offset = 0;
-   bufObj->Length = bufObj->Size;
+   if (map) {
+      /* The driver callback should have set these fields.
+       * This is important because other modules (like VBO) might call
+       * the driver function directly.
+       */
+      ASSERT(bufObj->Pointer == map);
+      ASSERT(bufObj->Length == bufObj->Size);
+      ASSERT(bufObj->Offset == 0);
+      bufObj->AccessFlags = accessFlags;
+   }
 
    if (access == GL_WRITE_ONLY_ARB || access == GL_READ_WRITE_ARB)
       bufObj->Written = GL_TRUE;
@@ -1455,6 +1464,8 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object *bufObj;
+   void *map;
+
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
 
    if (!ctx->Extensions.ARB_map_buffer_range) {
@@ -1518,14 +1529,20 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
    }
       
    ASSERT(ctx->Driver.MapBufferRange);
-   bufObj->Pointer = ctx->Driver.MapBufferRange(ctx, target, offset, length,
-                                                access, bufObj);
-
-   bufObj->Offset = offset;
-   bufObj->Length = length;
-   bufObj->AccessFlags = access;
+   map = ctx->Driver.MapBufferRange(ctx, target, offset, length,
+                                    access, bufObj);
+   if (map) {
+      /* The driver callback should have set all these fields.
+       * This is important because other modules (like VBO) might call
+       * the driver function directly.
+       */
+      ASSERT(bufObj->Pointer == map);
+      ASSERT(bufObj->Length == length);
+      ASSERT(bufObj->Offset == offset);
+      ASSERT(bufObj->AccessFlags == access);
+   }
 
-   return bufObj->Pointer;
+   return map;
 }
 
 
-- 
cgit v1.2.3


From 822c7964819ca1fcc270880d4ca8b3de8a4276d0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 31 Aug 2009 08:59:38 -0600
Subject: mesa: additional assertions for ctx->Driver.UnmapBuffer()

The Pointer, Offset and Lenght fields should be cleared by the driver function
since ctx->Driver.Unmap() may be called from VBO code, etc.
---
 src/mesa/main/bufferobj.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 715a6e650b..3fd1d17ff9 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -484,6 +484,9 @@ _mesa_buffer_unmap( GLcontext *ctx, GLenum target,
    (void) target;
    /* XXX we might assert here that bufObj->Pointer is non-null */
    bufObj->Pointer = NULL;
+   bufObj->Length = 0;
+   bufObj->Offset = 0;
+   bufObj->AccessFlags = 0x0;
    return GL_TRUE;
 }
 
@@ -1095,7 +1098,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
       /* Unmap the existing buffer.  We'll replace it now.  Not an error. */
       ctx->Driver.UnmapBuffer(ctx, target, bufObj);
       bufObj->AccessFlags = DEFAULT_ACCESS;
-      bufObj->Pointer = NULL;
+      ASSERT(bufObj->Pointer == NULL);
    }  
 
    FLUSH_VERTICES(ctx, _NEW_BUFFER_OBJECT);
@@ -1304,9 +1307,9 @@ _mesa_UnmapBufferARB(GLenum target)
 
    status = ctx->Driver.UnmapBuffer( ctx, target, bufObj );
    bufObj->AccessFlags = DEFAULT_ACCESS;
-   bufObj->Pointer = NULL;
-   bufObj->Offset = 0;
-   bufObj->Length = 0;
+   ASSERT(bufObj->Pointer == NULL);
+   ASSERT(bufObj->Offset == 0);
+   ASSERT(bufObj->Length == 0);
 
    return status;
 }
-- 
cgit v1.2.3


From d1da8acd82190542cef7ffea41517974c0c9cc25 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 31 Aug 2009 09:05:28 -0600
Subject: mesa: set Length/Offset fields in _mesa_buffer_map()

---
 src/mesa/main/bufferobj.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 3fd1d17ff9..165eec019a 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -428,6 +428,8 @@ _mesa_buffer_map( GLcontext *ctx, GLenum target, GLenum access,
       return NULL;
    }
    bufObj->Pointer = bufObj->Data;
+   bufObj->Length = bufObj->Size;
+   bufObj->Offset = 0;
    return bufObj->Pointer;
 }
 
-- 
cgit v1.2.3


From 2b6ab615a42bd162b4a870218a5951ca32416c20 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 31 Aug 2009 09:12:04 -0600
Subject: mesa: set additional fields in _mesa_buffer_map_range()

---
 src/mesa/main/bufferobj.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 165eec019a..ebca798635 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -445,11 +445,13 @@ _mesa_buffer_map_range( GLcontext *ctx, GLenum target, GLintptr offset,
 {
    (void) ctx;
    (void) target;
-   (void) access;
-   (void) length;
    assert(!_mesa_bufferobj_mapped(bufObj));
    /* Just return a direct pointer to the data */
-   return bufObj->Data + offset;
+   bufObj->Pointer = bufObj->Data + offset;
+   bufObj->Length = length;
+   bufObj->Offset = offset;
+   bufObj->AccessFlags = access;
+   return bufObj->Pointer;
 }
 
 
-- 
cgit v1.2.3


From 956e6c3978abe918348377cf05e5c92971e50d3f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 31 Aug 2009 11:14:16 -0600
Subject: mesa: fix saturation logic in emit_texenv()

We need to clamp/saturate after each texenv stage, not just the last one.
Fixes glean texEnv failure for softpipe (and probably other fragment program-
based drivers).
---
 src/mesa/main/texenvprogram.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 3736138b9e..847db5cfb6 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1113,7 +1113,7 @@ static struct ureg
 emit_texenv(struct texenv_fragment_program *p, GLuint unit)
 {
    struct state_key *key = p->state;
-   GLboolean saturate = (unit < p->last_tex_stage);
+   GLboolean saturate;
    GLuint rgb_shift, alpha_shift;
    struct ureg out, shift;
    struct ureg dest;
@@ -1141,6 +1141,11 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
       break;
    }
    
+   /* If we'll do rgb/alpha shifting don't saturate in emit_combine().
+    * We don't want to clamp twice.
+    */
+   saturate = !(rgb_shift || alpha_shift);
+
    /* If this is the very last calculation, emit direct to output reg:
     */
    if (key->separate_specular ||
@@ -1189,6 +1194,7 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
    /* Deal with the final shift:
     */
    if (alpha_shift || rgb_shift) {
+      saturate = GL_TRUE;  /* always saturate at this point */
       if (rgb_shift == alpha_shift) {
 	 shift = register_scalar_const(p, (GLfloat)(1<<rgb_shift));
       }
-- 
cgit v1.2.3


From a5e7003565a021ceb82a8b16f4a0ecc7cc6c02e0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 31 Aug 2009 11:17:59 -0600
Subject: mesa: added const qualifiers, move local var

---
 src/mesa/main/texenvprogram.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 847db5cfb6..3e5d65c875 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -952,7 +952,7 @@ static struct ureg emit_combine_source( struct texenv_fragment_program *p,
    }
 }
 
-static GLboolean args_match( struct state_key *key, GLuint unit )
+static GLboolean args_match( const struct state_key *key, GLuint unit )
 {
    GLuint i, nr = key->unit[unit].NumArgsRGB;
 
@@ -1112,11 +1112,10 @@ static struct ureg emit_combine( struct texenv_fragment_program *p,
 static struct ureg
 emit_texenv(struct texenv_fragment_program *p, GLuint unit)
 {
-   struct state_key *key = p->state;
+   const struct state_key *key = p->state;
    GLboolean saturate;
    GLuint rgb_shift, alpha_shift;
-   struct ureg out, shift;
-   struct ureg dest;
+   struct ureg out, dest;
 
    if (!key->unit[unit].enabled) {
       return get_source(p, SRC_PREVIOUS, 0);
@@ -1168,7 +1167,6 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
    }
    else if (key->unit[unit].ModeRGB == MODE_DOT3_RGBA_EXT ||
 	    key->unit[unit].ModeRGB == MODE_DOT3_RGBA) {
-
       out = emit_combine( p, dest, WRITEMASK_XYZW, saturate,
 			  unit,
 			  key->unit[unit].NumArgsRGB,
@@ -1194,7 +1192,10 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
    /* Deal with the final shift:
     */
    if (alpha_shift || rgb_shift) {
+      struct ureg shift;
+
       saturate = GL_TRUE;  /* always saturate at this point */
+
       if (rgb_shift == alpha_shift) {
 	 shift = register_scalar_const(p, (GLfloat)(1<<rgb_shift));
       }
@@ -1294,7 +1295,7 @@ static GLboolean load_texenv_source( struct texenv_fragment_program *p,
 static GLboolean
 load_texunit_sources( struct texenv_fragment_program *p, int unit )
 {
-   struct state_key *key = p->state;
+   const struct state_key *key = p->state;
    GLuint i;
 
    for (i = 0; i < key->unit[unit].NumArgsRGB; i++) {
@@ -1314,7 +1315,7 @@ load_texunit_sources( struct texenv_fragment_program *p, int unit )
 static GLboolean
 load_texunit_bumpmap( struct texenv_fragment_program *p, int unit )
 {
-   struct state_key *key = p->state;
+   const struct state_key *key = p->state;
    GLuint bumpedUnitNr = key->unit[unit].OptRGB[1].Source - SRC_TEXTURE0;
    struct ureg texcDst, bumpMapRes;
    struct ureg constdudvcolor = register_const4f(p, 0.0, 0.0, 0.0, 1.0);
-- 
cgit v1.2.3


From 10d81f466794c61c11225c94b2125bf2dd23748e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 31 Aug 2009 19:26:00 -0600
Subject: mesa: added _mesa_is_stencil_format()

---
 src/mesa/main/image.c | 16 ++++++++++++++++
 src/mesa/main/image.h |  3 +++
 2 files changed, 19 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index d77c593ac7..006a55116b 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -688,6 +688,22 @@ _mesa_is_depth_format(GLenum format)
 }
 
 
+/**
+ * Test if the given image format is a stencil format.
+ */
+GLboolean
+_mesa_is_stencil_format(GLenum format)
+{
+   switch (format) {
+      case GL_STENCIL_INDEX:
+      case GL_DEPTH_STENCIL:
+         return GL_TRUE;
+      default:
+         return GL_FALSE;
+   }
+}
+
+
 /**
  * Test if the given image format is a YCbCr format.
  */
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index 20459a5f1e..a082f37457 100644
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -63,6 +63,9 @@ _mesa_is_index_format(GLenum format);
 extern GLboolean
 _mesa_is_depth_format(GLenum format);
 
+extern GLboolean
+_mesa_is_stencil_format(GLenum format);
+
 extern GLboolean
 _mesa_is_ycbcr_format(GLenum format);
 
-- 
cgit v1.2.3


From d55a28e3dc712342e4a2f25aa9b661add7461e82 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 15:34:16 -0600
Subject: mesa: replace 8 with MAX_TEXTURE_UNITS

---
 src/mesa/main/texenvprogram.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 3e5d65c875..f19bb99300 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -109,7 +109,7 @@ struct state_key {
       GLuint NumArgsA:3;
       GLuint ModeA:5;
       struct mode_opt OptA[MAX_COMBINER_TERMS];
-   } unit[8];
+   } unit[MAX_TEXTURE_UNITS];
 };
 
 #define FOG_LINEAR  0
-- 
cgit v1.2.3


From f337e2c4954b4779dcf2c2b4e0e068cb3ed7b841 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 15:49:55 -0600
Subject: mesa: minor code clean-ups, comments

---
 src/mesa/main/texenvprogram.c | 58 +++++++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 24 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index f19bb99300..0898581485 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -83,8 +83,8 @@ texenv_doing_secondary_color(GLcontext *ctx)
 #define DISASSEM (MESA_VERBOSE & VERBOSE_DISASSEM)
 
 struct mode_opt {
-   GLuint Source:4;
-   GLuint Operand:3;
+   GLuint Source:4;  /**< SRC_x */
+   GLuint Operand:3; /**< OPR_x */
 };
 
 struct state_key {
@@ -103,11 +103,11 @@ struct state_key {
       GLuint ScaleShiftA:2;
 
       GLuint NumArgsRGB:3;
-      GLuint ModeRGB:5;
+      GLuint ModeRGB:5;     /**< MODE_x */
       struct mode_opt OptRGB[MAX_COMBINER_TERMS];
 
       GLuint NumArgsA:3;
-      GLuint ModeA:5;
+      GLuint ModeA:5;     /**< MODE_x */
       struct mode_opt OptA[MAX_COMBINER_TERMS];
    } unit[MAX_TEXTURE_UNITS];
 };
@@ -240,7 +240,12 @@ static GLuint translate_mode( GLenum envMode, GLenum mode )
    }
 }
 
+
 #define TEXTURE_UNKNOWN_INDEX 7
+
+/**
+ * Translate TEXTURE_x_BIT to TEXTURE_x_INDEX.
+ */
 static GLuint translate_tex_src_bit( GLbitfield bit )
 {
    /* make sure number of switch cases is correct */
@@ -259,6 +264,7 @@ static GLuint translate_tex_src_bit( GLbitfield bit )
    }
 }
 
+
 #define VERT_BIT_TEX_ANY    (0xff << VERT_ATTRIB_TEX0)
 #define VERT_RESULT_TEX_ANY (0xff << VERT_RESULT_TEX0)
 
@@ -375,51 +381,50 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
 {
    GLuint i, j;
    GLbitfield inputs_referenced = FRAG_BIT_COL0;
-   GLbitfield inputs_available = get_fp_input_mask( ctx );
+   const GLbitfield inputs_available = get_fp_input_mask( ctx );
 
    memset(key, 0, sizeof(*key));
 
    /* _NEW_TEXTURE */
    for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
       const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i];
+      const struct gl_texture_object *texObj = texUnit->_Current;
+      const struct gl_tex_env_combine_state *comb = texUnit->_CurrentCombine;
       GLenum format;
 
       if (!texUnit->_ReallyEnabled || !texUnit->Enabled)
          continue;
 
-      format = texUnit->_Current->Image[0][texUnit->_Current->BaseLevel]->_BaseFormat;
+      format = texObj->Image[0][texObj->BaseLevel]->_BaseFormat;
 
       key->unit[i].enabled = 1;
       key->enabled_units |= (1<<i);
       key->nr_enabled_units = i+1;
       inputs_referenced |= FRAG_BIT_TEX(i);
 
-      key->unit[i].source_index = 
-	 translate_tex_src_bit(texUnit->_ReallyEnabled);		
-      key->unit[i].shadow = ((texUnit->_Current->CompareMode == GL_COMPARE_R_TO_TEXTURE) && 
+      key->unit[i].source_index =
+         translate_tex_src_bit(texUnit->_ReallyEnabled);
+
+      key->unit[i].shadow = ((texObj->CompareMode == GL_COMPARE_R_TO_TEXTURE) &&
                              ((format == GL_DEPTH_COMPONENT) || 
                               (format == GL_DEPTH_STENCIL_EXT)));
 
-      key->unit[i].NumArgsRGB = texUnit->_CurrentCombine->_NumArgsRGB;
-      key->unit[i].NumArgsA = texUnit->_CurrentCombine->_NumArgsA;
+      key->unit[i].NumArgsRGB = comb->_NumArgsRGB;
+      key->unit[i].NumArgsA = comb->_NumArgsA;
 
       key->unit[i].ModeRGB =
-	 translate_mode(texUnit->EnvMode, texUnit->_CurrentCombine->ModeRGB);
+	 translate_mode(texUnit->EnvMode, comb->ModeRGB);
       key->unit[i].ModeA =
-	 translate_mode(texUnit->EnvMode, texUnit->_CurrentCombine->ModeA);
+	 translate_mode(texUnit->EnvMode, comb->ModeA);
 
-      key->unit[i].ScaleShiftRGB = texUnit->_CurrentCombine->ScaleShiftRGB;
-      key->unit[i].ScaleShiftA = texUnit->_CurrentCombine->ScaleShiftA;
+      key->unit[i].ScaleShiftRGB = comb->ScaleShiftRGB;
+      key->unit[i].ScaleShiftA = comb->ScaleShiftA;
 
       for (j = 0; j < MAX_COMBINER_TERMS; j++) {
-         key->unit[i].OptRGB[j].Operand =
-	    translate_operand(texUnit->_CurrentCombine->OperandRGB[j]);
-         key->unit[i].OptA[j].Operand =
-	    translate_operand(texUnit->_CurrentCombine->OperandA[j]);
-         key->unit[i].OptRGB[j].Source =
-	    translate_source(texUnit->_CurrentCombine->SourceRGB[j]);
-         key->unit[i].OptA[j].Source =
-	    translate_source(texUnit->_CurrentCombine->SourceA[j]);
+         key->unit[i].OptRGB[j].Operand = translate_operand(comb->OperandRGB[j]);
+         key->unit[i].OptA[j].Operand = translate_operand(comb->OperandA[j]);
+         key->unit[i].OptRGB[j].Source = translate_source(comb->SourceRGB[j]);
+         key->unit[i].OptA[j].Source = translate_source(comb->SourceA[j]);
       }
 
       if (key->unit[i].ModeRGB == MODE_BUMP_ENVMAP_ATI) {
@@ -952,6 +957,11 @@ static struct ureg emit_combine_source( struct texenv_fragment_program *p,
    }
 }
 
+/**
+ * Check if the RGB and Alpha sources and operands match for the given
+ * texture unit's combinder state.  When the RGB and A sources and
+ * operands match, we can emit fewer instructions.
+ */
 static GLboolean args_match( const struct state_key *key, GLuint unit )
 {
    GLuint i, nr = key->unit[unit].NumArgsRGB;
@@ -1234,7 +1244,7 @@ static void load_texture( struct texenv_fragment_program *p, GLuint unit )
 
       if (texTarget == TEXTURE_UNKNOWN_INDEX)
          program_error(p, "TexSrcBit");
-			  
+
       /* TODO: Use D0_MASK_XY where possible.
        */
       if (p->state->unit[unit].enabled) {
-- 
cgit v1.2.3


From b5ec0a68589c5d8f0d4be2556ea6d6b01fd4e37d Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 15:51:23 -0600
Subject: mesa: simplify translate_tex_src_bit()

---
 src/mesa/main/texenvprogram.c | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 0898581485..ea0aa448e1 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -241,27 +241,13 @@ static GLuint translate_mode( GLenum envMode, GLenum mode )
 }
 
 
-#define TEXTURE_UNKNOWN_INDEX 7
-
 /**
  * Translate TEXTURE_x_BIT to TEXTURE_x_INDEX.
  */
 static GLuint translate_tex_src_bit( GLbitfield bit )
 {
-   /* make sure number of switch cases is correct */
-   assert(NUM_TEXTURE_TARGETS == 7);
-   switch (bit) {
-   case TEXTURE_1D_BIT:   return TEXTURE_1D_INDEX;
-   case TEXTURE_2D_BIT:   return TEXTURE_2D_INDEX;
-   case TEXTURE_RECT_BIT: return TEXTURE_RECT_INDEX;
-   case TEXTURE_3D_BIT:   return TEXTURE_3D_INDEX;
-   case TEXTURE_CUBE_BIT: return TEXTURE_CUBE_INDEX;
-   case TEXTURE_1D_ARRAY_BIT: return TEXTURE_1D_ARRAY_INDEX;
-   case TEXTURE_2D_ARRAY_BIT: return TEXTURE_2D_ARRAY_INDEX;
-   default:
-      assert(0);
-      return TEXTURE_UNKNOWN_INDEX;
-   }
+   ASSERT(bit);
+   return _mesa_ffs(bit) - 1;
 }
 
 
@@ -1230,7 +1216,7 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
 static void load_texture( struct texenv_fragment_program *p, GLuint unit )
 {
    if (is_undef(p->src_texture[unit])) {
-      GLuint texTarget = p->state->unit[unit].source_index;
+      const GLuint texTarget = p->state->unit[unit].source_index;
       struct ureg texcoord;
       struct ureg tmp = get_tex_temp( p );
 
@@ -1242,9 +1228,6 @@ static void load_texture( struct texenv_fragment_program *p, GLuint unit )
          texcoord = p->texcoord_tex[unit];
       }
 
-      if (texTarget == TEXTURE_UNKNOWN_INDEX)
-         program_error(p, "TexSrcBit");
-
       /* TODO: Use D0_MASK_XY where possible.
        */
       if (p->state->unit[unit].enabled) {
-- 
cgit v1.2.3


From 9ed0315271c38f5fe9cdd65020a54cbb7f61ed2b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 15:57:36 -0600
Subject: mesa: more comments, clean-ups

---
 src/mesa/main/texenvprogram.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index ea0aa448e1..54960a1fa1 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -92,21 +92,21 @@ struct state_key {
    GLuint enabled_units:8;
    GLuint separate_specular:1;
    GLuint fog_enabled:1;
-   GLuint fog_mode:2;
+   GLuint fog_mode:2;          /**< FOG_x */
    GLuint inputs_available:12;
 
    struct {
       GLuint enabled:1;
-      GLuint source_index:3;   /* one of TEXTURE_1D/2D/3D/CUBE/RECT_INDEX */
+      GLuint source_index:3;   /**< TEXTURE_x_INDEX */
       GLuint shadow:1;
       GLuint ScaleShiftRGB:2;
       GLuint ScaleShiftA:2;
 
-      GLuint NumArgsRGB:3;
+      GLuint NumArgsRGB:3;  /**< up to MAX_COMBINER_TERMS */
       GLuint ModeRGB:5;     /**< MODE_x */
       struct mode_opt OptRGB[MAX_COMBINER_TERMS];
 
-      GLuint NumArgsA:3;
+      GLuint NumArgsA:3;  /**< up to MAX_COMBINER_TERMS */
       GLuint ModeA:5;     /**< MODE_x */
       struct mode_opt OptA[MAX_COMBINER_TERMS];
    } unit[MAX_TEXTURE_UNITS];
@@ -705,7 +705,7 @@ emit_op(struct texenv_fragment_program *p,
 	struct ureg src1,
 	struct ureg src2 )
 {
-   GLuint nr = p->program->Base.NumInstructions++;
+   const GLuint nr = p->program->Base.NumInstructions++;
    struct prog_instruction *inst = &p->program->Base.Instructions[nr];
 
    assert(nr < MAX_INSTRUCTIONS);
@@ -950,15 +950,15 @@ static struct ureg emit_combine_source( struct texenv_fragment_program *p,
  */
 static GLboolean args_match( const struct state_key *key, GLuint unit )
 {
-   GLuint i, nr = key->unit[unit].NumArgsRGB;
+   GLuint i, numArgs = key->unit[unit].NumArgsRGB;
 
-   for (i = 0 ; i < nr ; i++) {
+   for (i = 0 ; i < numArgs ; i++) {
       if (key->unit[unit].OptA[i].Source != key->unit[unit].OptRGB[i].Source) 
 	 return GL_FALSE;
 
-      switch(key->unit[unit].OptA[i].Operand) {
+      switch (key->unit[unit].OptA[i].Operand) {
       case OPR_SRC_ALPHA: 
-	 switch(key->unit[unit].OptRGB[i].Operand) {
+	 switch (key->unit[unit].OptRGB[i].Operand) {
 	 case OPR_SRC_COLOR: 
 	 case OPR_SRC_ALPHA: 
 	    break;
@@ -967,7 +967,7 @@ static GLboolean args_match( const struct state_key *key, GLuint unit )
 	 }
 	 break;
       case OPR_ONE_MINUS_SRC_ALPHA: 
-	 switch(key->unit[unit].OptRGB[i].Operand) {
+	 switch (key->unit[unit].OptRGB[i].Operand) {
 	 case OPR_ONE_MINUS_SRC_COLOR: 
 	 case OPR_ONE_MINUS_SRC_ALPHA: 
 	    break;
-- 
cgit v1.2.3


From c7ba2b8622d8a924b3ac4c7d94a3c19d12e88e03 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 15:58:49 -0600
Subject: mesa: remove unused ureg:negateabs field

---
 src/mesa/main/texenvprogram.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 54960a1fa1..869d8d026b 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -458,9 +458,8 @@ struct ureg {
    GLuint idx:8;
    GLuint negatebase:1;
    GLuint abs:1;
-   GLuint negateabs:1;
    GLuint swz:12;
-   GLuint pad:5;
+   GLuint pad:6;
 };
 
 static const struct ureg undef = { 
@@ -469,7 +468,6 @@ static const struct ureg undef = {
    0,
    0,
    0,
-   0,
    0
 };
 
@@ -516,7 +514,6 @@ static struct ureg make_ureg(GLuint file, GLuint idx)
    reg.idx = idx;
    reg.negatebase = 0;
    reg.abs = 0;
-   reg.negateabs = 0;
    reg.swz = SWIZZLE_NOOP;
    reg.pad = 0;
    return reg;
-- 
cgit v1.2.3


From 1480bcacfec8f215c5827278a5f984c6bf68ba69 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 16:01:12 -0600
Subject: mesa: remove unused ureg::abs field

---
 src/mesa/main/texenvprogram.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 869d8d026b..8c588538b1 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -457,9 +457,8 @@ struct ureg {
    GLuint file:4;
    GLuint idx:8;
    GLuint negatebase:1;
-   GLuint abs:1;
    GLuint swz:12;
-   GLuint pad:6;
+   GLuint pad:7;
 };
 
 static const struct ureg undef = { 
@@ -467,7 +466,6 @@ static const struct ureg undef = {
    ~0,
    0,
    0,
-   0,
    0
 };
 
@@ -513,7 +511,6 @@ static struct ureg make_ureg(GLuint file, GLuint idx)
    reg.file = file;
    reg.idx = idx;
    reg.negatebase = 0;
-   reg.abs = 0;
    reg.swz = SWIZZLE_NOOP;
    reg.pad = 0;
    return reg;
@@ -679,7 +676,7 @@ static void emit_arg( struct prog_src_register *reg,
    reg->Index = ureg.idx;
    reg->Swizzle = ureg.swz;
    reg->Negate = ureg.negatebase ? NEGATE_XYZW : NEGATE_NONE;
-   reg->Abs = ureg.abs;
+   reg->Abs = GL_FALSE;
 }
 
 static void emit_dst( struct prog_dst_register *dst,
-- 
cgit v1.2.3


From 95136694ab28829f75c0a9f955a79836a0c433c7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 16:03:28 -0600
Subject: mesa: remove unused texenv_fragment_program::ctx field

---
 src/mesa/main/texenvprogram.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 8c588538b1..5c61c97354 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -474,7 +474,6 @@ static const struct ureg undef = {
  */
 struct texenv_fragment_program {
    struct gl_fragment_program *program;
-   GLcontext *ctx;
    struct state_key *state;
 
    GLbitfield alu_temps;	/**< Track texture indirections, see spec. */
@@ -1345,7 +1344,6 @@ create_new_program(GLcontext *ctx, struct state_key *key,
    struct ureg cf, out;
 
    _mesa_memset(&p, 0, sizeof(p));
-   p.ctx = ctx;
    p.state = key;
    p.program = program;
 
-- 
cgit v1.2.3


From 25e5a6f279cec0863dcc341805aa7ca71189b626 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 16:05:07 -0600
Subject: mesa: updated #includes

---
 src/mesa/main/texenvprogram.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 5c61c97354..7efb10c5a0 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -27,8 +27,7 @@
  **************************************************************************/
 
 #include "glheader.h"
-#include "macros.h"
-#include "enums.h"
+#include "imports.h"
 #include "shader/program.h"
 #include "shader/prog_parameter.h"
 #include "shader/prog_cache.h"
-- 
cgit v1.2.3


From 84d6bed4d6844110af23a995e2fad0280a92d46c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 16:10:57 -0600
Subject: mesa: change conditional to match the previous one

---
 src/mesa/main/texenvprogram.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 7efb10c5a0..b316c25809 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1401,7 +1401,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
       /* Second pass - emit combine instructions to build final color:
        */
       for (unit = 0 ; unit < ctx->Const.MaxTextureUnits; unit++)
-	 if (key->enabled_units & (1<<unit)) {
+	 if (key->unit[unit].enabled) {
 	    p.src_previous = emit_texenv( &p, unit );
             reserve_temp(&p, p.src_previous); /* don't re-use this temp reg */
 	    release_temps(ctx, &p);	/* release all temps */
-- 
cgit v1.2.3


From 457e427e32324884acb064b756e327dc131ff135 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 16:22:02 -0600
Subject: mesa: more clean-ups

---
 src/mesa/main/texenvprogram.c | 55 ++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index b316c25809..5913957969 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -944,7 +944,7 @@ static GLboolean args_match( const struct state_key *key, GLuint unit )
 {
    GLuint i, numArgs = key->unit[unit].NumArgsRGB;
 
-   for (i = 0 ; i < numArgs ; i++) {
+   for (i = 0; i < numArgs; i++) {
       if (key->unit[unit].OptA[i].Source != key->unit[unit].OptRGB[i].Source) 
 	 return GL_FALSE;
 
@@ -1278,7 +1278,7 @@ static GLboolean load_texenv_source( struct texenv_fragment_program *p,
  * Generate instructions for loading all texture source terms.
  */
 static GLboolean
-load_texunit_sources( struct texenv_fragment_program *p, int unit )
+load_texunit_sources( struct texenv_fragment_program *p, GLuint unit )
 {
    const struct state_key *key = p->state;
    GLuint i;
@@ -1298,7 +1298,7 @@ load_texunit_sources( struct texenv_fragment_program *p, int unit )
  * Generate instructions for loading bump map textures.
  */
 static GLboolean
-load_texunit_bumpmap( struct texenv_fragment_program *p, int unit )
+load_texunit_bumpmap( struct texenv_fragment_program *p, GLuint unit )
 {
    const struct state_key *key = p->state;
    GLuint bumpedUnitNr = key->unit[unit].OptRGB[1].Source - SRC_TEXTURE0;
@@ -1314,17 +1314,20 @@ load_texunit_bumpmap( struct texenv_fragment_program *p, int unit )
    texcDst = get_tex_temp( p );
    p->texcoord_tex[bumpedUnitNr] = texcDst;
 
-   /* apply rot matrix and add coords to be available in next phase */
-   /* dest = (Arg0.xxxx * rotMat0 + Arg1) + (Arg0.yyyy * rotMat1) */
-   /* note only 2 coords are affected the rest are left unchanged (mul by 0) */
+   /* Apply rot matrix and add coords to be available in next phase.
+    * dest = (Arg0.xxxx * rotMat0 + Arg1) + (Arg0.yyyy * rotMat1)
+    * note only 2 coords are affected the rest are left unchanged (mul by 0)
+    */
    emit_arith( p, OPCODE_MAD, texcDst, WRITEMASK_XYZW, 0,
                swizzle1(bumpMapRes, SWIZZLE_X), rotMat0, texcSrc );
    emit_arith( p, OPCODE_MAD, texcDst, WRITEMASK_XYZW, 0,
                swizzle1(bumpMapRes, SWIZZLE_Y), rotMat1, texcDst );
 
-   /* move 0,0,0,1 into bumpmap src if someone (crossbar) is foolish
-      enough to access this later, should optimize away */
-   emit_arith( p, OPCODE_MOV, bumpMapRes, WRITEMASK_XYZW, 0, constdudvcolor, undef, undef );
+   /* Move 0,0,0,1 into bumpmap src if someone (crossbar) is foolish
+    * enough to access this later, should optimize away.
+    */
+   emit_arith( p, OPCODE_MOV, bumpMapRes, WRITEMASK_XYZW, 0,
+               constdudvcolor, undef, undef );
 
    return GL_TRUE;
 }
@@ -1351,17 +1354,17 @@ create_new_program(GLcontext *ctx, struct state_key *key,
     */
    p.program->Base.Instructions = instBuffer;
    p.program->Base.Target = GL_FRAGMENT_PROGRAM_ARB;
-   p.program->Base.NumTexIndirections = 1;
+   p.program->Base.String = NULL;
+   p.program->Base.NumTexIndirections = 1; /* is this right? */
    p.program->Base.NumTexInstructions = 0;
    p.program->Base.NumAluInstructions = 0;
-   p.program->Base.String = NULL;
-   p.program->Base.NumInstructions =
-   p.program->Base.NumTemporaries =
-   p.program->Base.NumParameters =
-   p.program->Base.NumAttributes = p.program->Base.NumAddressRegs = 0;
+   p.program->Base.NumInstructions = 0;
+   p.program->Base.NumTemporaries = 0;
+   p.program->Base.NumParameters = 0;
+   p.program->Base.NumAttributes = 0;
+   p.program->Base.NumAddressRegs = 0;
    p.program->Base.Parameters = _mesa_new_parameter_list();
-
-   p.program->Base.InputsRead = 0;
+   p.program->Base.InputsRead = 0x0;
    p.program->Base.OutputsWritten = 1 << FRAG_RESULT_COLOR;
 
    for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++) {
@@ -1378,10 +1381,12 @@ create_new_program(GLcontext *ctx, struct state_key *key,
    release_temps(ctx, &p);
 
    if (key->enabled_units) {
-       GLboolean needbumpstage = GL_FALSE;
+      GLboolean needbumpstage = GL_FALSE;
+
       /* Zeroth pass - bump map textures first */
-      for (unit = 0 ; unit < ctx->Const.MaxTextureUnits ; unit++)
-	 if (key->unit[unit].enabled && key->unit[unit].ModeRGB == MODE_BUMP_ENVMAP_ATI) {
+      for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)
+	 if (key->unit[unit].enabled &&
+             key->unit[unit].ModeRGB == MODE_BUMP_ENVMAP_ATI) {
 	    needbumpstage = GL_TRUE;
 	    load_texunit_bumpmap( &p, unit );
 	 }
@@ -1392,7 +1397,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
        * all referenced texture sources and emit texld instructions
        * for each:
        */
-      for (unit = 0 ; unit < ctx->Const.MaxTextureUnits ; unit++)
+      for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)
 	 if (key->unit[unit].enabled) {
 	    load_texunit_sources( &p, unit );
 	    p.last_tex_stage = unit;
@@ -1400,7 +1405,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
 
       /* Second pass - emit combine instructions to build final color:
        */
-      for (unit = 0 ; unit < ctx->Const.MaxTextureUnits; unit++)
+      for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)
 	 if (key->unit[unit].enabled) {
 	    p.src_previous = emit_texenv( &p, unit );
             reserve_temp(&p, p.src_previous); /* don't re-use this temp reg */
@@ -1434,9 +1439,11 @@ create_new_program(GLcontext *ctx, struct state_key *key,
        * a reduced value and not what is expected in FogOption
        */
       p.program->FogOption = ctx->Fog.Mode;
-      p.program->Base.InputsRead |= FRAG_BIT_FOGC; /* XXX new */
-   } else
+      p.program->Base.InputsRead |= FRAG_BIT_FOGC;
+   }
+   else {
       p.program->FogOption = GL_NONE;
+   }
 
    if (p.program->Base.NumTexIndirections > ctx->Const.FragmentProgram.MaxTexIndirections) 
       program_error(&p, "Exceeded max nr indirect texture lookups");
-- 
cgit v1.2.3


From 921bbfc94278d6897d44d1b6ae230315e2ab6e8c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 16:26:03 -0600
Subject: mesa: remove redundant assignments

---
 src/mesa/main/texstate.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 6e0c0c688a..861c5f37c4 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -729,14 +729,7 @@ init_texture_unit( GLcontext *ctx, GLuint unit )
    ASSIGN_4V( texUnit->GenT.EyePlane, 0.0, 1.0, 0.0, 0.0 );
    ASSIGN_4V( texUnit->GenR.EyePlane, 0.0, 0.0, 0.0, 0.0 );
    ASSIGN_4V( texUnit->GenQ.EyePlane, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenS.ObjectPlane, 1.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenT.ObjectPlane, 0.0, 1.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenR.ObjectPlane, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenQ.ObjectPlane, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenS.EyePlane, 1.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenT.EyePlane, 0.0, 1.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenR.EyePlane, 0.0, 0.0, 0.0, 0.0 );
-   ASSIGN_4V( texUnit->GenQ.EyePlane, 0.0, 0.0, 0.0, 0.0 );
+
    /* no mention of this in spec, but maybe id matrix expected? */
    ASSIGN_4V( texUnit->RotMatrix, 1.0, 0.0, 0.0, 1.0 );
 
-- 
cgit v1.2.3


From 278e76832fc26678592368b7b89bfddc137e0e93 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 17:11:35 -0600
Subject: mesa: new _mesa_expand_bitmap() function

---
 src/mesa/main/image.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/image.h |  7 +++++
 2 files changed, 92 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 006a55116b..baecbab0a3 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1259,6 +1259,91 @@ _mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
 }
 
 
+/**
+ * "Expand" a bitmap from 1-bit per pixel to 8-bits per pixel.
+ * This is typically used to convert a bitmap into a GLubyte/pixel texture.
+ * "On" bits will set texels to \p onValue.
+ * "Off" bits will not modify texels.
+ * \param width  src bitmap width in pixels
+ * \param height  src bitmap height in pixels
+ * \param unpack  bitmap unpacking state
+ * \param bitmap  the src bitmap data
+ * \param destBuffer  start of dest buffer
+ * \param destStride  row stride in dest buffer
+ * \param onValue  if bit is 1, set destBuffer pixel to this value
+ */
+void
+_mesa_expand_bitmap(GLsizei width, GLsizei height,
+                    const struct gl_pixelstore_attrib *unpack,
+                    const GLubyte *bitmap,
+                    GLubyte *destBuffer, GLint destStride,
+                    GLubyte onValue)
+{
+   const GLubyte *srcRow = (const GLubyte *)
+      _mesa_image_address2d(unpack, bitmap, width, height,
+                            GL_COLOR_INDEX, GL_BITMAP, 0, 0);
+   const GLint srcStride = _mesa_image_row_stride(unpack, width,
+                                                  GL_COLOR_INDEX, GL_BITMAP);
+   GLint row, col;
+
+#define SET_PIXEL(COL, ROW) \
+   destBuffer[(ROW) * destStride + (COL)] = onValue;
+
+   for (row = 0; row < height; row++) {
+      const GLubyte *src = srcRow;
+
+      if (unpack->LsbFirst) {
+         /* Lsb first */
+         GLubyte mask = 1U << (unpack->SkipPixels & 0x7);
+         for (col = 0; col < width; col++) {
+
+            if (*src & mask) {
+               SET_PIXEL(col, row);
+            }
+
+            if (mask == 128U) {
+               src++;
+               mask = 1U;
+            }
+            else {
+               mask = mask << 1;
+            }
+         }
+
+         /* get ready for next row */
+         if (mask != 1)
+            src++;
+      }
+      else {
+         /* Msb first */
+         GLubyte mask = 128U >> (unpack->SkipPixels & 0x7);
+         for (col = 0; col < width; col++) {
+
+            if (*src & mask) {
+               SET_PIXEL(col, row);
+            }
+
+            if (mask == 1U) {
+               src++;
+               mask = 128U;
+            }
+            else {
+               mask = mask >> 1;
+            }
+         }
+
+         /* get ready for next row */
+         if (mask != 128)
+            src++;
+      }
+
+      srcRow += srcStride;
+   } /* row */
+
+#undef SET_PIXEL
+}
+
+
 /**********************************************************************/
 /*****                  Pixel processing functions               ******/
 /**********************************************************************/
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index a082f37457..72717d6787 100644
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -134,6 +134,13 @@ extern void
 _mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
                    GLubyte *dest, const struct gl_pixelstore_attrib *packing );
 
+extern void
+_mesa_expand_bitmap(GLsizei width, GLsizei height,
+                    const struct gl_pixelstore_attrib *unpack,
+                    const GLubyte *bitmap,
+                    GLubyte *destBuffer, GLint destStride,
+                    GLubyte onValue);
+
 
 /** \name Pixel processing functions */
 /*@{*/
-- 
cgit v1.2.3


From 282f578dbd790d7e5d7f371c51b72f116cda3934 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 1 Sep 2009 17:40:07 -0600
Subject: mesa: skip bitmap drawing code if width==0 or height==0

---
 src/mesa/main/drawpix.c | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 67311f71a2..aef6585641 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -264,27 +264,30 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
 
    if (ctx->RenderMode == GL_RENDER) {
       /* Truncate, to satisfy conformance tests (matches SGI's OpenGL). */
-      const GLfloat epsilon = 0.0001F;
-      GLint x = IFLOOR(ctx->Current.RasterPos[0] + epsilon - xorig);
-      GLint y = IFLOOR(ctx->Current.RasterPos[1] + epsilon - yorig);
-
-      if (ctx->Unpack.BufferObj->Name) {
-         /* unpack from PBO */
-         if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
-                                        GL_COLOR_INDEX, GL_BITMAP,
-                                        (GLvoid *) bitmap)) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glBitmap(invalid PBO access)");
-            return;
-         }
-         if (_mesa_bufferobj_mapped(ctx->Unpack.BufferObj)) {
-            /* buffer is mapped - that's an error */
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glBitmap(PBO is mapped)");
-            return;
+      if (width > 0 && height > 0) {
+         const GLfloat epsilon = 0.0001F;
+         GLint x = IFLOOR(ctx->Current.RasterPos[0] + epsilon - xorig);
+         GLint y = IFLOOR(ctx->Current.RasterPos[1] + epsilon - yorig);
+
+         if (ctx->Unpack.BufferObj->Name) {
+            /* unpack from PBO */
+            if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
+                                           GL_COLOR_INDEX, GL_BITMAP,
+                                           (GLvoid *) bitmap)) {
+               _mesa_error(ctx, GL_INVALID_OPERATION,
+                           "glBitmap(invalid PBO access)");
+               return;
+            }
+            if (_mesa_bufferobj_mapped(ctx->Unpack.BufferObj)) {
+               /* buffer is mapped - that's an error */
+               _mesa_error(ctx, GL_INVALID_OPERATION,
+                           "glBitmap(PBO is mapped)");
+               return;
+            }
          }
-      }
 
-      ctx->Driver.Bitmap( ctx, x, y, width, height, &ctx->Unpack, bitmap );
+         ctx->Driver.Bitmap( ctx, x, y, width, height, &ctx->Unpack, bitmap );
+      }
    }
 #if _HAVE_FULL_GL
    else if (ctx->RenderMode == GL_FEEDBACK) {
-- 
cgit v1.2.3


From 60b08eb1fdf287d28ec66b9282513ab35a61aee0 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Mon, 31 Aug 2009 10:13:22 -0700
Subject: mesa: Make MultiDrawElements submit multiple primitives at once.

Previously, MultiDrawElements just called DrawElements a bunch of times.
By sending several primitives down the pipeline at once, we avoid a bunch
of validation.  On my GL demo, this improves fps by 2.5% (+/- .41%) and
reduces CPU usage by 70.5% (+/- 2.9%) (n=3).

Reviewed by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/main/api_exec.c      |   1 -
 src/mesa/main/api_noop.c      |  15 ++++
 src/mesa/main/api_noop.h      |   4 ++
 src/mesa/main/dd.h            |   6 +-
 src/mesa/main/dlist.c         |  14 +---
 src/mesa/main/varray.c        |  18 -----
 src/mesa/main/vtxfmt.c        |   1 +
 src/mesa/main/vtxfmt_tmp.h    |  12 ++++
 src/mesa/vbo/vbo_exec_array.c | 157 ++++++++++++++++++++++++++++++++++++++++++
 src/mesa/vbo/vbo_save_api.c   |   5 ++
 10 files changed, 200 insertions(+), 33 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 199550b35d..cbf48615bf 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -529,7 +529,6 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    /* 148. GL_EXT_multi_draw_arrays */
 #if _HAVE_FULL_GL
    SET_MultiDrawArraysEXT(exec, _mesa_MultiDrawArraysEXT);
-   SET_MultiDrawElementsEXT(exec, _mesa_MultiDrawElementsEXT);
 #endif
 
    /* 173. GL_INGR_blend_func_separate */
diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c
index 66f9c4e6bd..09ba7e5062 100644
--- a/src/mesa/main/api_noop.c
+++ b/src/mesa/main/api_noop.c
@@ -772,6 +772,20 @@ _mesa_noop_DrawRangeElements(GLenum mode,
        CALL_DrawElements(GET_DISPATCH(), (mode, count, type, indices));
 }
 
+/* GL_EXT_multi_draw_arrays */
+void GLAPIENTRY
+_mesa_noop_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type,
+			     const GLvoid **indices, GLsizei primcount)
+{
+   GLsizei i;
+
+   for (i = 0; i < primcount; i++) {
+      if (count[i] > 0) {
+	 CALL_DrawElements(GET_DISPATCH(), (mode, count[i], type, indices[i]));
+      }
+   }
+}
+
 /*
  * Eval Mesh
  */
@@ -980,6 +994,7 @@ _mesa_noop_vtxfmt_init( GLvertexformat *vfmt )
    vfmt->DrawArrays = _mesa_noop_DrawArrays;
    vfmt->DrawElements = _mesa_noop_DrawElements;
    vfmt->DrawRangeElements = _mesa_noop_DrawRangeElements;
+   vfmt->MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
    vfmt->EvalMesh1 = _mesa_noop_EvalMesh1;
    vfmt->EvalMesh2 = _mesa_noop_EvalMesh2;
 }
diff --git a/src/mesa/main/api_noop.h b/src/mesa/main/api_noop.h
index 8bf4660800..a7956d00b3 100644
--- a/src/mesa/main/api_noop.h
+++ b/src/mesa/main/api_noop.h
@@ -40,6 +40,10 @@ _mesa_noop_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2);
 extern void GLAPIENTRY
 _mesa_noop_Materialfv(GLenum face, GLenum pname, const GLfloat *param);
 
+extern void GLAPIENTRY
+_mesa_noop_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type,
+			     const GLvoid **indices, GLsizei primcount);
+
 extern void
 _mesa_noop_vtxfmt_init(GLvertexformat *vfmt);
 
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 1d92e510a4..f02e868d4a 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -1150,7 +1150,11 @@ typedef struct {
    void (GLAPIENTRYP DrawRangeElements)( GLenum mode, GLuint start,
 			      GLuint end, GLsizei count,
 			      GLenum type, const GLvoid *indices );
-   /*@}*/
+   void (GLAPIENTRYP MultiDrawElementsEXT)( GLenum mode, const GLsizei *count,
+					    GLenum type,
+					    const GLvoid **indices,
+					    GLsizei primcount);
+  /*@}*/
 
    /**
     * \name Eval
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 9b68b3e116..8cff9ea64a 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -7751,18 +7751,6 @@ exec_MultiDrawArraysEXT(GLenum mode, GLint * first,
    CALL_MultiDrawArraysEXT(ctx->Exec, (mode, first, count, primcount));
 }
 
-/* GL_EXT_multi_draw_arrays */
-static void GLAPIENTRY
-exec_MultiDrawElementsEXT(GLenum mode, const GLsizei * count,
-                          GLenum type, const GLvoid ** indices,
-                          GLsizei primcount)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   FLUSH_VERTICES(ctx, 0);
-   CALL_MultiDrawElementsEXT(ctx->Exec,
-                             (mode, count, type, indices, primcount));
-}
-
 /* GL_IBM_multimode_draw_arrays */
 static void GLAPIENTRY
 exec_MultiModeDrawArraysIBM(const GLenum * mode, const GLint * first,
@@ -8108,7 +8096,6 @@ _mesa_init_dlist_table(struct _glapi_table *table)
 
    /* 148. GL_EXT_multi_draw_arrays */
    SET_MultiDrawArraysEXT(table, exec_MultiDrawArraysEXT);
-   SET_MultiDrawElementsEXT(table, exec_MultiDrawElementsEXT);
 
    /* 149. GL_EXT_fog_coord */
    SET_FogCoordPointerEXT(table, exec_FogCoordPointerEXT);
@@ -8723,6 +8710,7 @@ _mesa_save_vtxfmt_init(GLvertexformat * vfmt)
    vfmt->DrawArrays = 0;
    vfmt->DrawElements = 0;
    vfmt->DrawRangeElements = 0;
+   vfmt->MultiDrawElemementsEXT = 0;
 #endif
 }
 
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index be1c03cec2..6cd2a2f4f6 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1038,24 +1038,6 @@ _mesa_MultiDrawArraysEXT( GLenum mode, GLint *first,
 }
 
 
-/* GL_EXT_multi_draw_arrays */
-void GLAPIENTRY
-_mesa_MultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type,
-                            const GLvoid **indices, GLsizei primcount )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLint i;
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   for (i = 0; i < primcount; i++) {
-      if (count[i] > 0) {
-         CALL_DrawElements(ctx->Exec, (mode, count[i], type, indices[i]));
-      }
-   }
-}
-
-
 /* GL_IBM_multimode_draw_arrays */
 void GLAPIENTRY
 _mesa_MultiModeDrawArraysIBM( const GLenum * mode, const GLint * first,
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index 1f807dc3dc..8d6f560a80 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -133,6 +133,7 @@ install_vtxfmt( struct _glapi_table *tab, const GLvertexformat *vfmt )
    SET_DrawArrays(tab, vfmt->DrawArrays);
    SET_DrawElements(tab, vfmt->DrawElements);
    SET_DrawRangeElements(tab, vfmt->DrawRangeElements);
+   SET_MultiDrawElementsEXT(tab, vfmt->MultiDrawElementsEXT);
    SET_EvalMesh1(tab, vfmt->EvalMesh1);
    SET_EvalMesh2(tab, vfmt->EvalMesh2);
    ASSERT(tab->EvalMesh2);
diff --git a/src/mesa/main/vtxfmt_tmp.h b/src/mesa/main/vtxfmt_tmp.h
index 6f5d01e40f..1308d0aa46 100644
--- a/src/mesa/main/vtxfmt_tmp.h
+++ b/src/mesa/main/vtxfmt_tmp.h
@@ -335,6 +335,17 @@ static void GLAPIENTRY TAG(DrawElements)( GLenum mode, GLsizei count, GLenum typ
    CALL_DrawElements(GET_DISPATCH(), ( mode, count, type, indices ));
 }
 
+static void GLAPIENTRY TAG(MultiDrawElementsEXT)( GLenum mode,
+						  const GLsizei *count,
+						  GLenum type,
+						  const GLvoid **indices,
+						  GLsizei primcount)
+{
+   PRE_LOOPBACK( MultiDrawElementsEXT );
+   CALL_MultiDrawElementsEXT(GET_DISPATCH(), ( mode, count, type, indices,
+					       primcount ));
+}
+
 static void GLAPIENTRY TAG(DrawRangeElements)( GLenum mode, GLuint start,
 				    GLuint end, GLsizei count,
 				    GLenum type, const GLvoid *indices )
@@ -522,6 +533,7 @@ static GLvertexformat TAG(vtxfmt) = {
    TAG(DrawArrays),
    TAG(DrawElements),
    TAG(DrawRangeElements),
+   TAG(MultiDrawElementsEXT),
    TAG(EvalMesh1),
    TAG(EvalMesh2)
 };
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 4148469ef4..12911f5750 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -33,6 +33,7 @@
 #include "main/api_noop.h"
 #include "main/varray.h"
 #include "main/bufferobj.h"
+#include "main/macros.h"
 #include "glapi/dispatch.h"
 
 #include "vbo_context.h"
@@ -721,6 +722,152 @@ vbo_exec_DrawElements(GLenum mode, GLsizei count, GLenum type,
 				   count, type, indices);
 }
 
+/* Inner support for both _mesa_DrawElements and _mesa_DrawRangeElements */
+static void
+vbo_validated_multidrawelements(GLcontext *ctx, GLenum mode,
+				const GLsizei *count, GLenum type,
+				const GLvoid **indices, GLsizei primcount)
+{
+   struct vbo_context *vbo = vbo_context(ctx);
+   struct vbo_exec_context *exec = &vbo->exec;
+   struct _mesa_index_buffer ib;
+   struct _mesa_prim *prim;
+   unsigned int index_type_size = 0;
+   uintptr_t min_index_ptr, max_index_ptr;
+   GLboolean fallback = GL_FALSE;
+   int i;
+
+   if (primcount == 0)
+      return;
+
+   FLUSH_CURRENT( ctx, 0 );
+
+   if (ctx->NewState)
+      _mesa_update_state( ctx );
+
+   if (!_mesa_valid_to_render(ctx, "glMultiDrawElements")) {
+      return;
+   }
+
+   if (ctx->NewState)
+      _mesa_update_state( ctx );
+
+   prim = _mesa_calloc(primcount * sizeof(*prim));
+   if (prim == NULL) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMultiDrawElements");
+      return;
+   }
+
+   /* Decide if we can do this all as one set of primitives sharing the
+    * same index buffer, or if we have to reset the index pointer per primitive.
+    */
+   bind_arrays( ctx );
+
+   switch (type) {
+   case GL_UNSIGNED_INT:
+      index_type_size = 4;
+      break;
+   case GL_UNSIGNED_SHORT:
+      index_type_size = 2;
+      break;
+   case GL_UNSIGNED_BYTE:
+      index_type_size = 1;
+      break;
+   default:
+      assert(0);
+   }
+
+   min_index_ptr = (uintptr_t)indices[0];
+   max_index_ptr = 0;
+   for (i = 0; i < primcount; i++) {
+      min_index_ptr = MIN2(min_index_ptr, (uintptr_t)indices[i]);
+      max_index_ptr = MAX2(max_index_ptr, (uintptr_t)indices[i] +
+			   index_type_size * count[i]);
+   }
+
+   /* 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.
+    */
+   if (index_type_size != 1) {
+      for (i = 0; i < primcount; i++) {
+	 if ((((uintptr_t)indices[i] - min_index_ptr) % index_type_size) != 0) {
+	    fallback = GL_TRUE;
+	    break;
+	 }
+      }
+   }
+
+   /* If the index buffer isn't in a VBO, then treating the application's
+    * subranges of the index buffer as one large index buffer may lead to
+    * us reading unmapped memory.
+    */
+   if (!_mesa_is_bufferobj(ctx->Array.ElementArrayBufferObj))
+      fallback = GL_TRUE;
+
+   if (!fallback) {
+      ib.count = (max_index_ptr - min_index_ptr) / index_type_size;
+      ib.type = type;
+      ib.obj = ctx->Array.ElementArrayBufferObj;
+      ib.ptr = (void *)min_index_ptr;
+
+      for (i = 0; i < primcount; i++) {
+	 prim[i].begin = (i == 0);
+	 prim[i].end = (i == primcount - 1);
+	 prim[i].weak = 0;
+	 prim[i].pad = 0;
+	 prim[i].mode = mode;
+	 prim[i].start = ((uintptr_t)indices[i] - min_index_ptr) / index_type_size;
+	 prim[i].count = count[i];
+	 prim[i].indexed = 1;
+      }
+
+      vbo->draw_prims(ctx, exec->array.inputs, prim, primcount, &ib,
+		      GL_FALSE, ~0, ~0);
+   } else {
+      for (i = 0; i < primcount; i++) {
+	 ib.count = count[i];
+	 ib.type = type;
+	 ib.obj = ctx->Array.ElementArrayBufferObj;
+	 ib.ptr = indices[i];
+
+
+	 prim[0].begin = 1;
+	 prim[0].end = 1;
+	 prim[0].weak = 0;
+	 prim[0].pad = 0;
+	 prim[0].mode = mode;
+	 prim[0].start = 0;
+	 prim[0].count = count[i];
+	 prim[0].indexed = 1;
+      }
+
+      vbo->draw_prims(ctx, exec->array.inputs, prim, 1, &ib,
+		      GL_FALSE, ~0, ~0);
+   }
+   _mesa_free(prim);
+}
+
+static void GLAPIENTRY
+vbo_exec_MultiDrawElements(GLenum mode,
+			   const GLsizei *count, GLenum type,
+			   const GLvoid **indices,
+			   GLsizei primcount)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint i;
+
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   for (i = 0; i < primcount; i++) {
+      if (!_mesa_validate_DrawElements( ctx, mode, count[i], type, indices[i] ))
+	 return;
+   }
+
+   vbo_validated_multidrawelements(ctx, mode, count, type, indices, primcount);
+}
+
+
 
 /***********************************************************************
  * Initialization
@@ -733,10 +880,12 @@ vbo_exec_array_init( struct vbo_exec_context *exec )
    exec->vtxfmt.DrawArrays = vbo_exec_DrawArrays;
    exec->vtxfmt.DrawElements = vbo_exec_DrawElements;
    exec->vtxfmt.DrawRangeElements = vbo_exec_DrawRangeElements;
+   exec->vtxfmt.MultiDrawElementsEXT = vbo_exec_MultiDrawElements;
 #else
    exec->vtxfmt.DrawArrays = _mesa_noop_DrawArrays;
    exec->vtxfmt.DrawElements = _mesa_noop_DrawElements;
    exec->vtxfmt.DrawRangeElements = _mesa_noop_DrawRangeElements;
+   exec->vtxfmt.MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
 #endif
 }
 
@@ -772,3 +921,11 @@ _mesa_DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count,
 {
    vbo_exec_DrawRangeElements(mode, start, end, count, type, indices);
 }
+
+/* GL_EXT_multi_draw_arrays */
+void GLAPIENTRY
+_mesa_MultiDrawElementsEXT(GLenum mode, const GLsizei *count, GLenum type,
+			   const GLvoid **indices, GLsizei primcount)
+{
+   vbo_exec_MultiDrawElements(mode, count, type, indices, primcount);
+}
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index cdbbc9c187..1771510d84 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -73,6 +73,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/dlist.h"
 #include "main/enums.h"
 #include "main/macros.h"
+#include "main/api_noop.h"
 #include "main/api_validate.h"
 #include "main/api_arrayelt.h"
 #include "main/vtxfmt.h"
@@ -1038,6 +1039,8 @@ static void _save_vtxfmt_init( GLcontext *ctx )
    vfmt->DrawArrays = _save_DrawArrays;
    vfmt->DrawElements = _save_DrawElements;
    vfmt->DrawRangeElements = _save_DrawRangeElements;
+   /* Loops back into vfmt->DrawElements */
+   vfmt->MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
 
 }
 
@@ -1228,6 +1231,8 @@ void vbo_save_api_init( struct vbo_save_context *save )
    ctx->ListState.ListVtxfmt.DrawArrays = _save_OBE_DrawArrays;
    ctx->ListState.ListVtxfmt.DrawElements = _save_OBE_DrawElements;
    ctx->ListState.ListVtxfmt.DrawRangeElements = _save_OBE_DrawRangeElements;
+   /* loops back into _save_OBE_DrawElements */
+   ctx->ListState.ListVtxfmt.MultiDrawElementsEXT = _mesa_noop_MultiDrawElements;
    _mesa_install_save_vtxfmt( ctx, &ctx->ListState.ListVtxfmt );
 }
 
-- 
cgit v1.2.3


From a46e32787d98192d35bf2834011cfa5537e0e703 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 2 Sep 2009 05:11:25 -0700
Subject: mesa: Compact state key for TexEnv program cache

By rearranging the bitfields within the key we can reduce the size
of the key from 644 to 196 bytes, reducing the cost of both the
hashing and equality tests.
---
 src/mesa/main/texenvprogram.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 5913957969..b16b8dd36b 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -82,8 +82,8 @@ texenv_doing_secondary_color(GLcontext *ctx)
 #define DISASSEM (MESA_VERBOSE & VERBOSE_DISASSEM)
 
 struct mode_opt {
-   GLuint Source:4;  /**< SRC_x */
-   GLuint Operand:3; /**< OPR_x */
+   GLubyte Source:4;  /**< SRC_x */
+   GLubyte Operand:3; /**< OPR_x */
 };
 
 struct state_key {
@@ -103,10 +103,11 @@ struct state_key {
 
       GLuint NumArgsRGB:3;  /**< up to MAX_COMBINER_TERMS */
       GLuint ModeRGB:5;     /**< MODE_x */
-      struct mode_opt OptRGB[MAX_COMBINER_TERMS];
 
       GLuint NumArgsA:3;  /**< up to MAX_COMBINER_TERMS */
       GLuint ModeA:5;     /**< MODE_x */
+
+      struct mode_opt OptRGB[MAX_COMBINER_TERMS];
       struct mode_opt OptA[MAX_COMBINER_TERMS];
    } unit[MAX_TEXTURE_UNITS];
 };
@@ -1497,6 +1498,7 @@ _mesa_get_fixed_func_fragment_program(GLcontext *ctx)
    struct gl_fragment_program *prog;
    struct state_key key;
 	
+   printf("SIZE OF KEY %d\n", sizeof(key));
    make_state_key(ctx, &key);
       
    prog = (struct gl_fragment_program *)
-- 
cgit v1.2.3


From 83e4470d9a3367883b3fe699629f1d8648459a89 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 2 Sep 2009 08:45:34 -0600
Subject: mesa: added #ifdef __GNUC__ around GLubyte bitfield usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It would be nice if there were a #pragma or something to disable the warnings:

main/texenvprogram.c:87: warning: type of bit-field ‘Source’ is a GCC extension
main/texenvprogram.c:88: warning: type of bit-field ‘Operand’ is a GCC extension

but there doesn't appear to be a way to do that.
---
 src/mesa/main/texenvprogram.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index b16b8dd36b..770a2c26f7 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -82,8 +82,13 @@ texenv_doing_secondary_color(GLcontext *ctx)
 #define DISASSEM (MESA_VERBOSE & VERBOSE_DISASSEM)
 
 struct mode_opt {
+#ifdef __GNUC__
    GLubyte Source:4;  /**< SRC_x */
    GLubyte Operand:3; /**< OPR_x */
+#else
+   GLubyte Source;  /**< SRC_x */
+   GLubyte Operand; /**< OPR_x */
+#endif
 };
 
 struct state_key {
-- 
cgit v1.2.3


From 8cb651578de8dc4c956eaa8c0e5f1d442a3d4a92 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 2 Sep 2009 09:25:28 -0600
Subject: mesa: remove accidentally committed printf

---
 src/mesa/main/texenvprogram.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 770a2c26f7..d5343d44db 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1503,7 +1503,6 @@ _mesa_get_fixed_func_fragment_program(GLcontext *ctx)
    struct gl_fragment_program *prog;
    struct state_key key;
 	
-   printf("SIZE OF KEY %d\n", sizeof(key));
    make_state_key(ctx, &key);
       
    prog = (struct gl_fragment_program *)
-- 
cgit v1.2.3


From a7a3d3c27144595b2134f4271996cba901938d12 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 2 Sep 2009 09:43:00 -0600
Subject: mesa: replace 8 with NUM_UNITS

---
 src/mesa/main/ffvertex_prog.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 8e21a27f89..356476e35a 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -46,6 +46,9 @@
 #include "shader/prog_statevars.h"
 
 
+/** Max of number of lights and texture coord units */
+#define NUM_UNITS MAX2(MAX_TEXTURE_COORD_UNITS, MAX_LIGHTS)
+
 struct state_key {
    unsigned light_color_material_mask:12;
    unsigned light_global_enabled:1;
@@ -77,7 +80,7 @@ struct state_key {
       unsigned texgen_mode1:4;
       unsigned texgen_mode2:4;
       unsigned texgen_mode3:4;
-   } unit[8];
+   } unit[NUM_UNITS];
 };
 
 
-- 
cgit v1.2.3


From d98b9f4edbbee1654b66c8df7b1deeb401b3dc5f Mon Sep 17 00:00:00 2001
From: Gary Wong <gtw@gnu.org>
Date: Wed, 2 Sep 2009 10:11:15 -0600
Subject: mesa: silence gcc bit-field warning

---
 src/mesa/main/texenvprogram.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index d5343d44db..b4923e904d 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -83,8 +83,8 @@ texenv_doing_secondary_color(GLcontext *ctx)
 
 struct mode_opt {
 #ifdef __GNUC__
-   GLubyte Source:4;  /**< SRC_x */
-   GLubyte Operand:3; /**< OPR_x */
+   __extension__ GLubyte Source:4;  /**< SRC_x */
+   __extension__ GLubyte Operand:3; /**< OPR_x */
 #else
    GLubyte Source;  /**< SRC_x */
    GLubyte Operand; /**< OPR_x */
-- 
cgit v1.2.3


From 4b08e7498230eac30eea1721f33994b30999acd4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 2 Sep 2009 10:12:15 -0600
Subject: mesa: fix the non-GNU C bit-field case

---
 src/mesa/main/texenvprogram.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index b4923e904d..165d464e3b 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -86,8 +86,8 @@ struct mode_opt {
    __extension__ GLubyte Source:4;  /**< SRC_x */
    __extension__ GLubyte Operand:3; /**< OPR_x */
 #else
-   GLubyte Source;  /**< SRC_x */
-   GLubyte Operand; /**< OPR_x */
+   GLuint Source;  /**< SRC_x */
+   GLuint Operand; /**< OPR_x */
 #endif
 };
 
-- 
cgit v1.2.3


From 5e809216a8d2e7ad093a1d25f3f6495f29e57572 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 2 Sep 2009 10:38:46 -0600
Subject: Revert "mesa: fix the non-GNU C bit-field case"

This reverts commit 4b08e7498230eac30eea1721f33994b30999acd4.

Don't know what I was thinking there.
---
 src/mesa/main/texenvprogram.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 165d464e3b..b4923e904d 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -86,8 +86,8 @@ struct mode_opt {
    __extension__ GLubyte Source:4;  /**< SRC_x */
    __extension__ GLubyte Operand:3; /**< OPR_x */
 #else
-   GLuint Source;  /**< SRC_x */
-   GLuint Operand; /**< OPR_x */
+   GLubyte Source;  /**< SRC_x */
+   GLubyte Operand; /**< OPR_x */
 #endif
 };
 
-- 
cgit v1.2.3


From 2f6d2a9e27f8582591dc60655f7d7b14d7552bbc Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 09:41:41 -0600
Subject: mesa: change ctx->Driver.BufferData() to return GLboolean for
 success/failure

Return GL_FALSE if we failed to allocate the buffer.  Then raise
GL_OUT_OF_MEMORY in core Mesa.
---
 src/mesa/drivers/dri/intel/intel_buffer_objects.c  | 11 ++++++---
 .../drivers/dri/radeon/radeon_buffer_objects.c     |  9 ++++++--
 src/mesa/main/bufferobj.c                          | 26 +++++++++++++++-------
 src/mesa/main/dd.h                                 |  6 ++---
 src/mesa/state_tracker/st_cb_bufferobjects.c       |  9 ++++----
 5 files changed, 41 insertions(+), 20 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
index ae6f3064a8..c55c5c426e 100644
--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
@@ -130,9 +130,10 @@ intel_bufferobj_free(GLcontext * ctx, struct gl_buffer_object *obj)
  * Allocate space for and store data in a buffer object.  Any data that was
  * previously stored in the buffer object is lost.  If data is NULL,
  * memory will be allocated, but no copy will occur.
- * Called via glBufferDataARB().
+ * Called via ctx->Driver.BufferData().
+ * \return GL_TRUE for success, GL_FALSE if out of memory
  */
-static void
+static GLboolean
 intel_bufferobj_data(GLcontext * ctx,
                      GLenum target,
                      GLsizeiptrARB size,
@@ -167,15 +168,19 @@ intel_bufferobj_data(GLcontext * ctx,
 	 if (intel_obj->sys_buffer != NULL) {
 	    if (data != NULL)
 	       memcpy(intel_obj->sys_buffer, data, size);
-	    return;
+	    return GL_TRUE;
 	 }
       }
 #endif
       intel_bufferobj_alloc_buffer(intel, intel_obj);
+      if (!intel_obj->buffer)
+         return GL_FALSE;
 
       if (data != NULL)
 	 dri_bo_subdata(intel_obj->buffer, 0, size, data);
    }
+
+   return GL_TRUE;
 }
 
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c b/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c
index e8ae51e6ea..a24b6dac26 100644
--- a/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c
+++ b/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c
@@ -78,9 +78,10 @@ radeonDeleteBufferObject(GLcontext * ctx,
  * Allocate space for and store data in a buffer object.  Any data that was
  * previously stored in the buffer object is lost.  If data is NULL,
  * memory will be allocated, but no copy will occur.
- * Called via glBufferDataARB().
+ * Called via ctx->Driver.BufferData().
+ * \return GL_TRUE for success, GL_FALSE if out of memory
  */
-static void
+static GLboolean
 radeonBufferData(GLcontext * ctx,
                  GLenum target,
                  GLsizeiptrARB size,
@@ -107,6 +108,9 @@ radeonBufferData(GLcontext * ctx,
                                         RADEON_GEM_DOMAIN_GTT,
                                         0);
 
+        if (!radeon_obj->bo)
+            return GL_FALSE;
+
         if (data != NULL) {
             radeon_bo_map(radeon_obj->bo, GL_TRUE);
 
@@ -115,6 +119,7 @@ radeonBufferData(GLcontext * ctx,
             radeon_bo_unmap(radeon_obj->bo);
         }
     }
+    return GL_TRUE;
 }
 
 /**
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index ebca798635..81b77b6ff2 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -314,9 +314,10 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
  * \param usage   Hints about how the data will be used.
  * \param bufObj  Object to be used.
  *
+ * \return GL_TRUE for success, GL_FALSE for failure
  * \sa glBufferDataARB, dd_function_table::BufferData.
  */
-static void
+static GLboolean
 _mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
 		   const GLvoid * data, GLenum usage,
 		   struct gl_buffer_object * bufObj )
@@ -334,6 +335,11 @@ _mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
       if (data) {
 	 _mesa_memcpy( bufObj->Data, data, size );
       }
+
+      return GL_TRUE;
+   }
+   else {
+      return GL_FALSE;
    }
 }
 
@@ -1107,8 +1113,6 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
 
    FLUSH_VERTICES(ctx, _NEW_BUFFER_OBJECT);
 
-   ASSERT(ctx->Driver.BufferData);
-
    bufObj->Written = GL_TRUE;
 
 #ifdef VBO_DEBUG
@@ -1119,8 +1123,11 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
 #ifdef BOUNDS_CHECK
    size += 100;
 #endif
-   /* Give the buffer object to the driver!  <data> may be null! */
-   ctx->Driver.BufferData( ctx, target, size, data, usage, bufObj );
+
+   ASSERT(ctx->Driver.BufferData);
+   if (!ctx->Driver.BufferData( ctx, target, size, data, usage, bufObj )) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBufferDataARB(access)");
+   }
 }
 
 
@@ -1209,9 +1216,9 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
    map = ctx->Driver.MapBuffer( ctx, target, access, bufObj );
    if (!map) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(access)");
+      return NULL;
    }
-
-   if (map) {
+   else {
       /* The driver callback should have set these fields.
        * This is important because other modules (like VBO) might call
        * the driver function directly.
@@ -1538,7 +1545,10 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
    ASSERT(ctx->Driver.MapBufferRange);
    map = ctx->Driver.MapBufferRange(ctx, target, offset, length,
                                     access, bufObj);
-   if (map) {
+   if (!map) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(access)");
+   }
+   else {
       /* The driver callback should have set all these fields.
        * This is important because other modules (like VBO) might call
        * the driver function directly.
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index f02e868d4a..4400e166c6 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -783,9 +783,9 @@ struct dd_function_table {
    
    void (*DeleteBuffer)( GLcontext *ctx, struct gl_buffer_object *obj );
 
-   void (*BufferData)( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
-		       const GLvoid *data, GLenum usage,
-		       struct gl_buffer_object *obj );
+   GLboolean (*BufferData)( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
+                            const GLvoid *data, GLenum usage,
+                            struct gl_buffer_object *obj );
 
    void (*BufferSubData)( GLcontext *ctx, GLenum target, GLintptrARB offset,
 			  GLsizeiptrARB size, const GLvoid *data,
diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c
index 69dd76d083..8e09d0b932 100644
--- a/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -134,9 +134,10 @@ st_bufferobj_get_subdata(GLcontext *ctx,
  * Allocate space for and store data in a buffer object.  Any data that was
  * previously stored in the buffer object is lost.  If data is NULL,
  * memory will be allocated, but no copy will occur.
- * Called via glBufferDataARB().
+ * Called via ctx->Driver.BufferData().
+ * \return GL_TRUE for success, GL_FALSE if out of memory
  */
-static void
+static GLboolean
 st_bufferobj_data(GLcontext *ctx,
 		  GLenum target,
 		  GLsizeiptrARB size,
@@ -172,13 +173,13 @@ st_bufferobj_data(GLcontext *ctx,
    st_obj->buffer = pipe_buffer_create( pipe->screen, 32, buffer_usage, size );
 
    if (!st_obj->buffer) {
-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBufferDataARB");
-      return;
+      return GL_FALSE;
    }
 
    if (data)
       st_no_flush_pipe_buffer_write(st_context(ctx), st_obj->buffer, 0,
 				    size, data);
+   return GL_TRUE;
 }
 
 
-- 
cgit v1.2.3


From 1b448c7a5cafa68eeead2a4c45f4362a9883383b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 11:29:18 -0600
Subject: mesa: consolidate PBO map/unmap helpers

Instead of _mesa_map_readpix_pbo() use _mesa_map_pbo_source().

Instead of _mesa_map_drawpix_pbo() and _mesa_map_bitmap_pbo() use
_mesa_map_pbo_dest().
---
 src/mesa/main/bufferobj.c                 | 99 ++++++++++---------------------
 src/mesa/main/bufferobj.h                 | 27 +++------
 src/mesa/state_tracker/st_cb_bitmap.c     |  6 +-
 src/mesa/state_tracker/st_cb_drawpixels.c | 10 ++--
 src/mesa/state_tracker/st_cb_readpixels.c |  6 +-
 src/mesa/state_tracker/st_cb_texture.c    |  4 +-
 src/mesa/swrast/s_bitmap.c                |  4 +-
 src/mesa/swrast/s_drawpix.c               |  4 +-
 src/mesa/swrast/s_readpix.c               |  4 +-
 9 files changed, 60 insertions(+), 104 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 81b77b6ff2..1ae63a0ef6 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -658,6 +658,8 @@ _mesa_update_default_objects_buffer_objects(GLcontext *ctx)
  * currently mapped.  Whoever calls this function should check for that.
  * Remember, we can't use a PBO when it's mapped!
  *
+ * If we're not using a PBO, this is a no-op.
+ *
  * \param width  width of image to read/write
  * \param height  height of image to read/write
  * \param depth  depth of image to read/write
@@ -676,7 +678,8 @@ _mesa_validate_pbo_access(GLuint dimensions,
    GLvoid *start, *end;
    const GLubyte *sizeAddr; /* buffer size, cast to a pointer */
 
-   ASSERT(_mesa_is_bufferobj(pack->BufferObj));
+   if (!_mesa_is_bufferobj(pack->BufferObj))
+      return GL_TRUE;  /* no PBO, OK */
 
    if (pack->BufferObj->Size == 0)
       /* no buffer! */
@@ -708,17 +711,18 @@ _mesa_validate_pbo_access(GLuint dimensions,
 
 
 /**
- * If the source of glBitmap data is a PBO, check that we won't read out
- * of buffer bounds, then map the buffer.
- * If not sourcing from a PBO, just return the bitmap pointer.
- * This is a helper function for (some) drivers.
- * Return NULL if error.
- * If non-null return, must call _mesa_unmap_bitmap_pbo() when done.
+ * For commands that read from a PBO (glDrawPixels, glTexImage,
+ * glPolygonStipple, etc), if we're reading from a PBO, map it read-only
+ * and return the pointer into the PBO.  If we're not reading from a
+ * PBO, return \p src as-is.
+ * If non-null return, must call _mesa_unmap_pbo_source() when done.
+ *
+ * \return NULL if error, else pointer to start of data
  */
-const GLubyte *
-_mesa_map_bitmap_pbo(GLcontext *ctx,
+const GLvoid *
+_mesa_map_pbo_source(GLcontext *ctx,
                      const struct gl_pixelstore_attrib *unpack,
-                     const GLubyte *bitmap)
+                     const GLvoid *src)
 {
    const GLubyte *buf;
 
@@ -730,11 +734,11 @@ _mesa_map_bitmap_pbo(GLcontext *ctx,
       if (!buf)
          return NULL;
 
-      buf = ADD_POINTERS(buf, bitmap);
+      buf = ADD_POINTERS(buf, src);
    }
    else {
       /* unpack from normal memory */
-      buf = bitmap;
+      buf = src;
    }
 
    return buf;
@@ -742,13 +746,13 @@ _mesa_map_bitmap_pbo(GLcontext *ctx,
 
 
 /**
- * Counterpart to _mesa_map_bitmap_pbo()
- * This is a helper function for (some) drivers.
+ * Counterpart to _mesa_map_pbo_source()
  */
 void
-_mesa_unmap_bitmap_pbo(GLcontext *ctx,
+_mesa_unmap_pbo_source(GLcontext *ctx,
                        const struct gl_pixelstore_attrib *unpack)
 {
+   ASSERT(unpack != &ctx->Pack); /* catch pack/unpack mismatch */
    if (_mesa_is_bufferobj(unpack->BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
                               unpack->BufferObj);
@@ -757,57 +761,17 @@ _mesa_unmap_bitmap_pbo(GLcontext *ctx,
 
 
 /**
- * \sa _mesa_map_bitmap_pbo
- */
-const GLvoid *
-_mesa_map_drawpix_pbo(GLcontext *ctx,
-                      const struct gl_pixelstore_attrib *unpack,
-                      const GLvoid *pixels)
-{
-   const GLvoid *buf;
-
-   if (_mesa_is_bufferobj(unpack->BufferObj)) {
-      /* unpack from PBO */
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              unpack->BufferObj);
-      if (!buf)
-         return NULL;
-
-      buf = ADD_POINTERS(buf, pixels);
-   }
-   else {
-      /* unpack from normal memory */
-      buf = pixels;
-   }
-
-   return buf;
-}
-
-
-/**
- * \sa _mesa_unmap_bitmap_pbo
- */
-void
-_mesa_unmap_drawpix_pbo(GLcontext *ctx,
-                        const struct gl_pixelstore_attrib *unpack)
-{
-   if (_mesa_is_bufferobj(unpack->BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              unpack->BufferObj);
-   }
-}
-
-
-/**
- * If PBO is bound, map the buffer, return dest pointer in mapped buffer.
- * Call _mesa_unmap_readpix_pbo() when finished
- * \return NULL if error
+ * For commands that write to a PBO (glReadPixels, glGetColorTable, etc),
+ * if we're writing to a PBO, map it write-only and return the pointer
+ * into the PBO.  If we're not writing to a PBO, return \p dst as-is.
+ * If non-null return, must call _mesa_unmap_pbo_dest() when done.
+ *
+ * \return NULL if error, else pointer to start of data
  */
 void *
-_mesa_map_readpix_pbo(GLcontext *ctx,
-                      const struct gl_pixelstore_attrib *pack,
-                      GLvoid *dest)
+_mesa_map_pbo_dest(GLcontext *ctx,
+                   const struct gl_pixelstore_attrib *pack,
+                   GLvoid *dest)
 {
    void *buf;
 
@@ -831,12 +795,13 @@ _mesa_map_readpix_pbo(GLcontext *ctx,
 
 
 /**
- * Counterpart to _mesa_map_readpix_pbo()
+ * Counterpart to _mesa_map_pbo_dest()
  */
 void
-_mesa_unmap_readpix_pbo(GLcontext *ctx,
-                        const struct gl_pixelstore_attrib *pack)
+_mesa_unmap_pbo_dest(GLcontext *ctx,
+                     const struct gl_pixelstore_attrib *pack)
 {
+   ASSERT(pack != &ctx->Unpack); /* catch pack/unpack mismatch */
    if (_mesa_is_bufferobj(pack->BufferObj)) {
       ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT, pack->BufferObj);
    }
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index decb44a65e..2e7afc2d76 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -81,32 +81,23 @@ _mesa_validate_pbo_access(GLuint dimensions,
                           GLsizei width, GLsizei height, GLsizei depth,
                           GLenum format, GLenum type, const GLvoid *ptr);
 
-extern const GLubyte *
-_mesa_map_bitmap_pbo(GLcontext *ctx,
+extern const GLvoid *
+_mesa_map_pbo_source(GLcontext *ctx,
                      const struct gl_pixelstore_attrib *unpack,
-                     const GLubyte *bitmap);
+                     const GLvoid *src);
 
 extern void
-_mesa_unmap_bitmap_pbo(GLcontext *ctx,
+_mesa_unmap_pbo_source(GLcontext *ctx,
                        const struct gl_pixelstore_attrib *unpack);
 
-extern const GLvoid *
-_mesa_map_drawpix_pbo(GLcontext *ctx,
-                      const struct gl_pixelstore_attrib *unpack,
-                      const GLvoid *pixels);
-
-extern void
-_mesa_unmap_drawpix_pbo(GLcontext *ctx,
-                        const struct gl_pixelstore_attrib *unpack);
-
 extern void *
-_mesa_map_readpix_pbo(GLcontext *ctx,
-                      const struct gl_pixelstore_attrib *pack,
-                      GLvoid *dest);
+_mesa_map_pbo_dest(GLcontext *ctx,
+                   const struct gl_pixelstore_attrib *pack,
+                   GLvoid *dest);
 
 extern void
-_mesa_unmap_readpix_pbo(GLcontext *ctx,
-                        const struct gl_pixelstore_attrib *pack);
+_mesa_unmap_pbo_dest(GLcontext *ctx,
+                     const struct gl_pixelstore_attrib *pack);
 
 
 extern void
diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c
index 3171b67376..902fb38d1a 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -275,7 +275,7 @@ make_bitmap_texture(GLcontext *ctx, GLsizei width, GLsizei height,
    struct pipe_texture *pt;
 
    /* PBO source... */
-   bitmap = _mesa_map_bitmap_pbo(ctx, unpack, bitmap);
+   bitmap = _mesa_map_pbo_source(ctx, unpack, bitmap);
    if (!bitmap) {
       return NULL;
    }
@@ -287,7 +287,7 @@ make_bitmap_texture(GLcontext *ctx, GLsizei width, GLsizei height,
                           0, width, height, 1,
                           PIPE_TEXTURE_USAGE_SAMPLER);
    if (!pt) {
-      _mesa_unmap_bitmap_pbo(ctx, unpack);
+      _mesa_unmap_pbo_source(ctx, unpack);
       return NULL;
    }
 
@@ -302,7 +302,7 @@ make_bitmap_texture(GLcontext *ctx, GLsizei width, GLsizei height,
    unpack_bitmap(ctx->st, 0, 0, width, height, unpack, bitmap,
                  dest, transfer->stride);
 
-   _mesa_unmap_bitmap_pbo(ctx, unpack);
+   _mesa_unmap_pbo_source(ctx, unpack);
 
    /* Release transfer */
    screen->transfer_unmap(screen, transfer);
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index d19a88fa7c..e00754a036 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -353,7 +353,7 @@ make_texture(struct st_context *st,
    assert(pipeFormat);
    cpp = st_sizeof_format(pipeFormat);
 
-   pixels = _mesa_map_drawpix_pbo(ctx, unpack, pixels);
+   pixels = _mesa_map_pbo_source(ctx, unpack, pixels);
    if (!pixels)
       return NULL;
 
@@ -381,7 +381,7 @@ make_texture(struct st_context *st,
    pt = st_texture_create(st, PIPE_TEXTURE_2D, pipeFormat, 0, ptw, pth, 1,
                           PIPE_TEXTURE_USAGE_SAMPLER);
    if (!pt) {
-      _mesa_unmap_drawpix_pbo(ctx, unpack);
+      _mesa_unmap_pbo_source(ctx, unpack);
       return NULL;
    }
 
@@ -428,7 +428,7 @@ make_texture(struct st_context *st,
       ctx->_ImageTransferState = imageTransferStateSave;
    }
 
-   _mesa_unmap_drawpix_pbo(ctx, unpack);
+   _mesa_unmap_pbo_source(ctx, unpack);
 
    return pt;
 }
@@ -681,7 +681,7 @@ draw_stencil_pixels(GLcontext *ctx, GLint x, GLint y,
 
    stmap = screen->transfer_map(screen, pt);
 
-   pixels = _mesa_map_drawpix_pbo(ctx, unpack, pixels);
+   pixels = _mesa_map_pbo_source(ctx, unpack, pixels);
    assert(pixels);
 
    /* if width > MAX_WIDTH, have to process image in chunks */
@@ -775,7 +775,7 @@ draw_stencil_pixels(GLcontext *ctx, GLint x, GLint y,
       skipPixels += spanWidth;
    }
 
-   _mesa_unmap_drawpix_pbo(ctx, unpack);
+   _mesa_unmap_pbo_source(ctx, unpack);
 
    /* unmap the stencil buffer */
    screen->transfer_unmap(screen, pt);
diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c
index ccf1a0b563..75424aa2e7 100644
--- a/src/mesa/state_tracker/st_cb_readpixels.c
+++ b/src/mesa/state_tracker/st_cb_readpixels.c
@@ -353,7 +353,7 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
       return;
    }
 
-   dest = _mesa_map_readpix_pbo(ctx, &clippedPacking, dest);
+   dest = _mesa_map_pbo_dest(ctx, &clippedPacking, dest);
    if (!dest)
       return;
 
@@ -380,7 +380,7 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
    if (st_fast_readpixels(ctx, strb, x, y, width, height,
                           format, type, pack, dest)) {
       /* success! */
-      _mesa_unmap_readpix_pbo(ctx, &clippedPacking);
+      _mesa_unmap_pbo_dest(ctx, &clippedPacking);
       return;
    }
 
@@ -534,7 +534,7 @@ st_readpixels(GLcontext *ctx, GLint x, GLint y, GLsizei width, GLsizei height,
 
    screen->tex_transfer_destroy(trans);
 
-   _mesa_unmap_readpix_pbo(ctx, &clippedPacking);
+   _mesa_unmap_pbo_dest(ctx, &clippedPacking);
 }
 
 
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 90a059ca69..dc39a70121 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -870,7 +870,7 @@ decompress_with_blit(GLcontext * ctx, GLenum target, GLint level,
 					     PIPE_TRANSFER_READ,
 					     0, 0, width, height);
 
-   pixels = _mesa_map_readpix_pbo(ctx, &ctx->Pack, pixels);
+   pixels = _mesa_map_pbo_dest(ctx, &ctx->Pack, pixels);
 
    /* copy/pack data into user buffer */
    if (st_equal_formats(stImage->pt->format, format, type)) {
@@ -903,7 +903,7 @@ decompress_with_blit(GLcontext * ctx, GLenum target, GLint level,
       }
    }
 
-   _mesa_unmap_readpix_pbo(ctx, &ctx->Pack);
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 
    /* destroy the temp / dest surface */
    util_destroy_rgba_surface(dst_texture, dst_surface);
diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c
index 5e7822cf32..3dbdf2a61a 100644
--- a/src/mesa/swrast/s_bitmap.c
+++ b/src/mesa/swrast/s_bitmap.c
@@ -56,7 +56,7 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
 
    ASSERT(ctx->RenderMode == GL_RENDER);
 
-   bitmap = _mesa_map_bitmap_pbo(ctx, unpack, bitmap);
+   bitmap = (const GLubyte *) _mesa_map_pbo_source(ctx, unpack, bitmap);
    if (!bitmap)
       return;
 
@@ -133,7 +133,7 @@ _swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
 
    swrast_render_finish(ctx);
 
-   _mesa_unmap_bitmap_pbo(ctx, unpack);
+   _mesa_unmap_pbo_source(ctx, unpack);
 }
 
 
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index a9ef8e685f..d31c402eea 100644
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -847,7 +847,7 @@ _swrast_DrawPixels( GLcontext *ctx,
    if (swrast->NewState)
       _swrast_validate_derived( ctx );
 
-    pixels = _mesa_map_drawpix_pbo(ctx, unpack, pixels);
+    pixels = _mesa_map_pbo_source(ctx, unpack, pixels);
     if (!pixels) {
        swrast_render_finish(ctx);
        _mesa_set_vp_override(ctx, save_vp_override);
@@ -892,7 +892,7 @@ _swrast_DrawPixels( GLcontext *ctx,
    swrast_render_finish(ctx);
    _mesa_set_vp_override(ctx, save_vp_override);
 
-   _mesa_unmap_drawpix_pbo(ctx, unpack);
+   _mesa_unmap_pbo_source(ctx, unpack);
 }
 
 
diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index e901fc6b5d..48b9408d24 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -574,7 +574,7 @@ _swrast_ReadPixels( GLcontext *ctx,
       return;
    }
 
-   pixels = _mesa_map_readpix_pbo(ctx, &clippedPacking, pixels);
+   pixels = _mesa_map_pbo_dest(ctx, &clippedPacking, pixels);
    if (!pixels)
       return;
   
@@ -616,5 +616,5 @@ _swrast_ReadPixels( GLcontext *ctx,
 
    swrast_render_finish(ctx);
 
-   _mesa_unmap_readpix_pbo(ctx, &clippedPacking);
+   _mesa_unmap_pbo_dest(ctx, &clippedPacking);
 }
-- 
cgit v1.2.3


From 203f395aaf717a6faf21a76979cc24d544ae148b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 10:41:14 -0600
Subject: mesa: use new _mesa_map_pbo_source/dest() functions in more places

This trims down the code a bit.  The next step would be to combine
the validate and map operations into one helper...
---
 src/mesa/main/colortab.c  |  63 +++++-------
 src/mesa/main/convolve.c  | 100 +++++++------------
 src/mesa/main/histogram.c |  67 +++++--------
 src/mesa/main/pixel.c     | 239 ++++++++++++++++------------------------------
 src/mesa/main/polygon.c   |  77 ++++++---------
 5 files changed, 192 insertions(+), 354 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 36304065eb..91c29882ec 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -179,27 +179,22 @@ store_colortable_entries(GLcontext *ctx, struct gl_color_table *table,
 			 GLfloat bScale, GLfloat bBias,
 			 GLfloat aScale, GLfloat aBias)
 {
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* Get/unpack the color table data from a PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(1, &ctx->Unpack, count, 1, 1,
-                                     format, type, data)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glColor[Sub]Table(bad PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
+   if (!_mesa_validate_pbo_access(1, &ctx->Unpack, count, 1, 1,
+                                  format, type, data)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glColor[Sub]Table(bad PBO access)");
+      return;
+   }
+
+   data = _mesa_map_pbo_source(ctx, &ctx->Unpack, data);
+   if (!data) {
+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glColor[Sub]Table(PBO mapped)");
-         return;
       }
-      data = ADD_POINTERS(buf, data);
+      return;
    }
 
-
    {
       /* convert user-provided data to GLfloat values */
       GLfloat tempTab[MAX_COLOR_TABLE_SIZE * 4];
@@ -279,10 +274,7 @@ store_colortable_entries(GLcontext *ctx, struct gl_color_table *table,
       }
    }
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
 }
 
 
@@ -696,34 +688,27 @@ _mesa_GetColorTable( GLenum target, GLenum format,
       return;
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* pack color table into PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(1, &ctx->Pack, table->Size, 1, 1,
-                                     format, type, data)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetColorTable(invalid PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
+   if (!_mesa_validate_pbo_access(1, &ctx->Pack, table->Size, 1, 1,
+                                  format, type, data)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetColorTable(invalid PBO access)");
+      return;
+   }
+
+   data = _mesa_map_pbo_dest(ctx, &ctx->Pack, data);
+   if (!data) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          /* buffer is already mapped - that's an error */
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glGetColorTable(PBO is mapped)");
-         return;
       }
-      data = ADD_POINTERS(buf, data);
+      return;
    }
 
    _mesa_pack_rgba_span_float(ctx, table->Size, rgba,
                               format, type, data, &ctx->Pack, 0x0);
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 }
 
 
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 69dba72ed3..7e0761e68b 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -144,27 +144,19 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G
    ctx->Convolution1D.Width = width;
    ctx->Convolution1D.Height = 1;
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* unpack filter from PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(1, &ctx->Unpack, width, 1, 1,
-                                     format, type, image)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glConvolutionFilter1D(invalid PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!_mesa_validate_pbo_access(1, &ctx->Unpack, width, 1, 1,
+                                  format, type, image)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glConvolutionFilter1D(invalid PBO access)");
+      return;
+   }
+
+   image = _mesa_map_pbo_source(ctx, &ctx->Unpack, image);
+   if (!image) {
+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glConvolutionFilter1D(PBO is mapped)");
-         return;
       }
-      image = ADD_POINTERS(buf, image);
-   }
-   else if (!image) {
       return;
    }
 
@@ -173,10 +165,7 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G
                                  format, type, image, &ctx->Unpack,
                                  0); /* transferOps */
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
 
    _mesa_scale_and_bias_rgba(width,
                              (GLfloat (*)[4]) ctx->Convolution1D.Filter,
@@ -242,27 +231,19 @@ _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G
    ctx->Convolution2D.Width = width;
    ctx->Convolution2D.Height = height;
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* unpack filter from PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
-                                     format, type, image)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glConvolutionFilter2D(invalid PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
+                                  format, type, image)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glConvolutionFilter2D(invalid PBO access)");
+      return;
+   }
+
+   image = _mesa_map_pbo_source(ctx, &ctx->Unpack, image);
+   if (!image) {
+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glConvolutionFilter2D(PBO is mapped)");
-         return;
       }
-      image = ADD_POINTERS(buf, image);
-   }
-   else if (!image) {
       return;
    }
 
@@ -276,10 +257,7 @@ _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G
                                     0); /* transferOps */
    }
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
 
    _mesa_scale_and_bias_rgba(width * height,
                              (GLfloat (*)[4]) ctx->Convolution2D.Filter,
@@ -598,26 +576,21 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
          return;
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* Pack the filter into a PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(2, &ctx->Pack,
-                                     filter->Width, filter->Height,
-                                     1, format, type, image)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetConvolutionFilter(invalid PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!_mesa_validate_pbo_access(2, &ctx->Pack,
+                                  filter->Width, filter->Height,
+                                  1, format, type, image)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetConvolutionFilter(invalid PBO access)");
+      return;
+   }
+
+   image = _mesa_map_pbo_dest(ctx, &ctx->Pack, image);
+   if (!image) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glGetConvolutionFilter(PBO is mapped)");
-         return;
       }
-      image = ADD_POINTERS(image, buf);
+      return;
    }
 
    for (row = 0; row < filter->Height; row++) {
@@ -629,10 +602,7 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
                                  format, type, dst, &ctx->Pack, 0x0);
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 }
 
 
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index 726a50d3b1..f1d01cdb62 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -649,27 +649,19 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo
       return;
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* pack min/max values into a PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(1, &ctx->Pack, 2, 1, 1,
-                                     format, type, values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetMinMax(invalid PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
+   if (!_mesa_validate_pbo_access(1, &ctx->Pack, 2, 1, 1,
+                                  format, type, values)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetMinMax(invalid PBO access)");
+      return;
+   }
+
+   values = _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          /* buffer is already mapped - that's an error */
          _mesa_error(ctx, GL_INVALID_OPERATION,"glGetMinMax(PBO is mapped)");
-         return;
       }
-      values = ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
-      /* not an error */
       return;
    }
 
@@ -687,10 +679,7 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo
                                  format, type, values, &ctx->Pack, 0x0);
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 
    if (reset) {
       _mesa_ResetMinmax(GL_MINMAX);
@@ -733,27 +722,18 @@ _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, G
       return;
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* pack min/max values into a PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(1, &ctx->Pack, ctx->Histogram.Width, 1, 1,
-                                     format, type, values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetHistogram(invalid PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!_mesa_validate_pbo_access(1, &ctx->Pack, ctx->Histogram.Width, 1, 1,
+                                  format, type, values)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetHistogram(invalid PBO access)");
+      return;
+   }
+
+   values = _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          _mesa_error(ctx,GL_INVALID_OPERATION,"glGetHistogram(PBO is mapped)");
-         return;
       }
-      values = ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
-      /* not an error */
       return;
    }
 
@@ -761,10 +741,7 @@ _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, G
                   (CONST GLuint (*)[4]) ctx->Histogram.Count,
                   format, type, values, &ctx->Pack);
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 
    if (reset) {
       GLuint i;
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index 25f55a422f..fcef6dfd42 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -136,6 +136,33 @@ store_pixelmap(GLcontext *ctx, GLenum map, GLsizei mapsize,
 }
 
 
+/**
+ * Convenience wrapper for _mesa_validate_pbo_access() for gl[Get]PixelMap().
+ */
+static GLboolean
+validate_pbo_access(GLcontext *ctx, struct gl_pixelstore_attrib *pack,
+                    GLsizei mapsize, GLenum format, GLenum type,
+                    const GLvoid *ptr)
+{
+   GLboolean ok;
+
+   /* Note, need to use DefaultPacking and Unpack's buffer object */
+   ctx->DefaultPacking.BufferObj = pack->BufferObj;
+
+   ok = _mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,
+                                  format, type, ptr);
+
+   /* restore */
+   ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
+
+   if (!ok) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glPixelMap(invalid PBO access)");
+   }
+   return ok;
+}
+
+
 void GLAPIENTRY
 _mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values )
 {
@@ -158,40 +185,23 @@ _mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values )
 
    FLUSH_VERTICES(ctx, _NEW_PIXEL);
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* unpack pixelmap from PBO */
-      GLubyte *buf;
-      /* Note, need to use DefaultPacking and Unpack's buffer object */
-      ctx->DefaultPacking.BufferObj = ctx->Unpack.BufferObj;
-      if (!_mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,
-                                     GL_INTENSITY, GL_FLOAT, values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glPixelMapfv(invalid PBO access)");
-         return;
-      }
-      /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!validate_pbo_access(ctx, &ctx->Unpack, mapsize,
+                            GL_INTENSITY, GL_FLOAT, values)) {
+      return;
+   }
+
+   values = (const GLfloat *) _mesa_map_pbo_source(ctx, &ctx->Unpack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glPixelMapfv(PBO is mapped)");
-         return;
       }
-      values = (const GLfloat *) ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
       return;
    }
 
    store_pixelmap(ctx, map, mapsize, values);
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
 }
 
 
@@ -217,31 +227,17 @@ _mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values )
 
    FLUSH_VERTICES(ctx, _NEW_PIXEL);
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* unpack pixelmap from PBO */
-      GLubyte *buf;
-      /* Note, need to use DefaultPacking and Unpack's buffer object */
-      ctx->DefaultPacking.BufferObj = ctx->Unpack.BufferObj;
-      if (!_mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,
-                                     GL_INTENSITY, GL_UNSIGNED_INT, values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glPixelMapuiv(invalid PBO access)");
-         return;
-      }
-      /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!validate_pbo_access(ctx, &ctx->Unpack, mapsize,
+                            GL_INTENSITY, GL_UNSIGNED_INT, values)) {
+      return;
+   }
+
+   values = (const GLuint *) _mesa_map_pbo_source(ctx, &ctx->Unpack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glPixelMapuiv(PBO is mapped)");
-         return;
       }
-      values = (const GLuint *) ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
       return;
    }
 
@@ -259,10 +255,7 @@ _mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values )
       }
    }
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
 
    store_pixelmap(ctx, map, mapsize, fvalues);
 }
@@ -290,32 +283,17 @@ _mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values )
 
    FLUSH_VERTICES(ctx, _NEW_PIXEL);
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* unpack pixelmap from PBO */
-      GLubyte *buf;
-      /* Note, need to use DefaultPacking and Unpack's buffer object */
-      ctx->DefaultPacking.BufferObj = ctx->Unpack.BufferObj;
-      if (!_mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,
-                                     GL_INTENSITY, GL_UNSIGNED_SHORT,
-                                     values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glPixelMapusv(invalid PBO access)");
-         return;
-      }
-      /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!validate_pbo_access(ctx, &ctx->Unpack, mapsize,
+                            GL_INTENSITY, GL_UNSIGNED_SHORT, values)) {
+      return;
+   }
+
+   values = (const GLushort *) _mesa_map_pbo_source(ctx, &ctx->Unpack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glPixelMapusv(PBO is mapped)");
-         return;
       }
-      values = (const GLushort *) ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
       return;
    }
 
@@ -333,10 +311,7 @@ _mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values )
       }
    }
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
 
    store_pixelmap(ctx, map, mapsize, fvalues);
 }
@@ -359,31 +334,17 @@ _mesa_GetPixelMapfv( GLenum map, GLfloat *values )
 
    mapsize = pm->Size;
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* pack pixelmap into PBO */
-      GLubyte *buf;
-      /* Note, need to use DefaultPacking and Pack's buffer object */
-      ctx->DefaultPacking.BufferObj = ctx->Pack.BufferObj;
-      if (!_mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,
-                                     GL_INTENSITY, GL_FLOAT, values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetPixelMapfv(invalid PBO access)");
-         return;
-      }
-      /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!validate_pbo_access(ctx, &ctx->Pack, mapsize,
+                            GL_INTENSITY, GL_FLOAT, values)) {
+      return;
+   }
+
+   values = (GLfloat *) _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glGetPixelMapfv(PBO is mapped)");
-         return;
       }
-      values = (GLfloat *) ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
       return;
    }
 
@@ -397,10 +358,7 @@ _mesa_GetPixelMapfv( GLenum map, GLfloat *values )
       MEMCPY(values, pm->Map, mapsize * sizeof(GLfloat));
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 }
 
 
@@ -420,31 +378,17 @@ _mesa_GetPixelMapuiv( GLenum map, GLuint *values )
    }
    mapsize = pm->Size;
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* pack pixelmap into PBO */
-      GLubyte *buf;
-      /* Note, need to use DefaultPacking and Pack's buffer object */
-      ctx->DefaultPacking.BufferObj = ctx->Pack.BufferObj;
-      if (!_mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,
-                                     GL_INTENSITY, GL_UNSIGNED_INT, values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetPixelMapuiv(invalid PBO access)");
-         return;
-      }
-      /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!validate_pbo_access(ctx, &ctx->Pack, mapsize,
+                            GL_INTENSITY, GL_UNSIGNED_INT, values)) {
+      return;
+   }
+
+   values = (GLuint *) _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glGetPixelMapuiv(PBO is mapped)");
-         return;
       }
-      values = (GLuint *) ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
       return;
    }
 
@@ -458,10 +402,7 @@ _mesa_GetPixelMapuiv( GLenum map, GLuint *values )
       }
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 }
 
 
@@ -481,32 +422,17 @@ _mesa_GetPixelMapusv( GLenum map, GLushort *values )
    }
    mapsize = pm ? pm->Size : 0;
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* pack pixelmap into PBO */
-      GLubyte *buf;
-      /* Note, need to use DefaultPacking and Pack's buffer object */
-      ctx->DefaultPacking.BufferObj = ctx->Pack.BufferObj;
-      if (!_mesa_validate_pbo_access(1, &ctx->DefaultPacking, mapsize, 1, 1,
-                                     GL_INTENSITY, GL_UNSIGNED_SHORT,
-                                     values)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetPixelMapusv(invalid PBO access)");
-         return;
-      }
-      /* restore */
-      ctx->DefaultPacking.BufferObj = ctx->Shared->NullBufferObj;
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
+   if (!validate_pbo_access(ctx, &ctx->Pack, mapsize,
+                            GL_INTENSITY, GL_UNSIGNED_SHORT, values)) {
+      return;
+   }
+
+   values = (GLushort *) _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
+   if (!values) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glGetPixelMapusv(PBO is mapped)");
-         return;
       }
-      values = (GLushort *) ADD_POINTERS(buf, values);
-   }
-   else if (!values) {
       return;
    }
 
@@ -528,10 +454,7 @@ _mesa_GetPixelMapusv( GLenum map, GLushort *values )
       }
    }
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 }
 
 
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c
index d11c9424d5..e327a52415 100644
--- a/src/mesa/main/polygon.c
+++ b/src/mesa/main/polygon.c
@@ -193,32 +193,25 @@ _mesa_PolygonMode( GLenum face, GLenum mode )
 void
 _mesa_polygon_stipple(GLcontext *ctx, const GLubyte *pattern)
 {
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* Get/unpack the stipple pattern from a PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(2, &ctx->Unpack, 32, 32, 1,
-                                     GL_COLOR_INDEX, GL_BITMAP, pattern)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glPolygonStipple(bad PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
+   if (!_mesa_validate_pbo_access(2, &ctx->Unpack, 32, 32, 1,
+                                  GL_COLOR_INDEX, GL_BITMAP, pattern)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glPolygonStipple(bad PBO access)");
+      return;
+   }
+
+   pattern = _mesa_map_pbo_source(ctx, &ctx->Unpack, pattern);
+   if (!pattern) {
+      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glPolygonStipple(PBO mapped)");
-         return;
       }
-      buf = ADD_POINTERS(buf, pattern);
-      _mesa_unpack_polygon_stipple(buf, ctx->PolygonStipple, &ctx->Unpack);
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
-   else {
-      /* Get/unpack the stipple pattern from user memory */
-      _mesa_unpack_polygon_stipple(pattern, ctx->PolygonStipple, &ctx->Unpack);
+      return;
    }
+
+   _mesa_unpack_polygon_stipple(pattern, ctx->PolygonStipple, &ctx->Unpack);
+
+   _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
 }
 
 
@@ -255,35 +248,25 @@ _mesa_GetPolygonStipple( GLubyte *dest )
    if (MESA_VERBOSE&VERBOSE_API)
       _mesa_debug(ctx, "glGetPolygonStipple\n");
 
-   /* XXX someday we may put this code into a separate function and call
-    * it with ctx->Driver.GetPolygonStipple().
-    */
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* Put/pack the stipple pattern into a PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(2, &ctx->Pack, 32, 32, 1,
-                                     GL_COLOR_INDEX, GL_BITMAP, dest)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetPolygonStipple(bad PBO access)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
+   if (!_mesa_validate_pbo_access(2, &ctx->Pack, 32, 32, 1,
+                                  GL_COLOR_INDEX, GL_BITMAP, dest)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glGetPolygonStipple(bad PBO access)");
+      return;
+   }
+
+   dest = _mesa_map_pbo_dest(ctx, &ctx->Pack, dest);
+   if (!dest) {
+      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glGetPolygonStipple(PBO mapped)");
-         return;
       }
-      buf = ADD_POINTERS(buf, dest);
-      _mesa_pack_polygon_stipple(ctx->PolygonStipple, buf, &ctx->Pack);
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
-   }
-   else {
-      /* Put/pack the stipple pattern into user memory */
-      _mesa_pack_polygon_stipple(ctx->PolygonStipple, dest, &ctx->Pack);
+      return;
    }
+
+   _mesa_pack_polygon_stipple(ctx->PolygonStipple, dest, &ctx->Pack);
+
+   _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
 }
 
 
-- 
cgit v1.2.3


From dc947c8f92732fab75f89015e2d506e964a41ace Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 11:22:27 -0600
Subject: mesa: combined PBO validate/map helpers

---
 src/mesa/main/bufferobj.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/bufferobj.h | 16 +++++++++
 2 files changed, 98 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 1ae63a0ef6..b95e00af5b 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -745,6 +745,47 @@ _mesa_map_pbo_source(GLcontext *ctx,
 }
 
 
+/**
+ * Combine PBO-read validation and mapping.
+ * If any GL errors are detected, they'll be recorded and NULL returned.
+ * \sa _mesa_validate_pbo_access
+ * \sa _mesa_map_pbo_source
+ * A call to this function should have a matching call to
+ * _mesa_unmap_pbo_source().
+ */
+const GLvoid *
+_mesa_map_validate_pbo_source(GLcontext *ctx,
+                              GLuint dimensions,
+                              const struct gl_pixelstore_attrib *unpack,
+                              GLsizei width, GLsizei height, GLsizei depth,
+                              GLenum format, GLenum type, const GLvoid *ptr,
+                              const char *where)
+{
+   ASSERT(dimensions == 1 || dimensions == 2 || dimensions == 3);
+
+   if (!_mesa_is_bufferobj(unpack->BufferObj)) {
+      /* non-PBO access: no validation to be done */
+      return ptr;
+   }
+
+   if (!_mesa_validate_pbo_access(dimensions, unpack,
+                                  width, height, depth, format, type, ptr)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "%s(out of bounds PBO access)", where);
+      return NULL;
+   }
+
+   if (_mesa_bufferobj_mapped(unpack->BufferObj)) {
+      /* buffer is already mapped - that's an error */
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)", where);
+      return NULL;
+   }
+
+   ptr = _mesa_map_pbo_source(ctx, unpack, ptr);
+   return ptr;
+}
+
+
 /**
  * Counterpart to _mesa_map_pbo_source()
  */
@@ -794,6 +835,47 @@ _mesa_map_pbo_dest(GLcontext *ctx,
 }
 
 
+/**
+ * Combine PBO-write validation and mapping.
+ * If any GL errors are detected, they'll be recorded and NULL returned.
+ * \sa _mesa_validate_pbo_access
+ * \sa _mesa_map_pbo_dest
+ * A call to this function should have a matching call to
+ * _mesa_unmap_pbo_dest().
+ */
+GLvoid *
+_mesa_map_validate_pbo_dest(GLcontext *ctx,
+                            GLuint dimensions,
+                            const struct gl_pixelstore_attrib *unpack,
+                            GLsizei width, GLsizei height, GLsizei depth,
+                            GLenum format, GLenum type, GLvoid *ptr,
+                            const char *where)
+{
+   ASSERT(dimensions == 1 || dimensions == 2 || dimensions == 3);
+
+   if (!_mesa_is_bufferobj(unpack->BufferObj)) {
+      /* non-PBO access: no validation to be done */
+      return ptr;
+   }
+
+   if (!_mesa_validate_pbo_access(dimensions, unpack,
+                                  width, height, depth, format, type, ptr)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "%s(out of bounds PBO access)", where);
+      return NULL;
+   }
+
+   if (_mesa_bufferobj_mapped(unpack->BufferObj)) {
+      /* buffer is already mapped - that's an error */
+      _mesa_error(ctx, GL_INVALID_OPERATION, "%s(PBO is mapped)", where);
+      return NULL;
+   }
+
+   ptr = _mesa_map_pbo_dest(ctx, unpack, ptr);
+   return ptr;
+}
+
+
 /**
  * Counterpart to _mesa_map_pbo_dest()
  */
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index 2e7afc2d76..9f732ec0c0 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -86,6 +86,14 @@ _mesa_map_pbo_source(GLcontext *ctx,
                      const struct gl_pixelstore_attrib *unpack,
                      const GLvoid *src);
 
+extern const GLvoid *
+_mesa_map_validate_pbo_source(GLcontext *ctx,
+                              GLuint dimensions,
+                              const struct gl_pixelstore_attrib *unpack,
+                              GLsizei width, GLsizei height, GLsizei depth,
+                              GLenum format, GLenum type, const GLvoid *ptr,
+                              const char *where);
+
 extern void
 _mesa_unmap_pbo_source(GLcontext *ctx,
                        const struct gl_pixelstore_attrib *unpack);
@@ -95,6 +103,14 @@ _mesa_map_pbo_dest(GLcontext *ctx,
                    const struct gl_pixelstore_attrib *pack,
                    GLvoid *dest);
 
+extern GLvoid *
+_mesa_map_validate_pbo_dest(GLcontext *ctx,
+                            GLuint dimensions,
+                            const struct gl_pixelstore_attrib *unpack,
+                            GLsizei width, GLsizei height, GLsizei depth,
+                            GLenum format, GLenum type, GLvoid *ptr,
+                            const char *where);
+
 extern void
 _mesa_unmap_pbo_dest(GLcontext *ctx,
                      const struct gl_pixelstore_attrib *pack);
-- 
cgit v1.2.3


From 95027a00870bc1d12ea24dfb092a0cad6cbd5035 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 11:23:05 -0600
Subject: mesa: use new combined PBO validate/map helpers

---
 src/mesa/main/colortab.c  | 39 ++++++++-----------------------
 src/mesa/main/convolve.c  | 58 ++++++++++++-----------------------------------
 src/mesa/main/histogram.c | 34 +++++++--------------------
 src/mesa/main/polygon.c   | 38 ++++++++-----------------------
 4 files changed, 43 insertions(+), 126 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 91c29882ec..5a7de5f209 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -179,21 +179,12 @@ store_colortable_entries(GLcontext *ctx, struct gl_color_table *table,
 			 GLfloat bScale, GLfloat bBias,
 			 GLfloat aScale, GLfloat aBias)
 {
-   if (!_mesa_validate_pbo_access(1, &ctx->Unpack, count, 1, 1,
-                                  format, type, data)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glColor[Sub]Table(bad PBO access)");
+   data = _mesa_map_validate_pbo_source(ctx, 
+                                        1, &ctx->Unpack, count, 1, 1,
+                                        format, type, data,
+                                        "glColor[Sub]Table");
+   if (!data)
       return;
-   }
-
-   data = _mesa_map_pbo_source(ctx, &ctx->Unpack, data);
-   if (!data) {
-      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glColor[Sub]Table(PBO mapped)");
-      }
-      return;
-   }
 
    {
       /* convert user-provided data to GLfloat values */
@@ -688,22 +679,12 @@ _mesa_GetColorTable( GLenum target, GLenum format,
       return;
    }
 
-   if (!_mesa_validate_pbo_access(1, &ctx->Pack, table->Size, 1, 1,
-                                  format, type, data)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetColorTable(invalid PBO access)");
+   data = _mesa_map_validate_pbo_dest(ctx, 
+                                      1, &ctx->Pack, table->Size, 1, 1,
+                                      format, type, data,
+                                      "glGetColorTable");
+   if (!data)
       return;
-   }
-
-   data = _mesa_map_pbo_dest(ctx, &ctx->Pack, data);
-   if (!data) {
-      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetColorTable(PBO is mapped)");
-      }
-      return;
-   }
 
    _mesa_pack_rgba_span_float(ctx, table->Size, rgba,
                               format, type, data, &ctx->Pack, 0x0);
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 7e0761e68b..714909f451 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -144,21 +144,12 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G
    ctx->Convolution1D.Width = width;
    ctx->Convolution1D.Height = 1;
 
-   if (!_mesa_validate_pbo_access(1, &ctx->Unpack, width, 1, 1,
-                                  format, type, image)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glConvolutionFilter1D(invalid PBO access)");
+   image = _mesa_map_validate_pbo_source(ctx, 
+                                        1, &ctx->Unpack, width, 1, 1,
+                                        format, type, image,
+                                        "glConvolutionFilter1D");
+   if (!image)
       return;
-   }
-
-   image = _mesa_map_pbo_source(ctx, &ctx->Unpack, image);
-   if (!image) {
-      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glConvolutionFilter1D(PBO is mapped)");
-      }
-      return;
-   }
 
    _mesa_unpack_color_span_float(ctx, width, GL_RGBA,
                                  ctx->Convolution1D.Filter,
@@ -231,21 +222,12 @@ _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, G
    ctx->Convolution2D.Width = width;
    ctx->Convolution2D.Height = height;
 
-   if (!_mesa_validate_pbo_access(2, &ctx->Unpack, width, height, 1,
-                                  format, type, image)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glConvolutionFilter2D(invalid PBO access)");
+   image = _mesa_map_validate_pbo_source(ctx, 
+                                         2, &ctx->Unpack, width, height, 1,
+                                         format, type, image,
+                                         "glConvolutionFilter2D");
+   if (!image)
       return;
-   }
-
-   image = _mesa_map_pbo_source(ctx, &ctx->Unpack, image);
-   if (!image) {
-      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glConvolutionFilter2D(PBO is mapped)");
-      }
-      return;
-   }
 
    /* Unpack filter image.  We always store filters in RGBA format. */
    for (i = 0; i < height; i++) {
@@ -576,22 +558,12 @@ _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
          return;
    }
 
-   if (!_mesa_validate_pbo_access(2, &ctx->Pack,
-                                  filter->Width, filter->Height,
-                                  1, format, type, image)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetConvolutionFilter(invalid PBO access)");
-      return;
-   }
-
-   image = _mesa_map_pbo_dest(ctx, &ctx->Pack, image);
-   if (!image) {
-      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetConvolutionFilter(PBO is mapped)");
-      }
+   image = _mesa_map_validate_pbo_dest(ctx, 2, &ctx->Pack,
+                                       filter->Width, filter->Height, 1,
+                                       format, type, image,
+                                       "glGetConvolutionFilter");
+   if (!image)
       return;
-   }
 
    for (row = 0; row < filter->Height; row++) {
       GLvoid *dst = _mesa_image_address2d(&ctx->Pack, image, filter->Width,
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index f1d01cdb62..ceb0d5a6a8 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -649,21 +649,11 @@ _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvo
       return;
    }
 
-   if (!_mesa_validate_pbo_access(1, &ctx->Pack, 2, 1, 1,
-                                  format, type, values)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetMinMax(invalid PBO access)");
-      return;
-   }
 
-   values = _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
-   if (!values) {
-      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION,"glGetMinMax(PBO is mapped)");
-      }
+   values = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack, 2, 1, 1,
+                                        format, type, values, "glGetMinmax");
+   if (!values)
       return;
-   }
 
    {
       GLfloat minmax[2][4];
@@ -722,20 +712,12 @@ _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, G
       return;
    }
 
-   if (!_mesa_validate_pbo_access(1, &ctx->Pack, ctx->Histogram.Width, 1, 1,
-                                  format, type, values)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetHistogram(invalid PBO access)");
+   values = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack,
+                                        ctx->Histogram.Width, 1, 1,
+                                        format, type, values,
+                                        "glGetHistogram");
+   if (!values)
       return;
-   }
-
-   values = _mesa_map_pbo_dest(ctx, &ctx->Pack, values);
-   if (!values) {
-      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-         _mesa_error(ctx,GL_INVALID_OPERATION,"glGetHistogram(PBO is mapped)");
-      }
-      return;
-   }
 
    pack_histogram(ctx, ctx->Histogram.Width,
                   (CONST GLuint (*)[4]) ctx->Histogram.Count,
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c
index e327a52415..376a87a396 100644
--- a/src/mesa/main/polygon.c
+++ b/src/mesa/main/polygon.c
@@ -193,21 +193,12 @@ _mesa_PolygonMode( GLenum face, GLenum mode )
 void
 _mesa_polygon_stipple(GLcontext *ctx, const GLubyte *pattern)
 {
-   if (!_mesa_validate_pbo_access(2, &ctx->Unpack, 32, 32, 1,
-                                  GL_COLOR_INDEX, GL_BITMAP, pattern)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glPolygonStipple(bad PBO access)");
+   pattern = _mesa_map_validate_pbo_source(ctx, 2,
+                                           &ctx->Unpack, 32, 32, 1,
+                                           GL_COLOR_INDEX, GL_BITMAP, pattern,
+                                           "glPolygonStipple");
+   if (!pattern)
       return;
-   }
-
-   pattern = _mesa_map_pbo_source(ctx, &ctx->Unpack, pattern);
-   if (!pattern) {
-      if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glPolygonStipple(PBO mapped)");
-      }
-      return;
-   }
 
    _mesa_unpack_polygon_stipple(pattern, ctx->PolygonStipple, &ctx->Unpack);
 
@@ -248,21 +239,12 @@ _mesa_GetPolygonStipple( GLubyte *dest )
    if (MESA_VERBOSE&VERBOSE_API)
       _mesa_debug(ctx, "glGetPolygonStipple\n");
 
-   if (!_mesa_validate_pbo_access(2, &ctx->Pack, 32, 32, 1,
-                                  GL_COLOR_INDEX, GL_BITMAP, dest)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glGetPolygonStipple(bad PBO access)");
+   dest = _mesa_map_validate_pbo_dest(ctx, 2,
+                                      &ctx->Pack, 32, 32, 1,
+                                      GL_COLOR_INDEX, GL_BITMAP, dest,
+                                      "glGetPolygonStipple");
+   if (!dest)
       return;
-   }
-
-   dest = _mesa_map_pbo_dest(ctx, &ctx->Pack, dest);
-   if (!dest) {
-      if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetPolygonStipple(PBO mapped)");
-      }
-      return;
-   }
 
    _mesa_pack_polygon_stipple(ctx->PolygonStipple, dest, &ctx->Pack);
 
-- 
cgit v1.2.3


From 2db37ef659a43267dcb4c7a3c69b410a60a2a5d6 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 11:41:29 -0600
Subject: mesa: use new combined PBO validate/map helpers in convolution/filter
 funcs

---
 src/mesa/main/convolve.c | 89 +++++++++++++-----------------------------------
 1 file changed, 23 insertions(+), 66 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 714909f451..4d17f533d7 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -744,59 +744,35 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
 
    filter = &ctx->Separable2D;
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* Pack filter into PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(1, &ctx->Pack, filter->Width, 1, 1,
-                                     format, type, row)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetSeparableFilter(invalid PBO access, width)");
-         return;
-      }
-      if (!_mesa_validate_pbo_access(1, &ctx->Pack, filter->Height, 1, 1,
-                                     format, type, column)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetSeparableFilter(invalid PBO access, height)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              ctx->Pack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glGetSeparableFilter(PBO is mapped)");
-         return;
-      }
-      row = ADD_POINTERS(buf, row);
-      column = ADD_POINTERS(buf, column);
-   }
-
-   /* Row filter */
+   /* Get row filter */
+   row = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack,
+                                     filter->Width, 1, 1,
+                                     format, type, row,
+                                     "glGetConvolutionFilter");
    if (row) {
       GLvoid *dst = _mesa_image_address1d(&ctx->Pack, row, filter->Width,
                                           format, type, 0);
       _mesa_pack_rgba_span_float(ctx, filter->Width,
                                  (GLfloat (*)[4]) filter->Filter,
                                  format, type, dst, &ctx->Pack, 0x0);
+      _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
    }
 
-   /* Column filter */
+   /* get column filter */
+   column = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack,
+                                        filter->Height, 1, 1,
+                                        format, type, row,
+                                        "glGetConvolutionFilter");
    if (column) {
       GLvoid *dst = _mesa_image_address1d(&ctx->Pack, column, filter->Height,
                                           format, type, 0);
       GLfloat (*src)[4] = (GLfloat (*)[4]) (filter->Filter + colStart);
       _mesa_pack_rgba_span_float(ctx, filter->Height, src,
                                  format, type, dst, &ctx->Pack, 0x0);
+      _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
    }
 
    (void) span;  /* unused at this time */
-
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      /* Pack filter into PBO */
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              ctx->Unpack.BufferObj);
-   }
 }
 
 
@@ -847,41 +823,16 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
    ctx->Separable2D.Width = width;
    ctx->Separable2D.Height = height;
 
-   if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-      /* unpack filter from PBO */
-      GLubyte *buf;
-      if (!_mesa_validate_pbo_access(1, &ctx->Unpack, width, 1, 1,
-                                     format, type, row)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glSeparableFilter2D(invalid PBO access, width)");
-         return;
-      }
-      if (!_mesa_validate_pbo_access(1, &ctx->Unpack, height, 1, 1,
-                                     format, type, column)) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glSeparableFilter2D(invalid PBO access, height)");
-         return;
-      }
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                              GL_READ_ONLY_ARB,
-                                              ctx->Unpack.BufferObj);
-      if (!buf) {
-         /* buffer is already mapped - that's an error */
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glSeparableFilter2D(PBO is mapped)");
-         return;
-      }
-      row = ADD_POINTERS(buf, row);
-      column = ADD_POINTERS(buf, column);
-   }
-
    /* unpack row filter */
+   row = _mesa_map_validate_pbo_source(ctx, 1, &ctx->Unpack,
+                                       width, 1, 1,
+                                       format, type, row,
+                                       "glSeperableFilter2D");
    if (row) {
       _mesa_unpack_color_span_float(ctx, width, GL_RGBA,
                                     ctx->Separable2D.Filter,
                                     format, type, row, &ctx->Unpack,
-                                    0);  /* transferOps */
-
+                                    0x0);  /* transferOps */
       _mesa_scale_and_bias_rgba(width,
                              (GLfloat (*)[4]) ctx->Separable2D.Filter,
                              ctx->Pixel.ConvolutionFilterScale[2][0],
@@ -892,9 +843,14 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
                              ctx->Pixel.ConvolutionFilterBias[2][1],
                              ctx->Pixel.ConvolutionFilterBias[2][2],
                              ctx->Pixel.ConvolutionFilterBias[2][3]);
+      _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
    }
 
    /* unpack column filter */
+   column = _mesa_map_validate_pbo_source(ctx, 1, &ctx->Unpack,
+                                          height, 1, 1,
+                                          format, type, row,
+                                          "glSeperableFilter2D");
    if (column) {
       _mesa_unpack_color_span_float(ctx, height, GL_RGBA,
                                     &ctx->Separable2D.Filter[colStart],
@@ -911,6 +867,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
                        ctx->Pixel.ConvolutionFilterBias[2][1],
                        ctx->Pixel.ConvolutionFilterBias[2][2],
                        ctx->Pixel.ConvolutionFilterBias[2][3]);
+      _mesa_unmap_pbo_source(ctx, &ctx->Unpack);
    }
 
    if (_mesa_is_bufferobj(ctx->Unpack.BufferObj)) {
-- 
cgit v1.2.3


From 7a7d5879e28607c151132a8b6a07cf4be36b5b3e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 2 Sep 2009 15:39:13 -0600
Subject: mesa: compute tex env program key size based on nr_enabled_units

When no textures are enabled, the key size is 4 bytes.  If unit[0] is
enabled, the key size is 16 bytes.

Inspired by a patch from Chris Wilson.
---
 src/mesa/main/texenvprogram.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index b4923e904d..870970a355 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -99,6 +99,7 @@ struct state_key {
    GLuint fog_mode:2;          /**< FOG_x */
    GLuint inputs_available:12;
 
+   /* NOTE: This array of structs must be last! (see "keySize" below) */
    struct {
       GLuint enabled:1;
       GLuint source_index:3;   /**< TEXTURE_x_INDEX */
@@ -368,11 +369,12 @@ static GLbitfield get_fp_input_mask( GLcontext *ctx )
  * Examine current texture environment state and generate a unique
  * key to identify it.
  */
-static void make_state_key( GLcontext *ctx,  struct state_key *key )
+static GLuint make_state_key( GLcontext *ctx,  struct state_key *key )
 {
    GLuint i, j;
    GLbitfield inputs_referenced = FRAG_BIT_COL0;
    const GLbitfield inputs_available = get_fp_input_mask( ctx );
+   GLuint keySize;
 
    memset(key, 0, sizeof(*key));
 
@@ -390,7 +392,7 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
 
       key->unit[i].enabled = 1;
       key->enabled_units |= (1<<i);
-      key->nr_enabled_units = i+1;
+      key->nr_enabled_units = i + 1;
       inputs_referenced |= FRAG_BIT_TEX(i);
 
       key->unit[i].source_index =
@@ -443,8 +445,15 @@ static void make_state_key( GLcontext *ctx,  struct state_key *key )
    }
 
    key->inputs_available = (inputs_available & inputs_referenced);
+
+   /* compute size of state key, ignoring unused texture units */
+   keySize = sizeof(*key) - sizeof(key->unit)
+      + key->nr_enabled_units * sizeof(key->unit[0]);
+
+   return keySize;
 }
 
+
 /**
  * Use uregs to represent registers internally, translate to Mesa's
  * expected formats on emit.  
@@ -1390,7 +1399,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
       GLboolean needbumpstage = GL_FALSE;
 
       /* Zeroth pass - bump map textures first */
-      for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)
+      for (unit = 0; unit < key->nr_enabled_units; unit++)
 	 if (key->unit[unit].enabled &&
              key->unit[unit].ModeRGB == MODE_BUMP_ENVMAP_ATI) {
 	    needbumpstage = GL_TRUE;
@@ -1403,7 +1412,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
        * all referenced texture sources and emit texld instructions
        * for each:
        */
-      for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)
+      for (unit = 0; unit < key->nr_enabled_units; unit++)
 	 if (key->unit[unit].enabled) {
 	    load_texunit_sources( &p, unit );
 	    p.last_tex_stage = unit;
@@ -1411,7 +1420,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
 
       /* Second pass - emit combine instructions to build final color:
        */
-      for (unit = 0; unit < ctx->Const.MaxTextureUnits; unit++)
+      for (unit = 0; unit < key->nr_enabled_units; unit++)
 	 if (key->unit[unit].enabled) {
 	    p.src_previous = emit_texenv( &p, unit );
             reserve_temp(&p, p.src_previous); /* don't re-use this temp reg */
@@ -1502,12 +1511,13 @@ _mesa_get_fixed_func_fragment_program(GLcontext *ctx)
 {
    struct gl_fragment_program *prog;
    struct state_key key;
+   GLuint keySize;
 	
-   make_state_key(ctx, &key);
+   keySize = make_state_key(ctx, &key);
       
    prog = (struct gl_fragment_program *)
       _mesa_search_program_cache(ctx->FragmentProgram.Cache,
-                                 &key, sizeof(key));
+                                 &key, keySize);
 
    if (!prog) {
       prog = (struct gl_fragment_program *) 
@@ -1516,7 +1526,7 @@ _mesa_get_fixed_func_fragment_program(GLcontext *ctx)
       create_new_program(ctx, &key, prog);
 
       _mesa_program_cache_insert(ctx, ctx->FragmentProgram.Cache,
-                                 &key, sizeof(key), &prog->Base);
+                                 &key, keySize, &prog->Base);
    }
 
    return prog;
-- 
cgit v1.2.3


From d75a99edd6386ab26d69a3f0cbbed4c79fe5fad4 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 12:10:53 -0600
Subject: mesa: fix typos in separable filter functions

---
 src/mesa/main/convolve.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 4d17f533d7..70951112a1 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -761,7 +761,7 @@ _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
    /* get column filter */
    column = _mesa_map_validate_pbo_dest(ctx, 1, &ctx->Pack,
                                         filter->Height, 1, 1,
-                                        format, type, row,
+                                        format, type, column,
                                         "glGetConvolutionFilter");
    if (column) {
       GLvoid *dst = _mesa_image_address1d(&ctx->Pack, column, filter->Height,
@@ -827,7 +827,7 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
    row = _mesa_map_validate_pbo_source(ctx, 1, &ctx->Unpack,
                                        width, 1, 1,
                                        format, type, row,
-                                       "glSeperableFilter2D");
+                                       "glSeparableFilter2D");
    if (row) {
       _mesa_unpack_color_span_float(ctx, width, GL_RGBA,
                                     ctx->Separable2D.Filter,
@@ -849,8 +849,8 @@ _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLs
    /* unpack column filter */
    column = _mesa_map_validate_pbo_source(ctx, 1, &ctx->Unpack,
                                           height, 1, 1,
-                                          format, type, row,
-                                          "glSeperableFilter2D");
+                                          format, type, column,
+                                          "glSeparableFilter2D");
    if (column) {
       _mesa_unpack_color_span_float(ctx, height, GL_RGBA,
                                     &ctx->Separable2D.Filter[colStart],
-- 
cgit v1.2.3


From 10067e464132e6d484c34dd277da5eb5e21cf491 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 28 Aug 2009 15:37:25 -0700
Subject: ARB sync: Add infrastructure for glGetInteger64v

---
 src/mesa/main/dd.h       |    2 +
 src/mesa/main/get.c      | 1832 ++++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/get.h      |    3 +
 src/mesa/main/get_gen.py |   22 +-
 src/mesa/main/imports.h  |    1 +
 src/mesa/main/macros.h   |    3 +
 6 files changed, 1862 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 4400e166c6..3a59872b5a 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -766,6 +766,8 @@ struct dd_function_table {
    /** Return the value or values of a selected parameter */
    GLboolean (*GetIntegerv)(GLcontext *ctx, GLenum pname, GLint *result);
    /** Return the value or values of a selected parameter */
+   GLboolean (*GetInteger64v)(GLcontext *ctx, GLenum pname, GLint64 *result);
+   /** Return the value or values of a selected parameter */
    GLboolean (*GetPointerv)(GLcontext *ctx, GLenum pname, GLvoid **result);
    /*@}*/
    
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index d0c9cea00c..fc742c4a90 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -20,8 +20,11 @@
 #define INT_TO_BOOLEAN(I)     ( (I) ? GL_TRUE : GL_FALSE )
 
 #define BOOLEAN_TO_INT(B)     ( (GLint) (B) )
+#define BOOLEAN_TO_INT64(B)   ( (GLint64) (B) )
 #define BOOLEAN_TO_FLOAT(B)   ( (B) ? 1.0F : 0.0F )
 
+#define ENUM_TO_INT64(E)      ( (GLint64) (E) )
+
 
 /*
  * Check if named extension is enabled, if not generate error and return.
@@ -5543,6 +5546,1835 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
    }
 }
 
+#if FEATURE_ARB_sync
+void GLAPIENTRY
+_mesa_GetInteger64v( GLenum pname, GLint64 *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!params)
+      return;
+
+   if (ctx->NewState)
+      _mesa_update_state(ctx);
+
+   if (ctx->Driver.GetInteger64v &&
+       ctx->Driver.GetInteger64v(ctx, pname, params))
+      return;
+
+   switch (pname) {
+      case GL_ACCUM_RED_BITS:
+         params[0] = ctx->DrawBuffer->Visual.accumRedBits;
+         break;
+      case GL_ACCUM_GREEN_BITS:
+         params[0] = ctx->DrawBuffer->Visual.accumGreenBits;
+         break;
+      case GL_ACCUM_BLUE_BITS:
+         params[0] = ctx->DrawBuffer->Visual.accumBlueBits;
+         break;
+      case GL_ACCUM_ALPHA_BITS:
+         params[0] = ctx->DrawBuffer->Visual.accumAlphaBits;
+         break;
+      case GL_ACCUM_CLEAR_VALUE:
+         params[0] = FLOAT_TO_INT64(ctx->Accum.ClearColor[0]);
+         params[1] = FLOAT_TO_INT64(ctx->Accum.ClearColor[1]);
+         params[2] = FLOAT_TO_INT64(ctx->Accum.ClearColor[2]);
+         params[3] = FLOAT_TO_INT64(ctx->Accum.ClearColor[3]);
+         break;
+      case GL_ALPHA_BIAS:
+         params[0] = IROUND64(ctx->Pixel.AlphaBias);
+         break;
+      case GL_ALPHA_BITS:
+         params[0] = ctx->DrawBuffer->Visual.alphaBits;
+         break;
+      case GL_ALPHA_SCALE:
+         params[0] = IROUND64(ctx->Pixel.AlphaScale);
+         break;
+      case GL_ALPHA_TEST:
+         params[0] = BOOLEAN_TO_INT64(ctx->Color.AlphaEnabled);
+         break;
+      case GL_ALPHA_TEST_FUNC:
+         params[0] = ENUM_TO_INT64(ctx->Color.AlphaFunc);
+         break;
+      case GL_ALPHA_TEST_REF:
+         params[0] = FLOAT_TO_INT64(ctx->Color.AlphaRef);
+         break;
+      case GL_ATTRIB_STACK_DEPTH:
+         params[0] = ctx->AttribStackDepth;
+         break;
+      case GL_AUTO_NORMAL:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.AutoNormal);
+         break;
+      case GL_AUX_BUFFERS:
+         params[0] = ctx->DrawBuffer->Visual.numAuxBuffers;
+         break;
+      case GL_BLEND:
+         params[0] = BOOLEAN_TO_INT64(ctx->Color.BlendEnabled);
+         break;
+      case GL_BLEND_DST:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendDstRGB);
+         break;
+      case GL_BLEND_SRC:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendSrcRGB);
+         break;
+      case GL_BLEND_SRC_RGB_EXT:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendSrcRGB);
+         break;
+      case GL_BLEND_DST_RGB_EXT:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendDstRGB);
+         break;
+      case GL_BLEND_SRC_ALPHA_EXT:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendSrcA);
+         break;
+      case GL_BLEND_DST_ALPHA_EXT:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendDstA);
+         break;
+      case GL_BLEND_EQUATION:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendEquationRGB );
+         break;
+      case GL_BLEND_EQUATION_ALPHA_EXT:
+         params[0] = ENUM_TO_INT64(ctx->Color.BlendEquationA );
+         break;
+      case GL_BLEND_COLOR_EXT:
+         params[0] = FLOAT_TO_INT64(ctx->Color.BlendColor[0]);
+         params[1] = FLOAT_TO_INT64(ctx->Color.BlendColor[1]);
+         params[2] = FLOAT_TO_INT64(ctx->Color.BlendColor[2]);
+         params[3] = FLOAT_TO_INT64(ctx->Color.BlendColor[3]);
+         break;
+      case GL_BLUE_BIAS:
+         params[0] = IROUND64(ctx->Pixel.BlueBias);
+         break;
+      case GL_BLUE_BITS:
+         params[0] = ctx->DrawBuffer->Visual.blueBits;
+         break;
+      case GL_BLUE_SCALE:
+         params[0] = IROUND64(ctx->Pixel.BlueScale);
+         break;
+      case GL_CLIENT_ATTRIB_STACK_DEPTH:
+         params[0] = ctx->ClientAttribStackDepth;
+         break;
+      case GL_CLIP_PLANE0:
+         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 0) & 1);
+         break;
+      case GL_CLIP_PLANE1:
+         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 1) & 1);
+         break;
+      case GL_CLIP_PLANE2:
+         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 2) & 1);
+         break;
+      case GL_CLIP_PLANE3:
+         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 3) & 1);
+         break;
+      case GL_CLIP_PLANE4:
+         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 4) & 1);
+         break;
+      case GL_CLIP_PLANE5:
+         params[0] = BOOLEAN_TO_INT64((ctx->Transform.ClipPlanesEnabled >> 5) & 1);
+         break;
+      case GL_COLOR_CLEAR_VALUE:
+         params[0] = FLOAT_TO_INT64(ctx->Color.ClearColor[0]);
+         params[1] = FLOAT_TO_INT64(ctx->Color.ClearColor[1]);
+         params[2] = FLOAT_TO_INT64(ctx->Color.ClearColor[2]);
+         params[3] = FLOAT_TO_INT64(ctx->Color.ClearColor[3]);
+         break;
+      case GL_COLOR_MATERIAL:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.ColorMaterialEnabled);
+         break;
+      case GL_COLOR_MATERIAL_FACE:
+         params[0] = ENUM_TO_INT64(ctx->Light.ColorMaterialFace);
+         break;
+      case GL_COLOR_MATERIAL_PARAMETER:
+         params[0] = ENUM_TO_INT64(ctx->Light.ColorMaterialMode);
+         break;
+      case GL_COLOR_WRITEMASK:
+         params[0] = ctx->Color.ColorMask[RCOMP] ? 1 : 0;
+         params[1] = ctx->Color.ColorMask[GCOMP] ? 1 : 0;
+         params[2] = ctx->Color.ColorMask[BCOMP] ? 1 : 0;
+         params[3] = ctx->Color.ColorMask[ACOMP] ? 1 : 0;
+         break;
+      case GL_CULL_FACE:
+         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.CullFlag);
+         break;
+      case GL_CULL_FACE_MODE:
+         params[0] = ENUM_TO_INT64(ctx->Polygon.CullFaceMode);
+         break;
+      case GL_CURRENT_COLOR:
+         {
+         FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0]);
+         params[1] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1]);
+         params[2] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2]);
+         params[3] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3]);
+         }
+         break;
+      case GL_CURRENT_INDEX:
+         {
+         FLUSH_CURRENT(ctx, 0);
+         params[0] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0]);
+         }
+         break;
+      case GL_CURRENT_NORMAL:
+         {
+         FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0]);
+         params[1] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1]);
+         params[2] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2]);
+         }
+         break;
+      case GL_CURRENT_RASTER_COLOR:
+         params[0] = FLOAT_TO_INT64(ctx->Current.RasterColor[0]);
+         params[1] = FLOAT_TO_INT64(ctx->Current.RasterColor[1]);
+         params[2] = FLOAT_TO_INT64(ctx->Current.RasterColor[2]);
+         params[3] = FLOAT_TO_INT64(ctx->Current.RasterColor[3]);
+         break;
+      case GL_CURRENT_RASTER_DISTANCE:
+         params[0] = IROUND64(ctx->Current.RasterDistance);
+         break;
+      case GL_CURRENT_RASTER_INDEX:
+         params[0] = IROUND64(ctx->Current.RasterIndex);
+         break;
+      case GL_CURRENT_RASTER_POSITION:
+         params[0] = IROUND64(ctx->Current.RasterPos[0]);
+         params[1] = IROUND64(ctx->Current.RasterPos[1]);
+         params[2] = IROUND64(ctx->Current.RasterPos[2]);
+         params[3] = IROUND64(ctx->Current.RasterPos[3]);
+         break;
+      case GL_CURRENT_RASTER_SECONDARY_COLOR:
+         params[0] = FLOAT_TO_INT64(ctx->Current.RasterSecondaryColor[0]);
+         params[1] = FLOAT_TO_INT64(ctx->Current.RasterSecondaryColor[1]);
+         params[2] = FLOAT_TO_INT64(ctx->Current.RasterSecondaryColor[2]);
+         params[3] = FLOAT_TO_INT64(ctx->Current.RasterSecondaryColor[3]);
+         break;
+      case GL_CURRENT_RASTER_TEXTURE_COORDS:
+         {
+         const GLuint texUnit = ctx->Texture.CurrentUnit;
+         params[0] = IROUND64(ctx->Current.RasterTexCoords[texUnit][0]);
+         params[1] = IROUND64(ctx->Current.RasterTexCoords[texUnit][1]);
+         params[2] = IROUND64(ctx->Current.RasterTexCoords[texUnit][2]);
+         params[3] = IROUND64(ctx->Current.RasterTexCoords[texUnit][3]);
+         }
+         break;
+      case GL_CURRENT_RASTER_POSITION_VALID:
+         params[0] = BOOLEAN_TO_INT64(ctx->Current.RasterPosValid);
+         break;
+      case GL_CURRENT_TEXTURE_COORDS:
+         {
+         const GLuint texUnit = ctx->Texture.CurrentUnit;
+         FLUSH_CURRENT(ctx, 0);
+         params[0] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][0]);
+         params[1] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][1]);
+         params[2] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][2]);
+         params[3] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][3]);
+         }
+         break;
+      case GL_DEPTH_BIAS:
+         params[0] = IROUND64(ctx->Pixel.DepthBias);
+         break;
+      case GL_DEPTH_BITS:
+         params[0] = ctx->DrawBuffer->Visual.depthBits;
+         break;
+      case GL_DEPTH_CLEAR_VALUE:
+         params[0] = FLOAT_TO_INT64(((GLfloat) ctx->Depth.Clear));
+         break;
+      case GL_DEPTH_FUNC:
+         params[0] = ENUM_TO_INT64(ctx->Depth.Func);
+         break;
+      case GL_DEPTH_RANGE:
+         params[0] = FLOAT_TO_INT64(ctx->Viewport.Near);
+         params[1] = FLOAT_TO_INT64(ctx->Viewport.Far);
+         break;
+      case GL_DEPTH_SCALE:
+         params[0] = IROUND64(ctx->Pixel.DepthScale);
+         break;
+      case GL_DEPTH_TEST:
+         params[0] = BOOLEAN_TO_INT64(ctx->Depth.Test);
+         break;
+      case GL_DEPTH_WRITEMASK:
+         params[0] = BOOLEAN_TO_INT64(ctx->Depth.Mask);
+         break;
+      case GL_DITHER:
+         params[0] = BOOLEAN_TO_INT64(ctx->Color.DitherFlag);
+         break;
+      case GL_DOUBLEBUFFER:
+         params[0] = BOOLEAN_TO_INT64(ctx->DrawBuffer->Visual.doubleBufferMode);
+         break;
+      case GL_DRAW_BUFFER:
+         params[0] = ENUM_TO_INT64(ctx->DrawBuffer->ColorDrawBuffer[0]);
+         break;
+      case GL_EDGE_FLAG:
+         {
+         FLUSH_CURRENT(ctx, 0);
+         params[0] = BOOLEAN_TO_INT64((ctx->Current.Attrib[VERT_ATTRIB_EDGEFLAG][0] == 1.0));
+         }
+         break;
+      case GL_FEEDBACK_BUFFER_SIZE:
+         params[0] = ctx->Feedback.BufferSize;
+         break;
+      case GL_FEEDBACK_BUFFER_TYPE:
+         params[0] = ENUM_TO_INT64(ctx->Feedback.Type);
+         break;
+      case GL_FOG:
+         params[0] = BOOLEAN_TO_INT64(ctx->Fog.Enabled);
+         break;
+      case GL_FOG_COLOR:
+         params[0] = FLOAT_TO_INT64(ctx->Fog.Color[0]);
+         params[1] = FLOAT_TO_INT64(ctx->Fog.Color[1]);
+         params[2] = FLOAT_TO_INT64(ctx->Fog.Color[2]);
+         params[3] = FLOAT_TO_INT64(ctx->Fog.Color[3]);
+         break;
+      case GL_FOG_DENSITY:
+         params[0] = IROUND64(ctx->Fog.Density);
+         break;
+      case GL_FOG_END:
+         params[0] = IROUND64(ctx->Fog.End);
+         break;
+      case GL_FOG_HINT:
+         params[0] = ENUM_TO_INT64(ctx->Hint.Fog);
+         break;
+      case GL_FOG_INDEX:
+         params[0] = IROUND64(ctx->Fog.Index);
+         break;
+      case GL_FOG_MODE:
+         params[0] = ENUM_TO_INT64(ctx->Fog.Mode);
+         break;
+      case GL_FOG_START:
+         params[0] = IROUND64(ctx->Fog.Start);
+         break;
+      case GL_FRONT_FACE:
+         params[0] = ENUM_TO_INT64(ctx->Polygon.FrontFace);
+         break;
+      case GL_GREEN_BIAS:
+         params[0] = IROUND64(ctx->Pixel.GreenBias);
+         break;
+      case GL_GREEN_BITS:
+         params[0] = ctx->DrawBuffer->Visual.greenBits;
+         break;
+      case GL_GREEN_SCALE:
+         params[0] = IROUND64(ctx->Pixel.GreenScale);
+         break;
+      case GL_INDEX_BITS:
+         params[0] = ctx->DrawBuffer->Visual.indexBits;
+         break;
+      case GL_INDEX_CLEAR_VALUE:
+         params[0] = ctx->Color.ClearIndex;
+         break;
+      case GL_INDEX_MODE:
+         params[0] = BOOLEAN_TO_INT64(!ctx->DrawBuffer->Visual.rgbMode);
+         break;
+      case GL_INDEX_OFFSET:
+         params[0] = ctx->Pixel.IndexOffset;
+         break;
+      case GL_INDEX_SHIFT:
+         params[0] = ctx->Pixel.IndexShift;
+         break;
+      case GL_INDEX_WRITEMASK:
+         params[0] = ctx->Color.IndexMask;
+         break;
+      case GL_LIGHT0:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[0].Enabled);
+         break;
+      case GL_LIGHT1:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[1].Enabled);
+         break;
+      case GL_LIGHT2:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[2].Enabled);
+         break;
+      case GL_LIGHT3:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[3].Enabled);
+         break;
+      case GL_LIGHT4:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[4].Enabled);
+         break;
+      case GL_LIGHT5:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[5].Enabled);
+         break;
+      case GL_LIGHT6:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[6].Enabled);
+         break;
+      case GL_LIGHT7:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Light[7].Enabled);
+         break;
+      case GL_LIGHTING:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Enabled);
+         break;
+      case GL_LIGHT_MODEL_AMBIENT:
+         params[0] = FLOAT_TO_INT64(ctx->Light.Model.Ambient[0]);
+         params[1] = FLOAT_TO_INT64(ctx->Light.Model.Ambient[1]);
+         params[2] = FLOAT_TO_INT64(ctx->Light.Model.Ambient[2]);
+         params[3] = FLOAT_TO_INT64(ctx->Light.Model.Ambient[3]);
+         break;
+      case GL_LIGHT_MODEL_COLOR_CONTROL:
+         params[0] = ENUM_TO_INT64(ctx->Light.Model.ColorControl);
+         break;
+      case GL_LIGHT_MODEL_LOCAL_VIEWER:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Model.LocalViewer);
+         break;
+      case GL_LIGHT_MODEL_TWO_SIDE:
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.Model.TwoSide);
+         break;
+      case GL_LINE_SMOOTH:
+         params[0] = BOOLEAN_TO_INT64(ctx->Line.SmoothFlag);
+         break;
+      case GL_LINE_SMOOTH_HINT:
+         params[0] = ENUM_TO_INT64(ctx->Hint.LineSmooth);
+         break;
+      case GL_LINE_STIPPLE:
+         params[0] = BOOLEAN_TO_INT64(ctx->Line.StippleFlag);
+         break;
+      case GL_LINE_STIPPLE_PATTERN:
+         params[0] = ctx->Line.StipplePattern;
+         break;
+      case GL_LINE_STIPPLE_REPEAT:
+         params[0] = ctx->Line.StippleFactor;
+         break;
+      case GL_LINE_WIDTH:
+         params[0] = IROUND64(ctx->Line.Width);
+         break;
+      case GL_LINE_WIDTH_GRANULARITY:
+         params[0] = IROUND64(ctx->Const.LineWidthGranularity);
+         break;
+      case GL_LINE_WIDTH_RANGE:
+         params[0] = IROUND64(ctx->Const.MinLineWidthAA);
+         params[1] = IROUND64(ctx->Const.MaxLineWidthAA);
+         break;
+      case GL_ALIASED_LINE_WIDTH_RANGE:
+         params[0] = IROUND64(ctx->Const.MinLineWidth);
+         params[1] = IROUND64(ctx->Const.MaxLineWidth);
+         break;
+      case GL_LIST_BASE:
+         params[0] = ctx->List.ListBase;
+         break;
+      case GL_LIST_INDEX:
+         params[0] = (ctx->ListState.CurrentList ? ctx->ListState.CurrentList->Name : 0);
+         break;
+      case GL_LIST_MODE:
+         {
+         GLenum mode;
+         if (!ctx->CompileFlag)
+            mode = 0;
+         else if (ctx->ExecuteFlag)
+            mode = GL_COMPILE_AND_EXECUTE;
+         else
+            mode = GL_COMPILE;
+         params[0] = ENUM_TO_INT64(mode);
+         }
+         break;
+      case GL_INDEX_LOGIC_OP:
+         params[0] = BOOLEAN_TO_INT64(ctx->Color.IndexLogicOpEnabled);
+         break;
+      case GL_COLOR_LOGIC_OP:
+         params[0] = BOOLEAN_TO_INT64(ctx->Color.ColorLogicOpEnabled);
+         break;
+      case GL_LOGIC_OP_MODE:
+         params[0] = ENUM_TO_INT64(ctx->Color.LogicOp);
+         break;
+      case GL_MAP1_COLOR_4:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Color4);
+         break;
+      case GL_MAP1_GRID_DOMAIN:
+         params[0] = IROUND64(ctx->Eval.MapGrid1u1);
+         params[1] = IROUND64(ctx->Eval.MapGrid1u2);
+         break;
+      case GL_MAP1_GRID_SEGMENTS:
+         params[0] = ctx->Eval.MapGrid1un;
+         break;
+      case GL_MAP1_INDEX:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Index);
+         break;
+      case GL_MAP1_NORMAL:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Normal);
+         break;
+      case GL_MAP1_TEXTURE_COORD_1:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1TextureCoord1);
+         break;
+      case GL_MAP1_TEXTURE_COORD_2:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1TextureCoord2);
+         break;
+      case GL_MAP1_TEXTURE_COORD_3:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1TextureCoord3);
+         break;
+      case GL_MAP1_TEXTURE_COORD_4:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1TextureCoord4);
+         break;
+      case GL_MAP1_VERTEX_3:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Vertex3);
+         break;
+      case GL_MAP1_VERTEX_4:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Vertex4);
+         break;
+      case GL_MAP2_COLOR_4:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2Color4);
+         break;
+      case GL_MAP2_GRID_DOMAIN:
+         params[0] = IROUND64(ctx->Eval.MapGrid2u1);
+         params[1] = IROUND64(ctx->Eval.MapGrid2u2);
+         params[2] = IROUND64(ctx->Eval.MapGrid2v1);
+         params[3] = IROUND64(ctx->Eval.MapGrid2v2);
+         break;
+      case GL_MAP2_GRID_SEGMENTS:
+         params[0] = ctx->Eval.MapGrid2un;
+         params[1] = ctx->Eval.MapGrid2vn;
+         break;
+      case GL_MAP2_INDEX:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2Index);
+         break;
+      case GL_MAP2_NORMAL:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2Normal);
+         break;
+      case GL_MAP2_TEXTURE_COORD_1:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2TextureCoord1);
+         break;
+      case GL_MAP2_TEXTURE_COORD_2:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2TextureCoord2);
+         break;
+      case GL_MAP2_TEXTURE_COORD_3:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2TextureCoord3);
+         break;
+      case GL_MAP2_TEXTURE_COORD_4:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2TextureCoord4);
+         break;
+      case GL_MAP2_VERTEX_3:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2Vertex3);
+         break;
+      case GL_MAP2_VERTEX_4:
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map2Vertex4);
+         break;
+      case GL_MAP_COLOR:
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.MapColorFlag);
+         break;
+      case GL_MAP_STENCIL:
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.MapStencilFlag);
+         break;
+      case GL_MATRIX_MODE:
+         params[0] = ENUM_TO_INT64(ctx->Transform.MatrixMode);
+         break;
+      case GL_MAX_ATTRIB_STACK_DEPTH:
+         params[0] = MAX_ATTRIB_STACK_DEPTH;
+         break;
+      case GL_MAX_CLIENT_ATTRIB_STACK_DEPTH:
+         params[0] = MAX_CLIENT_ATTRIB_STACK_DEPTH;
+         break;
+      case GL_MAX_CLIP_PLANES:
+         params[0] = ctx->Const.MaxClipPlanes;
+         break;
+      case GL_MAX_ELEMENTS_VERTICES:
+         params[0] = ctx->Const.MaxArrayLockSize;
+         break;
+      case GL_MAX_ELEMENTS_INDICES:
+         params[0] = ctx->Const.MaxArrayLockSize;
+         break;
+      case GL_MAX_EVAL_ORDER:
+         params[0] = MAX_EVAL_ORDER;
+         break;
+      case GL_MAX_LIGHTS:
+         params[0] = ctx->Const.MaxLights;
+         break;
+      case GL_MAX_LIST_NESTING:
+         params[0] = MAX_LIST_NESTING;
+         break;
+      case GL_MAX_MODELVIEW_STACK_DEPTH:
+         params[0] = MAX_MODELVIEW_STACK_DEPTH;
+         break;
+      case GL_MAX_NAME_STACK_DEPTH:
+         params[0] = MAX_NAME_STACK_DEPTH;
+         break;
+      case GL_MAX_PIXEL_MAP_TABLE:
+         params[0] = MAX_PIXEL_MAP_TABLE;
+         break;
+      case GL_MAX_PROJECTION_STACK_DEPTH:
+         params[0] = MAX_PROJECTION_STACK_DEPTH;
+         break;
+      case GL_MAX_TEXTURE_SIZE:
+         params[0] = 1 << (ctx->Const.MaxTextureLevels - 1);
+         break;
+      case GL_MAX_3D_TEXTURE_SIZE:
+         params[0] = 1 << (ctx->Const.Max3DTextureLevels - 1);
+         break;
+      case GL_MAX_TEXTURE_STACK_DEPTH:
+         params[0] = MAX_TEXTURE_STACK_DEPTH;
+         break;
+      case GL_MAX_VIEWPORT_DIMS:
+         params[0] = ctx->Const.MaxViewportWidth;
+         params[1] = ctx->Const.MaxViewportHeight;
+         break;
+      case GL_MODELVIEW_MATRIX:
+         {
+         const GLfloat *matrix = ctx->ModelviewMatrixStack.Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[1]);
+         params[2] = IROUND64(matrix[2]);
+         params[3] = IROUND64(matrix[3]);
+         params[4] = IROUND64(matrix[4]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[6]);
+         params[7] = IROUND64(matrix[7]);
+         params[8] = IROUND64(matrix[8]);
+         params[9] = IROUND64(matrix[9]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[11]);
+         params[12] = IROUND64(matrix[12]);
+         params[13] = IROUND64(matrix[13]);
+         params[14] = IROUND64(matrix[14]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_MODELVIEW_STACK_DEPTH:
+         params[0] = ctx->ModelviewMatrixStack.Depth + 1;
+         break;
+      case GL_NAME_STACK_DEPTH:
+         params[0] = ctx->Select.NameStackDepth;
+         break;
+      case GL_NORMALIZE:
+         params[0] = BOOLEAN_TO_INT64(ctx->Transform.Normalize);
+         break;
+      case GL_PACK_ALIGNMENT:
+         params[0] = ctx->Pack.Alignment;
+         break;
+      case GL_PACK_LSB_FIRST:
+         params[0] = BOOLEAN_TO_INT64(ctx->Pack.LsbFirst);
+         break;
+      case GL_PACK_ROW_LENGTH:
+         params[0] = ctx->Pack.RowLength;
+         break;
+      case GL_PACK_SKIP_PIXELS:
+         params[0] = ctx->Pack.SkipPixels;
+         break;
+      case GL_PACK_SKIP_ROWS:
+         params[0] = ctx->Pack.SkipRows;
+         break;
+      case GL_PACK_SWAP_BYTES:
+         params[0] = BOOLEAN_TO_INT64(ctx->Pack.SwapBytes);
+         break;
+      case GL_PACK_SKIP_IMAGES_EXT:
+         params[0] = ctx->Pack.SkipImages;
+         break;
+      case GL_PACK_IMAGE_HEIGHT_EXT:
+         params[0] = ctx->Pack.ImageHeight;
+         break;
+      case GL_PACK_INVERT_MESA:
+         params[0] = BOOLEAN_TO_INT64(ctx->Pack.Invert);
+         break;
+      case GL_PERSPECTIVE_CORRECTION_HINT:
+         params[0] = ENUM_TO_INT64(ctx->Hint.PerspectiveCorrection);
+         break;
+      case GL_PIXEL_MAP_A_TO_A_SIZE:
+         params[0] = ctx->PixelMaps.AtoA.Size;
+         break;
+      case GL_PIXEL_MAP_B_TO_B_SIZE:
+         params[0] = ctx->PixelMaps.BtoB.Size;
+         break;
+      case GL_PIXEL_MAP_G_TO_G_SIZE:
+         params[0] = ctx->PixelMaps.GtoG.Size;
+         break;
+      case GL_PIXEL_MAP_I_TO_A_SIZE:
+         params[0] = ctx->PixelMaps.ItoA.Size;
+         break;
+      case GL_PIXEL_MAP_I_TO_B_SIZE:
+         params[0] = ctx->PixelMaps.ItoB.Size;
+         break;
+      case GL_PIXEL_MAP_I_TO_G_SIZE:
+         params[0] = ctx->PixelMaps.ItoG.Size;
+         break;
+      case GL_PIXEL_MAP_I_TO_I_SIZE:
+         params[0] = ctx->PixelMaps.ItoI.Size;
+         break;
+      case GL_PIXEL_MAP_I_TO_R_SIZE:
+         params[0] = ctx->PixelMaps.ItoR.Size;
+         break;
+      case GL_PIXEL_MAP_R_TO_R_SIZE:
+         params[0] = ctx->PixelMaps.RtoR.Size;
+         break;
+      case GL_PIXEL_MAP_S_TO_S_SIZE:
+         params[0] = ctx->PixelMaps.StoS.Size;
+         break;
+      case GL_POINT_SIZE:
+         params[0] = IROUND64(ctx->Point.Size);
+         break;
+      case GL_POINT_SIZE_GRANULARITY:
+         params[0] = IROUND64(ctx->Const.PointSizeGranularity);
+         break;
+      case GL_POINT_SIZE_RANGE:
+         params[0] = IROUND64(ctx->Const.MinPointSizeAA);
+         params[1] = IROUND64(ctx->Const.MaxPointSizeAA);
+         break;
+      case GL_ALIASED_POINT_SIZE_RANGE:
+         params[0] = IROUND64(ctx->Const.MinPointSize);
+         params[1] = IROUND64(ctx->Const.MaxPointSize);
+         break;
+      case GL_POINT_SMOOTH:
+         params[0] = BOOLEAN_TO_INT64(ctx->Point.SmoothFlag);
+         break;
+      case GL_POINT_SMOOTH_HINT:
+         params[0] = ENUM_TO_INT64(ctx->Hint.PointSmooth);
+         break;
+      case GL_POINT_SIZE_MIN_EXT:
+         params[0] = IROUND64(ctx->Point.MinSize);
+         break;
+      case GL_POINT_SIZE_MAX_EXT:
+         params[0] = IROUND64(ctx->Point.MaxSize);
+         break;
+      case GL_POINT_FADE_THRESHOLD_SIZE_EXT:
+         params[0] = IROUND64(ctx->Point.Threshold);
+         break;
+      case GL_DISTANCE_ATTENUATION_EXT:
+         params[0] = IROUND64(ctx->Point.Params[0]);
+         params[1] = IROUND64(ctx->Point.Params[1]);
+         params[2] = IROUND64(ctx->Point.Params[2]);
+         break;
+      case GL_POLYGON_MODE:
+         params[0] = ENUM_TO_INT64(ctx->Polygon.FrontMode);
+         params[1] = ENUM_TO_INT64(ctx->Polygon.BackMode);
+         break;
+      case GL_POLYGON_OFFSET_BIAS_EXT:
+         params[0] = IROUND64(ctx->Polygon.OffsetUnits);
+         break;
+      case GL_POLYGON_OFFSET_FACTOR:
+         params[0] = IROUND64(ctx->Polygon.OffsetFactor );
+         break;
+      case GL_POLYGON_OFFSET_UNITS:
+         params[0] = IROUND64(ctx->Polygon.OffsetUnits );
+         break;
+      case GL_POLYGON_OFFSET_POINT:
+         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.OffsetPoint);
+         break;
+      case GL_POLYGON_OFFSET_LINE:
+         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.OffsetLine);
+         break;
+      case GL_POLYGON_OFFSET_FILL:
+         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.OffsetFill);
+         break;
+      case GL_POLYGON_SMOOTH:
+         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.SmoothFlag);
+         break;
+      case GL_POLYGON_SMOOTH_HINT:
+         params[0] = ENUM_TO_INT64(ctx->Hint.PolygonSmooth);
+         break;
+      case GL_POLYGON_STIPPLE:
+         params[0] = BOOLEAN_TO_INT64(ctx->Polygon.StippleFlag);
+         break;
+      case GL_PROJECTION_MATRIX:
+         {
+         const GLfloat *matrix = ctx->ProjectionMatrixStack.Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[1]);
+         params[2] = IROUND64(matrix[2]);
+         params[3] = IROUND64(matrix[3]);
+         params[4] = IROUND64(matrix[4]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[6]);
+         params[7] = IROUND64(matrix[7]);
+         params[8] = IROUND64(matrix[8]);
+         params[9] = IROUND64(matrix[9]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[11]);
+         params[12] = IROUND64(matrix[12]);
+         params[13] = IROUND64(matrix[13]);
+         params[14] = IROUND64(matrix[14]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_PROJECTION_STACK_DEPTH:
+         params[0] = ctx->ProjectionMatrixStack.Depth + 1;
+         break;
+      case GL_READ_BUFFER:
+         params[0] = ENUM_TO_INT64(ctx->ReadBuffer->ColorReadBuffer);
+         break;
+      case GL_RED_BIAS:
+         params[0] = IROUND64(ctx->Pixel.RedBias);
+         break;
+      case GL_RED_BITS:
+         params[0] = ctx->DrawBuffer->Visual.redBits;
+         break;
+      case GL_RED_SCALE:
+         params[0] = IROUND64(ctx->Pixel.RedScale);
+         break;
+      case GL_RENDER_MODE:
+         params[0] = ENUM_TO_INT64(ctx->RenderMode);
+         break;
+      case GL_RESCALE_NORMAL:
+         params[0] = BOOLEAN_TO_INT64(ctx->Transform.RescaleNormals);
+         break;
+      case GL_RGBA_MODE:
+         params[0] = BOOLEAN_TO_INT64(ctx->DrawBuffer->Visual.rgbMode);
+         break;
+      case GL_SCISSOR_BOX:
+         params[0] = ctx->Scissor.X;
+         params[1] = ctx->Scissor.Y;
+         params[2] = ctx->Scissor.Width;
+         params[3] = ctx->Scissor.Height;
+         break;
+      case GL_SCISSOR_TEST:
+         params[0] = BOOLEAN_TO_INT64(ctx->Scissor.Enabled);
+         break;
+      case GL_SELECTION_BUFFER_SIZE:
+         params[0] = ctx->Select.BufferSize;
+         break;
+      case GL_SHADE_MODEL:
+         params[0] = ENUM_TO_INT64(ctx->Light.ShadeModel);
+         break;
+      case GL_SHARED_TEXTURE_PALETTE_EXT:
+         params[0] = BOOLEAN_TO_INT64(ctx->Texture.SharedPalette);
+         break;
+      case GL_STENCIL_BITS:
+         params[0] = ctx->DrawBuffer->Visual.stencilBits;
+         break;
+      case GL_STENCIL_CLEAR_VALUE:
+         params[0] = ctx->Stencil.Clear;
+         break;
+      case GL_STENCIL_FAIL:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.FailFunc[ctx->Stencil.ActiveFace]);
+         break;
+      case GL_STENCIL_FUNC:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.Function[ctx->Stencil.ActiveFace]);
+         break;
+      case GL_STENCIL_PASS_DEPTH_FAIL:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.ZFailFunc[ctx->Stencil.ActiveFace]);
+         break;
+      case GL_STENCIL_PASS_DEPTH_PASS:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.ZPassFunc[ctx->Stencil.ActiveFace]);
+         break;
+      case GL_STENCIL_REF:
+         params[0] = ctx->Stencil.Ref[ctx->Stencil.ActiveFace];
+         break;
+      case GL_STENCIL_TEST:
+         params[0] = BOOLEAN_TO_INT64(ctx->Stencil.Enabled);
+         break;
+      case GL_STENCIL_VALUE_MASK:
+         params[0] = ctx->Stencil.ValueMask[ctx->Stencil.ActiveFace];
+         break;
+      case GL_STENCIL_WRITEMASK:
+         params[0] = ctx->Stencil.WriteMask[ctx->Stencil.ActiveFace];
+         break;
+      case GL_STEREO:
+         params[0] = BOOLEAN_TO_INT64(ctx->DrawBuffer->Visual.stereoMode);
+         break;
+      case GL_SUBPIXEL_BITS:
+         params[0] = ctx->Const.SubPixelBits;
+         break;
+      case GL_TEXTURE_1D:
+         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_1D));
+         break;
+      case GL_TEXTURE_2D:
+         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_2D));
+         break;
+      case GL_TEXTURE_3D:
+         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_3D));
+         break;
+      case GL_TEXTURE_1D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_1D_ARRAY_EXT));
+         break;
+      case GL_TEXTURE_2D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_2D_ARRAY_EXT));
+         break;
+      case GL_TEXTURE_BINDING_1D:
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_INDEX]->Name;
+         break;
+      case GL_TEXTURE_BINDING_2D:
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_INDEX]->Name;
+         break;
+      case GL_TEXTURE_BINDING_3D:
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_3D_INDEX]->Name;
+         break;
+      case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetInteger64v");
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_1D_ARRAY_INDEX]->Name;
+         break;
+      case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
+         CHECK_EXT1(MESA_texture_array, "GetInteger64v");
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_2D_ARRAY_INDEX]->Name;
+         break;
+      case GL_TEXTURE_GEN_S:
+         params[0] = BOOLEAN_TO_INT64(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & S_BIT) ? 1 : 0));
+         break;
+      case GL_TEXTURE_GEN_T:
+         params[0] = BOOLEAN_TO_INT64(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & T_BIT) ? 1 : 0));
+         break;
+      case GL_TEXTURE_GEN_R:
+         params[0] = BOOLEAN_TO_INT64(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & R_BIT) ? 1 : 0));
+         break;
+      case GL_TEXTURE_GEN_Q:
+         params[0] = BOOLEAN_TO_INT64(((ctx->Texture.Unit[ctx->Texture.CurrentUnit].TexGenEnabled & Q_BIT) ? 1 : 0));
+         break;
+      case GL_TEXTURE_MATRIX:
+         {
+         const GLfloat *matrix = ctx->TextureMatrixStack[ctx->Texture.CurrentUnit].Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[1]);
+         params[2] = IROUND64(matrix[2]);
+         params[3] = IROUND64(matrix[3]);
+         params[4] = IROUND64(matrix[4]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[6]);
+         params[7] = IROUND64(matrix[7]);
+         params[8] = IROUND64(matrix[8]);
+         params[9] = IROUND64(matrix[9]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[11]);
+         params[12] = IROUND64(matrix[12]);
+         params[13] = IROUND64(matrix[13]);
+         params[14] = IROUND64(matrix[14]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_TEXTURE_STACK_DEPTH:
+         params[0] = ctx->TextureMatrixStack[ctx->Texture.CurrentUnit].Depth + 1;
+         break;
+      case GL_UNPACK_ALIGNMENT:
+         params[0] = ctx->Unpack.Alignment;
+         break;
+      case GL_UNPACK_LSB_FIRST:
+         params[0] = BOOLEAN_TO_INT64(ctx->Unpack.LsbFirst);
+         break;
+      case GL_UNPACK_ROW_LENGTH:
+         params[0] = ctx->Unpack.RowLength;
+         break;
+      case GL_UNPACK_SKIP_PIXELS:
+         params[0] = ctx->Unpack.SkipPixels;
+         break;
+      case GL_UNPACK_SKIP_ROWS:
+         params[0] = ctx->Unpack.SkipRows;
+         break;
+      case GL_UNPACK_SWAP_BYTES:
+         params[0] = BOOLEAN_TO_INT64(ctx->Unpack.SwapBytes);
+         break;
+      case GL_UNPACK_SKIP_IMAGES_EXT:
+         params[0] = ctx->Unpack.SkipImages;
+         break;
+      case GL_UNPACK_IMAGE_HEIGHT_EXT:
+         params[0] = ctx->Unpack.ImageHeight;
+         break;
+      case GL_UNPACK_CLIENT_STORAGE_APPLE:
+         params[0] = BOOLEAN_TO_INT64(ctx->Unpack.ClientStorage);
+         break;
+      case GL_VIEWPORT:
+         params[0] = ctx->Viewport.X;
+         params[1] = ctx->Viewport.Y;
+         params[2] = ctx->Viewport.Width;
+         params[3] = ctx->Viewport.Height;
+         break;
+      case GL_ZOOM_X:
+         params[0] = IROUND64(ctx->Pixel.ZoomX);
+         break;
+      case GL_ZOOM_Y:
+         params[0] = IROUND64(ctx->Pixel.ZoomY);
+         break;
+      case GL_VERTEX_ARRAY:
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->Vertex.Enabled);
+         break;
+      case GL_VERTEX_ARRAY_SIZE:
+         params[0] = ctx->Array.ArrayObj->Vertex.Size;
+         break;
+      case GL_VERTEX_ARRAY_TYPE:
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->Vertex.Type);
+         break;
+      case GL_VERTEX_ARRAY_STRIDE:
+         params[0] = ctx->Array.ArrayObj->Vertex.Stride;
+         break;
+      case GL_VERTEX_ARRAY_COUNT_EXT:
+         params[0] = 0;
+         break;
+      case GL_NORMAL_ARRAY:
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->Normal.Enabled);
+         break;
+      case GL_NORMAL_ARRAY_TYPE:
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->Normal.Type);
+         break;
+      case GL_NORMAL_ARRAY_STRIDE:
+         params[0] = ctx->Array.ArrayObj->Normal.Stride;
+         break;
+      case GL_NORMAL_ARRAY_COUNT_EXT:
+         params[0] = 0;
+         break;
+      case GL_COLOR_ARRAY:
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->Color.Enabled);
+         break;
+      case GL_COLOR_ARRAY_SIZE:
+         params[0] = ctx->Array.ArrayObj->Color.Size;
+         break;
+      case GL_COLOR_ARRAY_TYPE:
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->Color.Type);
+         break;
+      case GL_COLOR_ARRAY_STRIDE:
+         params[0] = ctx->Array.ArrayObj->Color.Stride;
+         break;
+      case GL_COLOR_ARRAY_COUNT_EXT:
+         params[0] = 0;
+         break;
+      case GL_INDEX_ARRAY:
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->Index.Enabled);
+         break;
+      case GL_INDEX_ARRAY_TYPE:
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->Index.Type);
+         break;
+      case GL_INDEX_ARRAY_STRIDE:
+         params[0] = ctx->Array.ArrayObj->Index.Stride;
+         break;
+      case GL_INDEX_ARRAY_COUNT_EXT:
+         params[0] = 0;
+         break;
+      case GL_TEXTURE_COORD_ARRAY:
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Enabled);
+         break;
+      case GL_TEXTURE_COORD_ARRAY_SIZE:
+         params[0] = ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Size;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_TYPE:
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Type);
+         break;
+      case GL_TEXTURE_COORD_ARRAY_STRIDE:
+         params[0] = ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].Stride;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
+         params[0] = 0;
+         break;
+      case GL_EDGE_FLAG_ARRAY:
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->EdgeFlag.Enabled);
+         break;
+      case GL_EDGE_FLAG_ARRAY_STRIDE:
+         params[0] = ctx->Array.ArrayObj->EdgeFlag.Stride;
+         break;
+      case GL_EDGE_FLAG_ARRAY_COUNT_EXT:
+         params[0] = 0;
+         break;
+      case GL_MAX_TEXTURE_UNITS_ARB:
+         CHECK_EXT1(ARB_multitexture, "GetInteger64v");
+         params[0] = ctx->Const.MaxTextureUnits;
+         break;
+      case GL_ACTIVE_TEXTURE_ARB:
+         CHECK_EXT1(ARB_multitexture, "GetInteger64v");
+         params[0] = GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit;
+         break;
+      case GL_CLIENT_ACTIVE_TEXTURE_ARB:
+         CHECK_EXT1(ARB_multitexture, "GetInteger64v");
+         params[0] = GL_TEXTURE0_ARB + ctx->Array.ActiveTexture;
+         break;
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         CHECK_EXT1(ARB_texture_cube_map, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB));
+         break;
+      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
+         CHECK_EXT1(ARB_texture_cube_map, "GetInteger64v");
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_CUBE_INDEX]->Name;
+         break;
+      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
+         CHECK_EXT1(ARB_texture_cube_map, "GetInteger64v");
+         params[0] = (1 << (ctx->Const.MaxCubeTextureLevels - 1));
+         break;
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         params[0] = ctx->Hint.TextureCompression;
+         break;
+      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
+         params[0] = _mesa_get_compressed_formats(ctx, NULL, GL_FALSE);
+         break;
+      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
+         {
+         GLint formats[100];
+         GLuint i, n = _mesa_get_compressed_formats(ctx, formats, GL_FALSE);
+         ASSERT(n <= 100);
+         for (i = 0; i < n; i++)
+            params[i] = ENUM_TO_INT64(formats[i]);
+         }
+         break;
+      case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
+         CHECK_EXT1(EXT_compiled_vertex_array, "GetInteger64v");
+         params[0] = ctx->Array.LockFirst;
+         break;
+      case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
+         CHECK_EXT1(EXT_compiled_vertex_array, "GetInteger64v");
+         params[0] = ctx->Array.LockCount;
+         break;
+      case GL_TRANSPOSE_COLOR_MATRIX_ARB:
+         {
+         const GLfloat *matrix = ctx->ColorMatrixStack.Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[4]);
+         params[2] = IROUND64(matrix[8]);
+         params[3] = IROUND64(matrix[12]);
+         params[4] = IROUND64(matrix[1]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[9]);
+         params[7] = IROUND64(matrix[13]);
+         params[8] = IROUND64(matrix[2]);
+         params[9] = IROUND64(matrix[6]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[14]);
+         params[12] = IROUND64(matrix[3]);
+         params[13] = IROUND64(matrix[7]);
+         params[14] = IROUND64(matrix[11]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
+         {
+         const GLfloat *matrix = ctx->ModelviewMatrixStack.Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[4]);
+         params[2] = IROUND64(matrix[8]);
+         params[3] = IROUND64(matrix[12]);
+         params[4] = IROUND64(matrix[1]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[9]);
+         params[7] = IROUND64(matrix[13]);
+         params[8] = IROUND64(matrix[2]);
+         params[9] = IROUND64(matrix[6]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[14]);
+         params[12] = IROUND64(matrix[3]);
+         params[13] = IROUND64(matrix[7]);
+         params[14] = IROUND64(matrix[11]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_TRANSPOSE_PROJECTION_MATRIX_ARB:
+         {
+         const GLfloat *matrix = ctx->ProjectionMatrixStack.Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[4]);
+         params[2] = IROUND64(matrix[8]);
+         params[3] = IROUND64(matrix[12]);
+         params[4] = IROUND64(matrix[1]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[9]);
+         params[7] = IROUND64(matrix[13]);
+         params[8] = IROUND64(matrix[2]);
+         params[9] = IROUND64(matrix[6]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[14]);
+         params[12] = IROUND64(matrix[3]);
+         params[13] = IROUND64(matrix[7]);
+         params[14] = IROUND64(matrix[11]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_TRANSPOSE_TEXTURE_MATRIX_ARB:
+         {
+         const GLfloat *matrix = ctx->TextureMatrixStack[ctx->Texture.CurrentUnit].Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[4]);
+         params[2] = IROUND64(matrix[8]);
+         params[3] = IROUND64(matrix[12]);
+         params[4] = IROUND64(matrix[1]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[9]);
+         params[7] = IROUND64(matrix[13]);
+         params[8] = IROUND64(matrix[2]);
+         params[9] = IROUND64(matrix[6]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[14]);
+         params[12] = IROUND64(matrix[3]);
+         params[13] = IROUND64(matrix[7]);
+         params[14] = IROUND64(matrix[11]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_COLOR_MATRIX_SGI:
+         {
+         const GLfloat *matrix = ctx->ColorMatrixStack.Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[1]);
+         params[2] = IROUND64(matrix[2]);
+         params[3] = IROUND64(matrix[3]);
+         params[4] = IROUND64(matrix[4]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[6]);
+         params[7] = IROUND64(matrix[7]);
+         params[8] = IROUND64(matrix[8]);
+         params[9] = IROUND64(matrix[9]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[11]);
+         params[12] = IROUND64(matrix[12]);
+         params[13] = IROUND64(matrix[13]);
+         params[14] = IROUND64(matrix[14]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
+         params[0] = ctx->ColorMatrixStack.Depth + 1;
+         break;
+      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
+         params[0] = MAX_COLOR_STACK_DEPTH;
+         break;
+      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixScale[0]);
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixScale[1]);
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixScale[2]);
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixScale[3]);
+         break;
+      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixBias[0]);
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixBias[1]);
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixBias[2]);
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
+         params[0] = IROUND64(ctx->Pixel.PostColorMatrixBias[3]);
+         break;
+      case GL_CONVOLUTION_1D_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.Convolution1DEnabled);
+         break;
+      case GL_CONVOLUTION_2D_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.Convolution2DEnabled);
+         break;
+      case GL_SEPARABLE_2D_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.Separable2DEnabled);
+         break;
+      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionScale[0]);
+         break;
+      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionScale[1]);
+         break;
+      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionScale[2]);
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionScale[3]);
+         break;
+      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionBias[0]);
+         break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionBias[1]);
+         break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionBias[2]);
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
+         CHECK_EXT1(EXT_convolution, "GetInteger64v");
+         params[0] = IROUND64(ctx->Pixel.PostConvolutionBias[3]);
+         break;
+      case GL_HISTOGRAM:
+         CHECK_EXT1(EXT_histogram, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.HistogramEnabled);
+         break;
+      case GL_MINMAX:
+         CHECK_EXT1(EXT_histogram, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.MinMaxEnabled);
+         break;
+      case GL_COLOR_TABLE_SGI:
+         CHECK_EXT1(SGI_color_table, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.ColorTableEnabled[COLORTABLE_PRECONVOLUTION]);
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         CHECK_EXT1(SGI_color_table, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCONVOLUTION]);
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         CHECK_EXT1(SGI_color_table, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Pixel.ColorTableEnabled[COLORTABLE_POSTCOLORMATRIX]);
+         break;
+      case GL_TEXTURE_COLOR_TABLE_SGI:
+         CHECK_EXT1(SGI_texture_color_table, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled);
+         break;
+      case GL_COLOR_SUM_EXT:
+         CHECK_EXT2(EXT_secondary_color, ARB_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Fog.ColorSumEnabled);
+         break;
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
+         CHECK_EXT1(EXT_secondary_color, "GetInteger64v");
+         {
+         FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0]);
+         params[1] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1]);
+         params[2] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2]);
+         params[3] = FLOAT_TO_INT64(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3]);
+         }
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_EXT:
+         CHECK_EXT1(EXT_secondary_color, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->SecondaryColor.Enabled);
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
+         CHECK_EXT1(EXT_secondary_color, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->SecondaryColor.Type);
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
+         CHECK_EXT1(EXT_secondary_color, "GetInteger64v");
+         params[0] = ctx->Array.ArrayObj->SecondaryColor.Stride;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
+         CHECK_EXT1(EXT_secondary_color, "GetInteger64v");
+         params[0] = ctx->Array.ArrayObj->SecondaryColor.Size;
+         break;
+      case GL_CURRENT_FOG_COORDINATE_EXT:
+         CHECK_EXT1(EXT_fog_coord, "GetInteger64v");
+         {
+         FLUSH_CURRENT(ctx, 0);
+         params[0] = IROUND64(ctx->Current.Attrib[VERT_ATTRIB_FOG][0]);
+         }
+         break;
+      case GL_FOG_COORDINATE_ARRAY_EXT:
+         CHECK_EXT1(EXT_fog_coord, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->FogCoord.Enabled);
+         break;
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
+         CHECK_EXT1(EXT_fog_coord, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Array.ArrayObj->FogCoord.Type);
+         break;
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
+         CHECK_EXT1(EXT_fog_coord, "GetInteger64v");
+         params[0] = ctx->Array.ArrayObj->FogCoord.Stride;
+         break;
+      case GL_FOG_COORDINATE_SOURCE_EXT:
+         CHECK_EXT1(EXT_fog_coord, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Fog.FogCoordinateSource);
+         break;
+      case GL_MAX_TEXTURE_LOD_BIAS_EXT:
+         CHECK_EXT1(EXT_texture_lod_bias, "GetInteger64v");
+         params[0] = IROUND64(ctx->Const.MaxTextureLodBias);
+         break;
+      case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
+         CHECK_EXT1(EXT_texture_filter_anisotropic, "GetInteger64v");
+         params[0] = IROUND64(ctx->Const.MaxTextureMaxAnisotropy);
+         break;
+      case GL_MULTISAMPLE_ARB:
+         params[0] = BOOLEAN_TO_INT64(ctx->Multisample.Enabled);
+         break;
+      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
+         params[0] = BOOLEAN_TO_INT64(ctx->Multisample.SampleAlphaToCoverage);
+         break;
+      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
+         params[0] = BOOLEAN_TO_INT64(ctx->Multisample.SampleAlphaToOne);
+         break;
+      case GL_SAMPLE_COVERAGE_ARB:
+         params[0] = BOOLEAN_TO_INT64(ctx->Multisample.SampleCoverage);
+         break;
+      case GL_SAMPLE_COVERAGE_VALUE_ARB:
+         params[0] = IROUND64(ctx->Multisample.SampleCoverageValue);
+         break;
+      case GL_SAMPLE_COVERAGE_INVERT_ARB:
+         params[0] = BOOLEAN_TO_INT64(ctx->Multisample.SampleCoverageInvert);
+         break;
+      case GL_SAMPLE_BUFFERS_ARB:
+         params[0] = ctx->DrawBuffer->Visual.sampleBuffers;
+         break;
+      case GL_SAMPLES_ARB:
+         params[0] = ctx->DrawBuffer->Visual.samples;
+         break;
+      case GL_RASTER_POSITION_UNCLIPPED_IBM:
+         CHECK_EXT1(IBM_rasterpos_clip, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Transform.RasterPositionUnclipped);
+         break;
+      case GL_POINT_SPRITE_NV:
+         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Point.PointSprite);
+         break;
+      case GL_POINT_SPRITE_R_MODE_NV:
+         CHECK_EXT1(NV_point_sprite, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Point.SpriteRMode);
+         break;
+      case GL_POINT_SPRITE_COORD_ORIGIN:
+         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Point.SpriteOrigin);
+         break;
+      case GL_GENERATE_MIPMAP_HINT_SGIS:
+         CHECK_EXT1(SGIS_generate_mipmap, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Hint.GenerateMipmap);
+         break;
+      case GL_VERTEX_PROGRAM_BINDING_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = (ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY0_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[0].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY1_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[1].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY2_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[2].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY3_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[3].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[4].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY5_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[5].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY6_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[6].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY7_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[7].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY8_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[8].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY9_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[9].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY10_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[10].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY11_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[11].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY12_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[12].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY13_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[13].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY14_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[14].Enabled);
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY15_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Array.ArrayObj->VertexAttrib[15].Enabled);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[0]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[1]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[2]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[3]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[4]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[5]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[6]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[7]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[8]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[9]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[10]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[11]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[12]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[13]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[14]);
+         break;
+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXT1(NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Eval.Map1Attrib[15]);
+         break;
+      case GL_FRAGMENT_PROGRAM_NV:
+         CHECK_EXT1(NV_fragment_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->FragmentProgram.Enabled);
+         break;
+      case GL_FRAGMENT_PROGRAM_BINDING_NV:
+         CHECK_EXT1(NV_fragment_program, "GetInteger64v");
+         params[0] = ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0;
+         break;
+      case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
+         CHECK_EXT1(NV_fragment_program, "GetInteger64v");
+         params[0] = MAX_NV_FRAGMENT_PROGRAM_PARAMS;
+         break;
+      case GL_TEXTURE_RECTANGLE_NV:
+         CHECK_EXT1(NV_texture_rectangle, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(_mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV));
+         break;
+      case GL_TEXTURE_BINDING_RECTANGLE_NV:
+         CHECK_EXT1(NV_texture_rectangle, "GetInteger64v");
+         params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentTex[TEXTURE_RECT_INDEX]->Name;
+         break;
+      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
+         CHECK_EXT1(NV_texture_rectangle, "GetInteger64v");
+         params[0] = ctx->Const.MaxTextureRectSize;
+         break;
+      case GL_STENCIL_TEST_TWO_SIDE_EXT:
+         CHECK_EXT1(EXT_stencil_two_side, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Stencil.TestTwoSide);
+         break;
+      case GL_ACTIVE_STENCIL_FACE_EXT:
+         CHECK_EXT1(EXT_stencil_two_side, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT);
+         break;
+      case GL_MAX_SHININESS_NV:
+         CHECK_EXT1(NV_light_max_exponent, "GetInteger64v");
+         params[0] = IROUND64(ctx->Const.MaxShininess);
+         break;
+      case GL_MAX_SPOT_EXPONENT_NV:
+         CHECK_EXT1(NV_light_max_exponent, "GetInteger64v");
+         params[0] = IROUND64(ctx->Const.MaxSpotExponent);
+         break;
+      case GL_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayBufferObj->Name;
+         break;
+      case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->Vertex.BufferObj->Name;
+         break;
+      case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->Normal.BufferObj->Name;
+         break;
+      case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->Color.BufferObj->Name;
+         break;
+      case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->Index.BufferObj->Name;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->TexCoord[ctx->Array.ActiveTexture].BufferObj->Name;
+         break;
+      case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->EdgeFlag.BufferObj->Name;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->SecondaryColor.BufferObj->Name;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ArrayObj->FogCoord.BufferObj->Name;
+         break;
+      case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
+         params[0] = ctx->Array.ElementArrayBufferObj->Name;
+         break;
+      case GL_PIXEL_PACK_BUFFER_BINDING_EXT:
+         CHECK_EXT1(EXT_pixel_buffer_object, "GetInteger64v");
+         params[0] = ctx->Pack.BufferObj->Name;
+         break;
+      case GL_PIXEL_UNPACK_BUFFER_BINDING_EXT:
+         CHECK_EXT1(EXT_pixel_buffer_object, "GetInteger64v");
+         params[0] = ctx->Unpack.BufferObj->Name;
+         break;
+      case GL_VERTEX_PROGRAM_ARB:
+         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->VertexProgram.Enabled);
+         break;
+      case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
+         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->VertexProgram.PointSizeEnabled);
+         break;
+      case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
+         CHECK_EXT2(ARB_vertex_program, NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->VertexProgram.TwoSideEnabled);
+         break;
+      case GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB:
+         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetInteger64v");
+         params[0] = ctx->Const.MaxProgramMatrixStackDepth;
+         break;
+      case GL_MAX_PROGRAM_MATRICES_ARB:
+         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetInteger64v");
+         params[0] = ctx->Const.MaxProgramMatrices;
+         break;
+      case GL_CURRENT_MATRIX_STACK_DEPTH_ARB:
+         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_vertex_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->CurrentStack->Depth + 1);
+         break;
+      case GL_CURRENT_MATRIX_ARB:
+         CHECK_EXT3(ARB_vertex_program, ARB_fragment_program, NV_fragment_program, "GetInteger64v");
+         {
+         const GLfloat *matrix = ctx->CurrentStack->Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[1]);
+         params[2] = IROUND64(matrix[2]);
+         params[3] = IROUND64(matrix[3]);
+         params[4] = IROUND64(matrix[4]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[6]);
+         params[7] = IROUND64(matrix[7]);
+         params[8] = IROUND64(matrix[8]);
+         params[9] = IROUND64(matrix[9]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[11]);
+         params[12] = IROUND64(matrix[12]);
+         params[13] = IROUND64(matrix[13]);
+         params[14] = IROUND64(matrix[14]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
+         CHECK_EXT2(ARB_vertex_program, ARB_fragment_program, "GetInteger64v");
+         {
+         const GLfloat *matrix = ctx->CurrentStack->Top->m;
+         params[0] = IROUND64(matrix[0]);
+         params[1] = IROUND64(matrix[4]);
+         params[2] = IROUND64(matrix[8]);
+         params[3] = IROUND64(matrix[12]);
+         params[4] = IROUND64(matrix[1]);
+         params[5] = IROUND64(matrix[5]);
+         params[6] = IROUND64(matrix[9]);
+         params[7] = IROUND64(matrix[13]);
+         params[8] = IROUND64(matrix[2]);
+         params[9] = IROUND64(matrix[6]);
+         params[10] = IROUND64(matrix[10]);
+         params[11] = IROUND64(matrix[14]);
+         params[12] = IROUND64(matrix[3]);
+         params[13] = IROUND64(matrix[7]);
+         params[14] = IROUND64(matrix[11]);
+         params[15] = IROUND64(matrix[15]);
+         }
+         break;
+      case GL_MAX_VERTEX_ATTRIBS_ARB:
+         CHECK_EXT1(ARB_vertex_program, "GetInteger64v");
+         params[0] = ctx->Const.VertexProgram.MaxAttribs;
+         break;
+      case GL_PROGRAM_ERROR_POSITION_ARB:
+         CHECK_EXT4(NV_vertex_program, ARB_vertex_program, NV_fragment_program, ARB_fragment_program, "GetInteger64v");
+         params[0] = ctx->Program.ErrorPos;
+         break;
+      case GL_FRAGMENT_PROGRAM_ARB:
+         CHECK_EXT1(ARB_fragment_program, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->FragmentProgram.Enabled);
+         break;
+      case GL_MAX_TEXTURE_COORDS_ARB:
+         CHECK_EXT2(ARB_fragment_program, NV_fragment_program, "GetInteger64v");
+         params[0] = ctx->Const.MaxTextureCoordUnits;
+         break;
+      case GL_MAX_TEXTURE_IMAGE_UNITS_ARB:
+         CHECK_EXT2(ARB_fragment_program, NV_fragment_program, "GetInteger64v");
+         params[0] = ctx->Const.MaxTextureImageUnits;
+         break;
+      case GL_DEPTH_BOUNDS_TEST_EXT:
+         CHECK_EXT1(EXT_depth_bounds_test, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Depth.BoundsTest);
+         break;
+      case GL_DEPTH_BOUNDS_EXT:
+         CHECK_EXT1(EXT_depth_bounds_test, "GetInteger64v");
+         params[0] = IROUND64(ctx->Depth.BoundsMin);
+         params[1] = IROUND64(ctx->Depth.BoundsMax);
+         break;
+      case GL_MAX_DRAW_BUFFERS_ARB:
+         params[0] = ctx->Const.MaxDrawBuffers;
+         break;
+      case GL_DRAW_BUFFER0_ARB:
+         params[0] = ENUM_TO_INT64(ctx->DrawBuffer->ColorDrawBuffer[0]);
+         break;
+      case GL_DRAW_BUFFER1_ARB:
+         {
+         GLenum buffer;
+         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
+            return;
+         }
+         buffer = ctx->DrawBuffer->ColorDrawBuffer[1];
+         params[0] = ENUM_TO_INT64(buffer);
+         }
+         break;
+      case GL_DRAW_BUFFER2_ARB:
+         {
+         GLenum buffer;
+         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
+            return;
+         }
+         buffer = ctx->DrawBuffer->ColorDrawBuffer[2];
+         params[0] = ENUM_TO_INT64(buffer);
+         }
+         break;
+      case GL_DRAW_BUFFER3_ARB:
+         {
+         GLenum buffer;
+         if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
+            _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
+            return;
+         }
+         buffer = ctx->DrawBuffer->ColorDrawBuffer[3];
+         params[0] = ENUM_TO_INT64(buffer);
+         }
+         break;
+      case GL_IMPLEMENTATION_COLOR_READ_TYPE_OES:
+         CHECK_EXT1(OES_read_format, "GetInteger64v");
+         params[0] = ctx->Const.ColorReadType;
+         break;
+      case GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES:
+         CHECK_EXT1(OES_read_format, "GetInteger64v");
+         params[0] = ctx->Const.ColorReadFormat;
+         break;
+      case GL_NUM_FRAGMENT_REGISTERS_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = 6;
+         break;
+      case GL_NUM_FRAGMENT_CONSTANTS_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = 8;
+         break;
+      case GL_NUM_PASSES_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = 2;
+         break;
+      case GL_NUM_INSTRUCTIONS_PER_PASS_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = 8;
+         break;
+      case GL_NUM_INSTRUCTIONS_TOTAL_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = 16;
+         break;
+      case GL_COLOR_ALPHA_PAIRING_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(GL_TRUE);
+         break;
+      case GL_NUM_LOOPBACK_COMPONENTS_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = 3;
+         break;
+      case GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI:
+         CHECK_EXT1(ATI_fragment_shader, "GetInteger64v");
+         params[0] = 3;
+         break;
+      case GL_STENCIL_BACK_FUNC:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.Function[1]);
+         break;
+      case GL_STENCIL_BACK_VALUE_MASK:
+         params[0] = ctx->Stencil.ValueMask[1];
+         break;
+      case GL_STENCIL_BACK_WRITEMASK:
+         params[0] = ctx->Stencil.WriteMask[1];
+         break;
+      case GL_STENCIL_BACK_REF:
+         params[0] = ctx->Stencil.Ref[1];
+         break;
+      case GL_STENCIL_BACK_FAIL:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.FailFunc[1]);
+         break;
+      case GL_STENCIL_BACK_PASS_DEPTH_FAIL:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.ZFailFunc[1]);
+         break;
+      case GL_STENCIL_BACK_PASS_DEPTH_PASS:
+         params[0] = ENUM_TO_INT64(ctx->Stencil.ZPassFunc[1]);
+         break;
+      case GL_FRAMEBUFFER_BINDING_EXT:
+         CHECK_EXT1(EXT_framebuffer_object, "GetInteger64v");
+         params[0] = ctx->DrawBuffer->Name;
+         break;
+      case GL_RENDERBUFFER_BINDING_EXT:
+         CHECK_EXT1(EXT_framebuffer_object, "GetInteger64v");
+         params[0] = ctx->CurrentRenderbuffer ? ctx->CurrentRenderbuffer->Name : 0;
+         break;
+      case GL_MAX_COLOR_ATTACHMENTS_EXT:
+         CHECK_EXT1(EXT_framebuffer_object, "GetInteger64v");
+         params[0] = ctx->Const.MaxColorAttachments;
+         break;
+      case GL_MAX_RENDERBUFFER_SIZE_EXT:
+         CHECK_EXT1(EXT_framebuffer_object, "GetInteger64v");
+         params[0] = ctx->Const.MaxRenderbufferSize;
+         break;
+      case GL_READ_FRAMEBUFFER_BINDING_EXT:
+         CHECK_EXT1(EXT_framebuffer_blit, "GetInteger64v");
+         params[0] = ctx->ReadBuffer->Name;
+         break;
+      case GL_PROVOKING_VERTEX_EXT:
+         CHECK_EXT1(EXT_provoking_vertex, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Light.ProvokingVertex);
+         break;
+      case GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT:
+         CHECK_EXT1(EXT_provoking_vertex, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Const.QuadsFollowProvokingVertexConvention);
+         break;
+      case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB:
+         CHECK_EXT1(ARB_fragment_shader, "GetInteger64v");
+         params[0] = ctx->Const.FragmentProgram.MaxUniformComponents;
+         break;
+      case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB:
+         CHECK_EXT1(ARB_fragment_shader, "GetInteger64v");
+         params[0] = ENUM_TO_INT64(ctx->Hint.FragmentShaderDerivative);
+         break;
+      case GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB:
+         CHECK_EXT1(ARB_vertex_shader, "GetInteger64v");
+         params[0] = ctx->Const.VertexProgram.MaxUniformComponents;
+         break;
+      case GL_MAX_VARYING_FLOATS_ARB:
+         CHECK_EXT1(ARB_vertex_shader, "GetInteger64v");
+         params[0] = ctx->Const.MaxVarying * 4;
+         break;
+      case GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB:
+         CHECK_EXT1(ARB_vertex_shader, "GetInteger64v");
+         params[0] = ctx->Const.MaxVertexTextureImageUnits;
+         break;
+      case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB:
+         CHECK_EXT1(ARB_vertex_shader, "GetInteger64v");
+         params[0] = MAX_COMBINED_TEXTURE_IMAGE_UNITS;
+         break;
+      case GL_CURRENT_PROGRAM:
+         CHECK_EXT1(ARB_shader_objects, "GetInteger64v");
+         params[0] = ctx->Shader.CurrentProgram ? ctx->Shader.CurrentProgram->Name : 0;
+         break;
+      case GL_MAX_SAMPLES:
+         CHECK_EXT1(ARB_framebuffer_object, "GetInteger64v");
+         params[0] = ctx->Const.MaxSamples;
+         break;
+      case GL_VERTEX_ARRAY_BINDING_APPLE:
+         CHECK_EXT1(APPLE_vertex_array_object, "GetInteger64v");
+         params[0] = ctx->Array.ArrayObj->Name;
+         break;
+      case GL_TEXTURE_CUBE_MAP_SEAMLESS:
+         CHECK_EXT1(ARB_seamless_cube_map, "GetInteger64v");
+         params[0] = BOOLEAN_TO_INT64(ctx->Texture.CubeMapSeamless);
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetInteger64v(pname=0x%x)", pname);
+   }
+}
+#endif /* FEATURE_ARB_sync */
+
 
 void GLAPIENTRY
 _mesa_GetDoublev( GLenum pname, GLdouble *params )
diff --git a/src/mesa/main/get.h b/src/mesa/main/get.h
index 9b47b230a9..77a9a7d04b 100644
--- a/src/mesa/main/get.h
+++ b/src/mesa/main/get.h
@@ -47,6 +47,9 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params );
 extern void GLAPIENTRY
 _mesa_GetIntegerv( GLenum pname, GLint *params );
 
+extern void GLAPIENTRY
+_mesa_GetInteger64v( GLenum pname, GLint64 *params );
+
 extern void GLAPIENTRY
 _mesa_GetPointerv( GLenum pname, GLvoid **params );
 
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 97dc785020..4f0feaad3c 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -35,6 +35,7 @@ GLfloat = 3
 GLdouble = 4
 GLboolean = 5
 GLfloatN = 6    # A normalized value, such as a color or depth range
+GLint64 = 7
 
 
 TypeStrings = {
@@ -42,7 +43,8 @@ TypeStrings = {
 	GLenum : "GLenum",
 	GLfloat : "GLfloat",
 	GLdouble : "GLdouble",
-	GLboolean : "GLboolean"
+	GLboolean : "GLboolean",
+	GLint64 : "GLint64"
 }
 
 
@@ -1029,10 +1031,16 @@ def ConversionFunc(fromType, toType):
 		return ""
 	elif fromType == GLfloat and toType == GLint:
 		return "IROUND"
+	elif fromType == GLfloat and toType == GLint64:
+		return "IROUND64"
 	elif fromType == GLfloatN and toType == GLfloat:
 		return ""
 	elif fromType == GLint and toType == GLfloat: # but not GLfloatN!
 		return "(GLfloat)"
+	elif fromType == GLint and toType == GLint64:
+		return ""
+	elif fromType == GLint64 and toType == GLfloat: # but not GLfloatN!
+		return "(GLfloat)"
 	else:
 		if fromType == GLfloatN:
 			fromType = GLfloat
@@ -1047,6 +1055,7 @@ def EmitGetFunction(stateVars, returnType):
 	"""Emit the code to implement glGetBooleanv, glGetIntegerv or glGetFloatv."""
 	assert (returnType == GLboolean or
 			returnType == GLint or
+			returnType == GLint64 or
 			returnType == GLfloat)
 
 	strType = TypeStrings[returnType]
@@ -1057,9 +1066,14 @@ def EmitGetFunction(stateVars, returnType):
 		function = "GetBooleanv"
 	elif returnType == GLfloat:
 		function = "GetFloatv"
+	elif returnType == GLint64:
+		function = "GetInteger64v"
 	else:
 		abort()
 
+	if returnType == GLint64:
+		print "#if FEATURE_ARB_sync"
+
 	print "void GLAPIENTRY"
 	print "_mesa_%s( GLenum pname, %s *params )" % (function, strType)
 	print "{"
@@ -1113,6 +1127,8 @@ def EmitGetFunction(stateVars, returnType):
 	print '         _mesa_error(ctx, GL_INVALID_ENUM, "gl%s(pname=0x%%x)", pname);' % function
 	print "   }"
 	print "}"
+	if returnType == GLint64:
+		print "#endif /* FEATURE_ARB_sync */"
 	print ""
 	return
 
@@ -1142,8 +1158,11 @@ def EmitHeader():
 #define INT_TO_BOOLEAN(I)     ( (I) ? GL_TRUE : GL_FALSE )
 
 #define BOOLEAN_TO_INT(B)     ( (GLint) (B) )
+#define BOOLEAN_TO_INT64(B)   ( (GLint64) (B) )
 #define BOOLEAN_TO_FLOAT(B)   ( (B) ? 1.0F : 0.0F )
 
+#define ENUM_TO_INT64(E)      ( (GLint64) (E) )
+
 
 /*
  * Check if named extension is enabled, if not generate error and return.
@@ -1221,5 +1240,6 @@ EmitHeader()
 EmitGetFunction(StateVars, GLboolean)
 EmitGetFunction(StateVars, GLfloat)
 EmitGetFunction(StateVars, GLint)
+EmitGetFunction(StateVars, GLint64)
 EmitGetDoublev()
 
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index fb85f0862c..7d4012a856 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -291,6 +291,7 @@ long iround(float f);
 #define IROUND(f)  ((int) (((f) >= 0.0F) ? ((f) + 0.5F) : ((f) - 0.5F)))
 #endif
 
+#define IROUND64(f)  ((GLint64) (((f) >= 0.0F) ? ((f) + 0.5F) : ((f) - 0.5F)))
 
 /***
  *** IROUND_POS: return (as an integer) positive float rounded to nearest int
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index 4ca7957ffa..3d9a1aba98 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -99,6 +99,9 @@ extern GLfloat _mesa_ubyte_to_float_color_tab[256];
 /* a close approximation: */
 #define FLOAT_TO_INT(X)     ( (GLint) (2147483647.0 * (X)) )
 
+/** Convert GLfloat in [-1.0,1.0] to GLint64 in [-(1<<63),(1 << 63) -1] */
+#define FLOAT_TO_INT64(X)     ( (GLint64) (9223372036854775807.0 * (double)(X)) )
+
 
 /** Convert GLint in [-2147483648,2147483647] to GLfloat in [-1.0,1.0], texture/fb data */
 #define INT_TO_FLOAT_TEX(I)    ((I) == -2147483648 ? -1.0F : (I) * (1.0F/2147483647.0))
-- 
cgit v1.2.3


From 064913430dd288c40351b41ab9e4040d3e92f0df Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 28 Aug 2009 15:50:28 -0700
Subject: ARB sync: Regenerate files from previous commit

---
 src/mesa/drivers/dri/common/extension_helper.h |   62 +
 src/mesa/glapi/dispatch.h                      |  487 +-
 src/mesa/glapi/glapioffsets.h                  |  452 +-
 src/mesa/glapi/glapitable.h                    |  443 +-
 src/mesa/glapi/glapitemp.h                     |  268 +-
 src/mesa/glapi/glprocs.h                       | 1184 ++---
 src/mesa/main/enums.c                          | 6230 ++++++++++++------------
 src/mesa/sparc/glapi_sparc.S                   |  147 +-
 src/mesa/x86-64/glapi_x86-64.S                 | 2373 +++++----
 src/mesa/x86/glapi_x86.S                       |  155 +-
 10 files changed, 6149 insertions(+), 5652 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/common/extension_helper.h b/src/mesa/drivers/dri/common/extension_helper.h
index 08a97bb111..790a2bc896 100644
--- a/src/mesa/drivers/dri/common/extension_helper.h
+++ b/src/mesa/drivers/dri/common/extension_helper.h
@@ -383,6 +383,13 @@ static const char ReplacementCodeuiNormal3fVertex3fSUN_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const char DeleteSync_names[] = 
+    "i\0" /* Parameter signature */
+    "glDeleteSync\0"
+    "";
+#endif
+
 #if defined(need_GL_SGIX_fragment_lighting)
 static const char FragmentMaterialfvSGIX_names[] = 
     "iip\0" /* Parameter signature */
@@ -1065,6 +1072,13 @@ static const char VertexAttrib1sARB_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const char FenceSync_names[] = 
+    "ii\0" /* Parameter signature */
+    "glFenceSync\0"
+    "";
+#endif
+
 #if defined(need_GL_NV_register_combiners)
 static const char FinalCombinerInputNV_names[] = 
     "iiii\0" /* Parameter signature */
@@ -1346,6 +1360,13 @@ static const char LoadProgramNV_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const char WaitSync_names[] = 
+    "iii\0" /* Parameter signature */
+    "glWaitSync\0"
+    "";
+#endif
+
 #if defined(need_GL_NV_vertex_program)
 static const char VertexAttrib4fvNV_names[] = 
     "ip\0" /* Parameter signature */
@@ -2219,6 +2240,13 @@ static const char VertexAttrib2dARB_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const char GetInteger64v_names[] = 
+    "ip\0" /* Parameter signature */
+    "glGetInteger64v\0"
+    "";
+#endif
+
 #if defined(need_GL_SGIS_texture_color_mask)
 static const char TextureColorMaskSGIS_names[] = 
     "iiii\0" /* Parameter signature */
@@ -3334,6 +3362,13 @@ static const char VertexAttrib3fvARB_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const char GetSynciv_names[] = 
+    "iiipp\0" /* Parameter signature */
+    "glGetSynciv\0"
+    "";
+#endif
+
 #if defined(need_GL_ARB_framebuffer_object) || defined(need_GL_EXT_framebuffer_object)
 static const char DeleteFramebuffersEXT_names[] = 
     "ip\0" /* Parameter signature */
@@ -4324,6 +4359,13 @@ static const char DrawMeshArraysSUN_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const char IsSync_names[] = 
+    "i\0" /* Parameter signature */
+    "glIsSync\0"
+    "";
+#endif
+
 #if defined(need_GL_NV_evaluators)
 static const char GetMapControlPointsNV_names[] = 
     "iiiiiip\0" /* Parameter signature */
@@ -4616,6 +4658,13 @@ static const char GetShaderiv_names[] =
     "";
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const char ClientWaitSync_names[] = 
+    "iii\0" /* Parameter signature */
+    "glClientWaitSync\0"
+    "";
+#endif
+
 #if defined(need_GL_ATI_fragment_shader)
 static const char BindFragmentShaderATI_names[] = 
     "i\0" /* Parameter signature */
@@ -5160,6 +5209,19 @@ static const struct dri_extension_function GL_ARB_shader_objects_functions[] = {
 };
 #endif
 
+#if defined(need_GL_ARB_sync)
+static const struct dri_extension_function GL_ARB_sync_functions[] = {
+    { DeleteSync_names, DeleteSync_remap_index, -1 },
+    { FenceSync_names, FenceSync_remap_index, -1 },
+    { WaitSync_names, WaitSync_remap_index, -1 },
+    { GetInteger64v_names, GetInteger64v_remap_index, -1 },
+    { GetSynciv_names, GetSynciv_remap_index, -1 },
+    { IsSync_names, IsSync_remap_index, -1 },
+    { ClientWaitSync_names, ClientWaitSync_remap_index, -1 },
+    { NULL, 0, 0 }
+};
+#endif
+
 #if defined(need_GL_ARB_texture_compression)
 static const struct dri_extension_function GL_ARB_texture_compression_functions[] = {
     { CompressedTexSubImage2DARB_names, CompressedTexSubImage2DARB_remap_index, -1 },
diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
index 2f5cc55f00..8288c0a263 100644
--- a/src/mesa/glapi/dispatch.h
+++ b/src/mesa/glapi/dispatch.h
@@ -1761,6 +1761,27 @@
 #define CALL_CopyBufferSubData(disp, parameters) (*((disp)->CopyBufferSubData)) parameters
 #define GET_CopyBufferSubData(disp) ((disp)->CopyBufferSubData)
 #define SET_CopyBufferSubData(disp, fn) ((disp)->CopyBufferSubData = fn)
+#define CALL_ClientWaitSync(disp, parameters) (*((disp)->ClientWaitSync)) parameters
+#define GET_ClientWaitSync(disp) ((disp)->ClientWaitSync)
+#define SET_ClientWaitSync(disp, fn) ((disp)->ClientWaitSync = fn)
+#define CALL_DeleteSync(disp, parameters) (*((disp)->DeleteSync)) parameters
+#define GET_DeleteSync(disp) ((disp)->DeleteSync)
+#define SET_DeleteSync(disp, fn) ((disp)->DeleteSync = fn)
+#define CALL_FenceSync(disp, parameters) (*((disp)->FenceSync)) parameters
+#define GET_FenceSync(disp) ((disp)->FenceSync)
+#define SET_FenceSync(disp, fn) ((disp)->FenceSync = fn)
+#define CALL_GetInteger64v(disp, parameters) (*((disp)->GetInteger64v)) parameters
+#define GET_GetInteger64v(disp) ((disp)->GetInteger64v)
+#define SET_GetInteger64v(disp, fn) ((disp)->GetInteger64v = fn)
+#define CALL_GetSynciv(disp, parameters) (*((disp)->GetSynciv)) parameters
+#define GET_GetSynciv(disp) ((disp)->GetSynciv)
+#define SET_GetSynciv(disp, fn) ((disp)->GetSynciv = fn)
+#define CALL_IsSync(disp, parameters) (*((disp)->IsSync)) parameters
+#define GET_IsSync(disp) ((disp)->IsSync)
+#define SET_IsSync(disp, fn) ((disp)->IsSync = fn)
+#define CALL_WaitSync(disp, parameters) (*((disp)->WaitSync)) parameters
+#define GET_WaitSync(disp) ((disp)->WaitSync)
+#define SET_WaitSync(disp, fn) ((disp)->WaitSync = fn)
 #define CALL_PolygonOffsetEXT(disp, parameters) (*((disp)->PolygonOffsetEXT)) parameters
 #define GET_PolygonOffsetEXT(disp) ((disp)->PolygonOffsetEXT)
 #define SET_PolygonOffsetEXT(disp, fn) ((disp)->PolygonOffsetEXT = fn)
@@ -2418,7 +2439,7 @@
 
 #else
 
-#define driDispatchRemapTable_size 377
+#define driDispatchRemapTable_size 384
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -2580,224 +2601,231 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define BindVertexArray_remap_index 156
 #define GenVertexArrays_remap_index 157
 #define CopyBufferSubData_remap_index 158
-#define PolygonOffsetEXT_remap_index 159
-#define GetPixelTexGenParameterfvSGIS_remap_index 160
-#define GetPixelTexGenParameterivSGIS_remap_index 161
-#define PixelTexGenParameterfSGIS_remap_index 162
-#define PixelTexGenParameterfvSGIS_remap_index 163
-#define PixelTexGenParameteriSGIS_remap_index 164
-#define PixelTexGenParameterivSGIS_remap_index 165
-#define SampleMaskSGIS_remap_index 166
-#define SamplePatternSGIS_remap_index 167
-#define ColorPointerEXT_remap_index 168
-#define EdgeFlagPointerEXT_remap_index 169
-#define IndexPointerEXT_remap_index 170
-#define NormalPointerEXT_remap_index 171
-#define TexCoordPointerEXT_remap_index 172
-#define VertexPointerEXT_remap_index 173
-#define PointParameterfEXT_remap_index 174
-#define PointParameterfvEXT_remap_index 175
-#define LockArraysEXT_remap_index 176
-#define UnlockArraysEXT_remap_index 177
-#define CullParameterdvEXT_remap_index 178
-#define CullParameterfvEXT_remap_index 179
-#define SecondaryColor3bEXT_remap_index 180
-#define SecondaryColor3bvEXT_remap_index 181
-#define SecondaryColor3dEXT_remap_index 182
-#define SecondaryColor3dvEXT_remap_index 183
-#define SecondaryColor3fEXT_remap_index 184
-#define SecondaryColor3fvEXT_remap_index 185
-#define SecondaryColor3iEXT_remap_index 186
-#define SecondaryColor3ivEXT_remap_index 187
-#define SecondaryColor3sEXT_remap_index 188
-#define SecondaryColor3svEXT_remap_index 189
-#define SecondaryColor3ubEXT_remap_index 190
-#define SecondaryColor3ubvEXT_remap_index 191
-#define SecondaryColor3uiEXT_remap_index 192
-#define SecondaryColor3uivEXT_remap_index 193
-#define SecondaryColor3usEXT_remap_index 194
-#define SecondaryColor3usvEXT_remap_index 195
-#define SecondaryColorPointerEXT_remap_index 196
-#define MultiDrawArraysEXT_remap_index 197
-#define MultiDrawElementsEXT_remap_index 198
-#define FogCoordPointerEXT_remap_index 199
-#define FogCoorddEXT_remap_index 200
-#define FogCoorddvEXT_remap_index 201
-#define FogCoordfEXT_remap_index 202
-#define FogCoordfvEXT_remap_index 203
-#define PixelTexGenSGIX_remap_index 204
-#define BlendFuncSeparateEXT_remap_index 205
-#define FlushVertexArrayRangeNV_remap_index 206
-#define VertexArrayRangeNV_remap_index 207
-#define CombinerInputNV_remap_index 208
-#define CombinerOutputNV_remap_index 209
-#define CombinerParameterfNV_remap_index 210
-#define CombinerParameterfvNV_remap_index 211
-#define CombinerParameteriNV_remap_index 212
-#define CombinerParameterivNV_remap_index 213
-#define FinalCombinerInputNV_remap_index 214
-#define GetCombinerInputParameterfvNV_remap_index 215
-#define GetCombinerInputParameterivNV_remap_index 216
-#define GetCombinerOutputParameterfvNV_remap_index 217
-#define GetCombinerOutputParameterivNV_remap_index 218
-#define GetFinalCombinerInputParameterfvNV_remap_index 219
-#define GetFinalCombinerInputParameterivNV_remap_index 220
-#define ResizeBuffersMESA_remap_index 221
-#define WindowPos2dMESA_remap_index 222
-#define WindowPos2dvMESA_remap_index 223
-#define WindowPos2fMESA_remap_index 224
-#define WindowPos2fvMESA_remap_index 225
-#define WindowPos2iMESA_remap_index 226
-#define WindowPos2ivMESA_remap_index 227
-#define WindowPos2sMESA_remap_index 228
-#define WindowPos2svMESA_remap_index 229
-#define WindowPos3dMESA_remap_index 230
-#define WindowPos3dvMESA_remap_index 231
-#define WindowPos3fMESA_remap_index 232
-#define WindowPos3fvMESA_remap_index 233
-#define WindowPos3iMESA_remap_index 234
-#define WindowPos3ivMESA_remap_index 235
-#define WindowPos3sMESA_remap_index 236
-#define WindowPos3svMESA_remap_index 237
-#define WindowPos4dMESA_remap_index 238
-#define WindowPos4dvMESA_remap_index 239
-#define WindowPos4fMESA_remap_index 240
-#define WindowPos4fvMESA_remap_index 241
-#define WindowPos4iMESA_remap_index 242
-#define WindowPos4ivMESA_remap_index 243
-#define WindowPos4sMESA_remap_index 244
-#define WindowPos4svMESA_remap_index 245
-#define MultiModeDrawArraysIBM_remap_index 246
-#define MultiModeDrawElementsIBM_remap_index 247
-#define DeleteFencesNV_remap_index 248
-#define FinishFenceNV_remap_index 249
-#define GenFencesNV_remap_index 250
-#define GetFenceivNV_remap_index 251
-#define IsFenceNV_remap_index 252
-#define SetFenceNV_remap_index 253
-#define TestFenceNV_remap_index 254
-#define AreProgramsResidentNV_remap_index 255
-#define BindProgramNV_remap_index 256
-#define DeleteProgramsNV_remap_index 257
-#define ExecuteProgramNV_remap_index 258
-#define GenProgramsNV_remap_index 259
-#define GetProgramParameterdvNV_remap_index 260
-#define GetProgramParameterfvNV_remap_index 261
-#define GetProgramStringNV_remap_index 262
-#define GetProgramivNV_remap_index 263
-#define GetTrackMatrixivNV_remap_index 264
-#define GetVertexAttribPointervNV_remap_index 265
-#define GetVertexAttribdvNV_remap_index 266
-#define GetVertexAttribfvNV_remap_index 267
-#define GetVertexAttribivNV_remap_index 268
-#define IsProgramNV_remap_index 269
-#define LoadProgramNV_remap_index 270
-#define ProgramParameters4dvNV_remap_index 271
-#define ProgramParameters4fvNV_remap_index 272
-#define RequestResidentProgramsNV_remap_index 273
-#define TrackMatrixNV_remap_index 274
-#define VertexAttrib1dNV_remap_index 275
-#define VertexAttrib1dvNV_remap_index 276
-#define VertexAttrib1fNV_remap_index 277
-#define VertexAttrib1fvNV_remap_index 278
-#define VertexAttrib1sNV_remap_index 279
-#define VertexAttrib1svNV_remap_index 280
-#define VertexAttrib2dNV_remap_index 281
-#define VertexAttrib2dvNV_remap_index 282
-#define VertexAttrib2fNV_remap_index 283
-#define VertexAttrib2fvNV_remap_index 284
-#define VertexAttrib2sNV_remap_index 285
-#define VertexAttrib2svNV_remap_index 286
-#define VertexAttrib3dNV_remap_index 287
-#define VertexAttrib3dvNV_remap_index 288
-#define VertexAttrib3fNV_remap_index 289
-#define VertexAttrib3fvNV_remap_index 290
-#define VertexAttrib3sNV_remap_index 291
-#define VertexAttrib3svNV_remap_index 292
-#define VertexAttrib4dNV_remap_index 293
-#define VertexAttrib4dvNV_remap_index 294
-#define VertexAttrib4fNV_remap_index 295
-#define VertexAttrib4fvNV_remap_index 296
-#define VertexAttrib4sNV_remap_index 297
-#define VertexAttrib4svNV_remap_index 298
-#define VertexAttrib4ubNV_remap_index 299
-#define VertexAttrib4ubvNV_remap_index 300
-#define VertexAttribPointerNV_remap_index 301
-#define VertexAttribs1dvNV_remap_index 302
-#define VertexAttribs1fvNV_remap_index 303
-#define VertexAttribs1svNV_remap_index 304
-#define VertexAttribs2dvNV_remap_index 305
-#define VertexAttribs2fvNV_remap_index 306
-#define VertexAttribs2svNV_remap_index 307
-#define VertexAttribs3dvNV_remap_index 308
-#define VertexAttribs3fvNV_remap_index 309
-#define VertexAttribs3svNV_remap_index 310
-#define VertexAttribs4dvNV_remap_index 311
-#define VertexAttribs4fvNV_remap_index 312
-#define VertexAttribs4svNV_remap_index 313
-#define VertexAttribs4ubvNV_remap_index 314
-#define GetTexBumpParameterfvATI_remap_index 315
-#define GetTexBumpParameterivATI_remap_index 316
-#define TexBumpParameterfvATI_remap_index 317
-#define TexBumpParameterivATI_remap_index 318
-#define AlphaFragmentOp1ATI_remap_index 319
-#define AlphaFragmentOp2ATI_remap_index 320
-#define AlphaFragmentOp3ATI_remap_index 321
-#define BeginFragmentShaderATI_remap_index 322
-#define BindFragmentShaderATI_remap_index 323
-#define ColorFragmentOp1ATI_remap_index 324
-#define ColorFragmentOp2ATI_remap_index 325
-#define ColorFragmentOp3ATI_remap_index 326
-#define DeleteFragmentShaderATI_remap_index 327
-#define EndFragmentShaderATI_remap_index 328
-#define GenFragmentShadersATI_remap_index 329
-#define PassTexCoordATI_remap_index 330
-#define SampleMapATI_remap_index 331
-#define SetFragmentShaderConstantATI_remap_index 332
-#define PointParameteriNV_remap_index 333
-#define PointParameterivNV_remap_index 334
-#define ActiveStencilFaceEXT_remap_index 335
-#define BindVertexArrayAPPLE_remap_index 336
-#define DeleteVertexArraysAPPLE_remap_index 337
-#define GenVertexArraysAPPLE_remap_index 338
-#define IsVertexArrayAPPLE_remap_index 339
-#define GetProgramNamedParameterdvNV_remap_index 340
-#define GetProgramNamedParameterfvNV_remap_index 341
-#define ProgramNamedParameter4dNV_remap_index 342
-#define ProgramNamedParameter4dvNV_remap_index 343
-#define ProgramNamedParameter4fNV_remap_index 344
-#define ProgramNamedParameter4fvNV_remap_index 345
-#define DepthBoundsEXT_remap_index 346
-#define BlendEquationSeparateEXT_remap_index 347
-#define BindFramebufferEXT_remap_index 348
-#define BindRenderbufferEXT_remap_index 349
-#define CheckFramebufferStatusEXT_remap_index 350
-#define DeleteFramebuffersEXT_remap_index 351
-#define DeleteRenderbuffersEXT_remap_index 352
-#define FramebufferRenderbufferEXT_remap_index 353
-#define FramebufferTexture1DEXT_remap_index 354
-#define FramebufferTexture2DEXT_remap_index 355
-#define FramebufferTexture3DEXT_remap_index 356
-#define GenFramebuffersEXT_remap_index 357
-#define GenRenderbuffersEXT_remap_index 358
-#define GenerateMipmapEXT_remap_index 359
-#define GetFramebufferAttachmentParameterivEXT_remap_index 360
-#define GetRenderbufferParameterivEXT_remap_index 361
-#define IsFramebufferEXT_remap_index 362
-#define IsRenderbufferEXT_remap_index 363
-#define RenderbufferStorageEXT_remap_index 364
-#define BlitFramebufferEXT_remap_index 365
-#define BufferParameteriAPPLE_remap_index 366
-#define FlushMappedBufferRangeAPPLE_remap_index 367
-#define FramebufferTextureLayerEXT_remap_index 368
-#define ProvokingVertexEXT_remap_index 369
-#define GetTexParameterPointervAPPLE_remap_index 370
-#define TextureRangeAPPLE_remap_index 371
-#define StencilFuncSeparateATI_remap_index 372
-#define ProgramEnvParameters4fvEXT_remap_index 373
-#define ProgramLocalParameters4fvEXT_remap_index 374
-#define GetQueryObjecti64vEXT_remap_index 375
-#define GetQueryObjectui64vEXT_remap_index 376
+#define ClientWaitSync_remap_index 159
+#define DeleteSync_remap_index 160
+#define FenceSync_remap_index 161
+#define GetInteger64v_remap_index 162
+#define GetSynciv_remap_index 163
+#define IsSync_remap_index 164
+#define WaitSync_remap_index 165
+#define PolygonOffsetEXT_remap_index 166
+#define GetPixelTexGenParameterfvSGIS_remap_index 167
+#define GetPixelTexGenParameterivSGIS_remap_index 168
+#define PixelTexGenParameterfSGIS_remap_index 169
+#define PixelTexGenParameterfvSGIS_remap_index 170
+#define PixelTexGenParameteriSGIS_remap_index 171
+#define PixelTexGenParameterivSGIS_remap_index 172
+#define SampleMaskSGIS_remap_index 173
+#define SamplePatternSGIS_remap_index 174
+#define ColorPointerEXT_remap_index 175
+#define EdgeFlagPointerEXT_remap_index 176
+#define IndexPointerEXT_remap_index 177
+#define NormalPointerEXT_remap_index 178
+#define TexCoordPointerEXT_remap_index 179
+#define VertexPointerEXT_remap_index 180
+#define PointParameterfEXT_remap_index 181
+#define PointParameterfvEXT_remap_index 182
+#define LockArraysEXT_remap_index 183
+#define UnlockArraysEXT_remap_index 184
+#define CullParameterdvEXT_remap_index 185
+#define CullParameterfvEXT_remap_index 186
+#define SecondaryColor3bEXT_remap_index 187
+#define SecondaryColor3bvEXT_remap_index 188
+#define SecondaryColor3dEXT_remap_index 189
+#define SecondaryColor3dvEXT_remap_index 190
+#define SecondaryColor3fEXT_remap_index 191
+#define SecondaryColor3fvEXT_remap_index 192
+#define SecondaryColor3iEXT_remap_index 193
+#define SecondaryColor3ivEXT_remap_index 194
+#define SecondaryColor3sEXT_remap_index 195
+#define SecondaryColor3svEXT_remap_index 196
+#define SecondaryColor3ubEXT_remap_index 197
+#define SecondaryColor3ubvEXT_remap_index 198
+#define SecondaryColor3uiEXT_remap_index 199
+#define SecondaryColor3uivEXT_remap_index 200
+#define SecondaryColor3usEXT_remap_index 201
+#define SecondaryColor3usvEXT_remap_index 202
+#define SecondaryColorPointerEXT_remap_index 203
+#define MultiDrawArraysEXT_remap_index 204
+#define MultiDrawElementsEXT_remap_index 205
+#define FogCoordPointerEXT_remap_index 206
+#define FogCoorddEXT_remap_index 207
+#define FogCoorddvEXT_remap_index 208
+#define FogCoordfEXT_remap_index 209
+#define FogCoordfvEXT_remap_index 210
+#define PixelTexGenSGIX_remap_index 211
+#define BlendFuncSeparateEXT_remap_index 212
+#define FlushVertexArrayRangeNV_remap_index 213
+#define VertexArrayRangeNV_remap_index 214
+#define CombinerInputNV_remap_index 215
+#define CombinerOutputNV_remap_index 216
+#define CombinerParameterfNV_remap_index 217
+#define CombinerParameterfvNV_remap_index 218
+#define CombinerParameteriNV_remap_index 219
+#define CombinerParameterivNV_remap_index 220
+#define FinalCombinerInputNV_remap_index 221
+#define GetCombinerInputParameterfvNV_remap_index 222
+#define GetCombinerInputParameterivNV_remap_index 223
+#define GetCombinerOutputParameterfvNV_remap_index 224
+#define GetCombinerOutputParameterivNV_remap_index 225
+#define GetFinalCombinerInputParameterfvNV_remap_index 226
+#define GetFinalCombinerInputParameterivNV_remap_index 227
+#define ResizeBuffersMESA_remap_index 228
+#define WindowPos2dMESA_remap_index 229
+#define WindowPos2dvMESA_remap_index 230
+#define WindowPos2fMESA_remap_index 231
+#define WindowPos2fvMESA_remap_index 232
+#define WindowPos2iMESA_remap_index 233
+#define WindowPos2ivMESA_remap_index 234
+#define WindowPos2sMESA_remap_index 235
+#define WindowPos2svMESA_remap_index 236
+#define WindowPos3dMESA_remap_index 237
+#define WindowPos3dvMESA_remap_index 238
+#define WindowPos3fMESA_remap_index 239
+#define WindowPos3fvMESA_remap_index 240
+#define WindowPos3iMESA_remap_index 241
+#define WindowPos3ivMESA_remap_index 242
+#define WindowPos3sMESA_remap_index 243
+#define WindowPos3svMESA_remap_index 244
+#define WindowPos4dMESA_remap_index 245
+#define WindowPos4dvMESA_remap_index 246
+#define WindowPos4fMESA_remap_index 247
+#define WindowPos4fvMESA_remap_index 248
+#define WindowPos4iMESA_remap_index 249
+#define WindowPos4ivMESA_remap_index 250
+#define WindowPos4sMESA_remap_index 251
+#define WindowPos4svMESA_remap_index 252
+#define MultiModeDrawArraysIBM_remap_index 253
+#define MultiModeDrawElementsIBM_remap_index 254
+#define DeleteFencesNV_remap_index 255
+#define FinishFenceNV_remap_index 256
+#define GenFencesNV_remap_index 257
+#define GetFenceivNV_remap_index 258
+#define IsFenceNV_remap_index 259
+#define SetFenceNV_remap_index 260
+#define TestFenceNV_remap_index 261
+#define AreProgramsResidentNV_remap_index 262
+#define BindProgramNV_remap_index 263
+#define DeleteProgramsNV_remap_index 264
+#define ExecuteProgramNV_remap_index 265
+#define GenProgramsNV_remap_index 266
+#define GetProgramParameterdvNV_remap_index 267
+#define GetProgramParameterfvNV_remap_index 268
+#define GetProgramStringNV_remap_index 269
+#define GetProgramivNV_remap_index 270
+#define GetTrackMatrixivNV_remap_index 271
+#define GetVertexAttribPointervNV_remap_index 272
+#define GetVertexAttribdvNV_remap_index 273
+#define GetVertexAttribfvNV_remap_index 274
+#define GetVertexAttribivNV_remap_index 275
+#define IsProgramNV_remap_index 276
+#define LoadProgramNV_remap_index 277
+#define ProgramParameters4dvNV_remap_index 278
+#define ProgramParameters4fvNV_remap_index 279
+#define RequestResidentProgramsNV_remap_index 280
+#define TrackMatrixNV_remap_index 281
+#define VertexAttrib1dNV_remap_index 282
+#define VertexAttrib1dvNV_remap_index 283
+#define VertexAttrib1fNV_remap_index 284
+#define VertexAttrib1fvNV_remap_index 285
+#define VertexAttrib1sNV_remap_index 286
+#define VertexAttrib1svNV_remap_index 287
+#define VertexAttrib2dNV_remap_index 288
+#define VertexAttrib2dvNV_remap_index 289
+#define VertexAttrib2fNV_remap_index 290
+#define VertexAttrib2fvNV_remap_index 291
+#define VertexAttrib2sNV_remap_index 292
+#define VertexAttrib2svNV_remap_index 293
+#define VertexAttrib3dNV_remap_index 294
+#define VertexAttrib3dvNV_remap_index 295
+#define VertexAttrib3fNV_remap_index 296
+#define VertexAttrib3fvNV_remap_index 297
+#define VertexAttrib3sNV_remap_index 298
+#define VertexAttrib3svNV_remap_index 299
+#define VertexAttrib4dNV_remap_index 300
+#define VertexAttrib4dvNV_remap_index 301
+#define VertexAttrib4fNV_remap_index 302
+#define VertexAttrib4fvNV_remap_index 303
+#define VertexAttrib4sNV_remap_index 304
+#define VertexAttrib4svNV_remap_index 305
+#define VertexAttrib4ubNV_remap_index 306
+#define VertexAttrib4ubvNV_remap_index 307
+#define VertexAttribPointerNV_remap_index 308
+#define VertexAttribs1dvNV_remap_index 309
+#define VertexAttribs1fvNV_remap_index 310
+#define VertexAttribs1svNV_remap_index 311
+#define VertexAttribs2dvNV_remap_index 312
+#define VertexAttribs2fvNV_remap_index 313
+#define VertexAttribs2svNV_remap_index 314
+#define VertexAttribs3dvNV_remap_index 315
+#define VertexAttribs3fvNV_remap_index 316
+#define VertexAttribs3svNV_remap_index 317
+#define VertexAttribs4dvNV_remap_index 318
+#define VertexAttribs4fvNV_remap_index 319
+#define VertexAttribs4svNV_remap_index 320
+#define VertexAttribs4ubvNV_remap_index 321
+#define GetTexBumpParameterfvATI_remap_index 322
+#define GetTexBumpParameterivATI_remap_index 323
+#define TexBumpParameterfvATI_remap_index 324
+#define TexBumpParameterivATI_remap_index 325
+#define AlphaFragmentOp1ATI_remap_index 326
+#define AlphaFragmentOp2ATI_remap_index 327
+#define AlphaFragmentOp3ATI_remap_index 328
+#define BeginFragmentShaderATI_remap_index 329
+#define BindFragmentShaderATI_remap_index 330
+#define ColorFragmentOp1ATI_remap_index 331
+#define ColorFragmentOp2ATI_remap_index 332
+#define ColorFragmentOp3ATI_remap_index 333
+#define DeleteFragmentShaderATI_remap_index 334
+#define EndFragmentShaderATI_remap_index 335
+#define GenFragmentShadersATI_remap_index 336
+#define PassTexCoordATI_remap_index 337
+#define SampleMapATI_remap_index 338
+#define SetFragmentShaderConstantATI_remap_index 339
+#define PointParameteriNV_remap_index 340
+#define PointParameterivNV_remap_index 341
+#define ActiveStencilFaceEXT_remap_index 342
+#define BindVertexArrayAPPLE_remap_index 343
+#define DeleteVertexArraysAPPLE_remap_index 344
+#define GenVertexArraysAPPLE_remap_index 345
+#define IsVertexArrayAPPLE_remap_index 346
+#define GetProgramNamedParameterdvNV_remap_index 347
+#define GetProgramNamedParameterfvNV_remap_index 348
+#define ProgramNamedParameter4dNV_remap_index 349
+#define ProgramNamedParameter4dvNV_remap_index 350
+#define ProgramNamedParameter4fNV_remap_index 351
+#define ProgramNamedParameter4fvNV_remap_index 352
+#define DepthBoundsEXT_remap_index 353
+#define BlendEquationSeparateEXT_remap_index 354
+#define BindFramebufferEXT_remap_index 355
+#define BindRenderbufferEXT_remap_index 356
+#define CheckFramebufferStatusEXT_remap_index 357
+#define DeleteFramebuffersEXT_remap_index 358
+#define DeleteRenderbuffersEXT_remap_index 359
+#define FramebufferRenderbufferEXT_remap_index 360
+#define FramebufferTexture1DEXT_remap_index 361
+#define FramebufferTexture2DEXT_remap_index 362
+#define FramebufferTexture3DEXT_remap_index 363
+#define GenFramebuffersEXT_remap_index 364
+#define GenRenderbuffersEXT_remap_index 365
+#define GenerateMipmapEXT_remap_index 366
+#define GetFramebufferAttachmentParameterivEXT_remap_index 367
+#define GetRenderbufferParameterivEXT_remap_index 368
+#define IsFramebufferEXT_remap_index 369
+#define IsRenderbufferEXT_remap_index 370
+#define RenderbufferStorageEXT_remap_index 371
+#define BlitFramebufferEXT_remap_index 372
+#define BufferParameteriAPPLE_remap_index 373
+#define FlushMappedBufferRangeAPPLE_remap_index 374
+#define FramebufferTextureLayerEXT_remap_index 375
+#define ProvokingVertexEXT_remap_index 376
+#define GetTexParameterPointervAPPLE_remap_index 377
+#define TextureRangeAPPLE_remap_index 378
+#define StencilFuncSeparateATI_remap_index 379
+#define ProgramEnvParameters4fvEXT_remap_index 380
+#define ProgramLocalParameters4fvEXT_remap_index 381
+#define GetQueryObjecti64vEXT_remap_index 382
+#define GetQueryObjectui64vEXT_remap_index 383
 
 #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])
@@ -3276,6 +3304,27 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_CopyBufferSubData(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr)), driDispatchRemapTable[CopyBufferSubData_remap_index], parameters)
 #define GET_CopyBufferSubData(disp) GET_by_offset(disp, driDispatchRemapTable[CopyBufferSubData_remap_index])
 #define SET_CopyBufferSubData(disp, fn) SET_by_offset(disp, driDispatchRemapTable[CopyBufferSubData_remap_index], fn)
+#define CALL_ClientWaitSync(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsync, GLbitfield, GLuint64)), driDispatchRemapTable[ClientWaitSync_remap_index], parameters)
+#define GET_ClientWaitSync(disp) GET_by_offset(disp, driDispatchRemapTable[ClientWaitSync_remap_index])
+#define SET_ClientWaitSync(disp, fn) SET_by_offset(disp, driDispatchRemapTable[ClientWaitSync_remap_index], fn)
+#define CALL_DeleteSync(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsync)), driDispatchRemapTable[DeleteSync_remap_index], parameters)
+#define GET_DeleteSync(disp) GET_by_offset(disp, driDispatchRemapTable[DeleteSync_remap_index])
+#define SET_DeleteSync(disp, fn) SET_by_offset(disp, driDispatchRemapTable[DeleteSync_remap_index], fn)
+#define CALL_FenceSync(disp, parameters) CALL_by_offset(disp, (GLuint (GLAPIENTRYP)(GLenum, GLbitfield)), driDispatchRemapTable[FenceSync_remap_index], parameters)
+#define GET_FenceSync(disp) GET_by_offset(disp, driDispatchRemapTable[FenceSync_remap_index])
+#define SET_FenceSync(disp, fn) SET_by_offset(disp, driDispatchRemapTable[FenceSync_remap_index], fn)
+#define CALL_GetInteger64v(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLint64 *)), driDispatchRemapTable[GetInteger64v_remap_index], parameters)
+#define GET_GetInteger64v(disp) GET_by_offset(disp, driDispatchRemapTable[GetInteger64v_remap_index])
+#define SET_GetInteger64v(disp, fn) SET_by_offset(disp, driDispatchRemapTable[GetInteger64v_remap_index], fn)
+#define CALL_GetSynciv(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsync, GLenum, GLsizei, GLsizei *, GLint *)), driDispatchRemapTable[GetSynciv_remap_index], parameters)
+#define GET_GetSynciv(disp) GET_by_offset(disp, driDispatchRemapTable[GetSynciv_remap_index])
+#define SET_GetSynciv(disp, fn) SET_by_offset(disp, driDispatchRemapTable[GetSynciv_remap_index], fn)
+#define CALL_IsSync(disp, parameters) CALL_by_offset(disp, (GLboolean (GLAPIENTRYP)(GLsync)), driDispatchRemapTable[IsSync_remap_index], parameters)
+#define GET_IsSync(disp) GET_by_offset(disp, driDispatchRemapTable[IsSync_remap_index])
+#define SET_IsSync(disp, fn) SET_by_offset(disp, driDispatchRemapTable[IsSync_remap_index], fn)
+#define CALL_WaitSync(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLsync, GLbitfield, GLuint64)), driDispatchRemapTable[WaitSync_remap_index], parameters)
+#define GET_WaitSync(disp) GET_by_offset(disp, driDispatchRemapTable[WaitSync_remap_index])
+#define SET_WaitSync(disp, fn) SET_by_offset(disp, driDispatchRemapTable[WaitSync_remap_index], fn)
 #define CALL_PolygonOffsetEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLfloat, GLfloat)), driDispatchRemapTable[PolygonOffsetEXT_remap_index], parameters)
 #define GET_PolygonOffsetEXT(disp) GET_by_offset(disp, driDispatchRemapTable[PolygonOffsetEXT_remap_index])
 #define SET_PolygonOffsetEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[PolygonOffsetEXT_remap_index], fn)
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index 01fd6f7158..6d4ab09b07 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -599,225 +599,232 @@
 #define _gloffset_BindVertexArray 564
 #define _gloffset_GenVertexArrays 565
 #define _gloffset_CopyBufferSubData 566
-#define _gloffset_PolygonOffsetEXT 567
-#define _gloffset_GetPixelTexGenParameterfvSGIS 568
-#define _gloffset_GetPixelTexGenParameterivSGIS 569
-#define _gloffset_PixelTexGenParameterfSGIS 570
-#define _gloffset_PixelTexGenParameterfvSGIS 571
-#define _gloffset_PixelTexGenParameteriSGIS 572
-#define _gloffset_PixelTexGenParameterivSGIS 573
-#define _gloffset_SampleMaskSGIS 574
-#define _gloffset_SamplePatternSGIS 575
-#define _gloffset_ColorPointerEXT 576
-#define _gloffset_EdgeFlagPointerEXT 577
-#define _gloffset_IndexPointerEXT 578
-#define _gloffset_NormalPointerEXT 579
-#define _gloffset_TexCoordPointerEXT 580
-#define _gloffset_VertexPointerEXT 581
-#define _gloffset_PointParameterfEXT 582
-#define _gloffset_PointParameterfvEXT 583
-#define _gloffset_LockArraysEXT 584
-#define _gloffset_UnlockArraysEXT 585
-#define _gloffset_CullParameterdvEXT 586
-#define _gloffset_CullParameterfvEXT 587
-#define _gloffset_SecondaryColor3bEXT 588
-#define _gloffset_SecondaryColor3bvEXT 589
-#define _gloffset_SecondaryColor3dEXT 590
-#define _gloffset_SecondaryColor3dvEXT 591
-#define _gloffset_SecondaryColor3fEXT 592
-#define _gloffset_SecondaryColor3fvEXT 593
-#define _gloffset_SecondaryColor3iEXT 594
-#define _gloffset_SecondaryColor3ivEXT 595
-#define _gloffset_SecondaryColor3sEXT 596
-#define _gloffset_SecondaryColor3svEXT 597
-#define _gloffset_SecondaryColor3ubEXT 598
-#define _gloffset_SecondaryColor3ubvEXT 599
-#define _gloffset_SecondaryColor3uiEXT 600
-#define _gloffset_SecondaryColor3uivEXT 601
-#define _gloffset_SecondaryColor3usEXT 602
-#define _gloffset_SecondaryColor3usvEXT 603
-#define _gloffset_SecondaryColorPointerEXT 604
-#define _gloffset_MultiDrawArraysEXT 605
-#define _gloffset_MultiDrawElementsEXT 606
-#define _gloffset_FogCoordPointerEXT 607
-#define _gloffset_FogCoorddEXT 608
-#define _gloffset_FogCoorddvEXT 609
-#define _gloffset_FogCoordfEXT 610
-#define _gloffset_FogCoordfvEXT 611
-#define _gloffset_PixelTexGenSGIX 612
-#define _gloffset_BlendFuncSeparateEXT 613
-#define _gloffset_FlushVertexArrayRangeNV 614
-#define _gloffset_VertexArrayRangeNV 615
-#define _gloffset_CombinerInputNV 616
-#define _gloffset_CombinerOutputNV 617
-#define _gloffset_CombinerParameterfNV 618
-#define _gloffset_CombinerParameterfvNV 619
-#define _gloffset_CombinerParameteriNV 620
-#define _gloffset_CombinerParameterivNV 621
-#define _gloffset_FinalCombinerInputNV 622
-#define _gloffset_GetCombinerInputParameterfvNV 623
-#define _gloffset_GetCombinerInputParameterivNV 624
-#define _gloffset_GetCombinerOutputParameterfvNV 625
-#define _gloffset_GetCombinerOutputParameterivNV 626
-#define _gloffset_GetFinalCombinerInputParameterfvNV 627
-#define _gloffset_GetFinalCombinerInputParameterivNV 628
-#define _gloffset_ResizeBuffersMESA 629
-#define _gloffset_WindowPos2dMESA 630
-#define _gloffset_WindowPos2dvMESA 631
-#define _gloffset_WindowPos2fMESA 632
-#define _gloffset_WindowPos2fvMESA 633
-#define _gloffset_WindowPos2iMESA 634
-#define _gloffset_WindowPos2ivMESA 635
-#define _gloffset_WindowPos2sMESA 636
-#define _gloffset_WindowPos2svMESA 637
-#define _gloffset_WindowPos3dMESA 638
-#define _gloffset_WindowPos3dvMESA 639
-#define _gloffset_WindowPos3fMESA 640
-#define _gloffset_WindowPos3fvMESA 641
-#define _gloffset_WindowPos3iMESA 642
-#define _gloffset_WindowPos3ivMESA 643
-#define _gloffset_WindowPos3sMESA 644
-#define _gloffset_WindowPos3svMESA 645
-#define _gloffset_WindowPos4dMESA 646
-#define _gloffset_WindowPos4dvMESA 647
-#define _gloffset_WindowPos4fMESA 648
-#define _gloffset_WindowPos4fvMESA 649
-#define _gloffset_WindowPos4iMESA 650
-#define _gloffset_WindowPos4ivMESA 651
-#define _gloffset_WindowPos4sMESA 652
-#define _gloffset_WindowPos4svMESA 653
-#define _gloffset_MultiModeDrawArraysIBM 654
-#define _gloffset_MultiModeDrawElementsIBM 655
-#define _gloffset_DeleteFencesNV 656
-#define _gloffset_FinishFenceNV 657
-#define _gloffset_GenFencesNV 658
-#define _gloffset_GetFenceivNV 659
-#define _gloffset_IsFenceNV 660
-#define _gloffset_SetFenceNV 661
-#define _gloffset_TestFenceNV 662
-#define _gloffset_AreProgramsResidentNV 663
-#define _gloffset_BindProgramNV 664
-#define _gloffset_DeleteProgramsNV 665
-#define _gloffset_ExecuteProgramNV 666
-#define _gloffset_GenProgramsNV 667
-#define _gloffset_GetProgramParameterdvNV 668
-#define _gloffset_GetProgramParameterfvNV 669
-#define _gloffset_GetProgramStringNV 670
-#define _gloffset_GetProgramivNV 671
-#define _gloffset_GetTrackMatrixivNV 672
-#define _gloffset_GetVertexAttribPointervNV 673
-#define _gloffset_GetVertexAttribdvNV 674
-#define _gloffset_GetVertexAttribfvNV 675
-#define _gloffset_GetVertexAttribivNV 676
-#define _gloffset_IsProgramNV 677
-#define _gloffset_LoadProgramNV 678
-#define _gloffset_ProgramParameters4dvNV 679
-#define _gloffset_ProgramParameters4fvNV 680
-#define _gloffset_RequestResidentProgramsNV 681
-#define _gloffset_TrackMatrixNV 682
-#define _gloffset_VertexAttrib1dNV 683
-#define _gloffset_VertexAttrib1dvNV 684
-#define _gloffset_VertexAttrib1fNV 685
-#define _gloffset_VertexAttrib1fvNV 686
-#define _gloffset_VertexAttrib1sNV 687
-#define _gloffset_VertexAttrib1svNV 688
-#define _gloffset_VertexAttrib2dNV 689
-#define _gloffset_VertexAttrib2dvNV 690
-#define _gloffset_VertexAttrib2fNV 691
-#define _gloffset_VertexAttrib2fvNV 692
-#define _gloffset_VertexAttrib2sNV 693
-#define _gloffset_VertexAttrib2svNV 694
-#define _gloffset_VertexAttrib3dNV 695
-#define _gloffset_VertexAttrib3dvNV 696
-#define _gloffset_VertexAttrib3fNV 697
-#define _gloffset_VertexAttrib3fvNV 698
-#define _gloffset_VertexAttrib3sNV 699
-#define _gloffset_VertexAttrib3svNV 700
-#define _gloffset_VertexAttrib4dNV 701
-#define _gloffset_VertexAttrib4dvNV 702
-#define _gloffset_VertexAttrib4fNV 703
-#define _gloffset_VertexAttrib4fvNV 704
-#define _gloffset_VertexAttrib4sNV 705
-#define _gloffset_VertexAttrib4svNV 706
-#define _gloffset_VertexAttrib4ubNV 707
-#define _gloffset_VertexAttrib4ubvNV 708
-#define _gloffset_VertexAttribPointerNV 709
-#define _gloffset_VertexAttribs1dvNV 710
-#define _gloffset_VertexAttribs1fvNV 711
-#define _gloffset_VertexAttribs1svNV 712
-#define _gloffset_VertexAttribs2dvNV 713
-#define _gloffset_VertexAttribs2fvNV 714
-#define _gloffset_VertexAttribs2svNV 715
-#define _gloffset_VertexAttribs3dvNV 716
-#define _gloffset_VertexAttribs3fvNV 717
-#define _gloffset_VertexAttribs3svNV 718
-#define _gloffset_VertexAttribs4dvNV 719
-#define _gloffset_VertexAttribs4fvNV 720
-#define _gloffset_VertexAttribs4svNV 721
-#define _gloffset_VertexAttribs4ubvNV 722
-#define _gloffset_GetTexBumpParameterfvATI 723
-#define _gloffset_GetTexBumpParameterivATI 724
-#define _gloffset_TexBumpParameterfvATI 725
-#define _gloffset_TexBumpParameterivATI 726
-#define _gloffset_AlphaFragmentOp1ATI 727
-#define _gloffset_AlphaFragmentOp2ATI 728
-#define _gloffset_AlphaFragmentOp3ATI 729
-#define _gloffset_BeginFragmentShaderATI 730
-#define _gloffset_BindFragmentShaderATI 731
-#define _gloffset_ColorFragmentOp1ATI 732
-#define _gloffset_ColorFragmentOp2ATI 733
-#define _gloffset_ColorFragmentOp3ATI 734
-#define _gloffset_DeleteFragmentShaderATI 735
-#define _gloffset_EndFragmentShaderATI 736
-#define _gloffset_GenFragmentShadersATI 737
-#define _gloffset_PassTexCoordATI 738
-#define _gloffset_SampleMapATI 739
-#define _gloffset_SetFragmentShaderConstantATI 740
-#define _gloffset_PointParameteriNV 741
-#define _gloffset_PointParameterivNV 742
-#define _gloffset_ActiveStencilFaceEXT 743
-#define _gloffset_BindVertexArrayAPPLE 744
-#define _gloffset_DeleteVertexArraysAPPLE 745
-#define _gloffset_GenVertexArraysAPPLE 746
-#define _gloffset_IsVertexArrayAPPLE 747
-#define _gloffset_GetProgramNamedParameterdvNV 748
-#define _gloffset_GetProgramNamedParameterfvNV 749
-#define _gloffset_ProgramNamedParameter4dNV 750
-#define _gloffset_ProgramNamedParameter4dvNV 751
-#define _gloffset_ProgramNamedParameter4fNV 752
-#define _gloffset_ProgramNamedParameter4fvNV 753
-#define _gloffset_DepthBoundsEXT 754
-#define _gloffset_BlendEquationSeparateEXT 755
-#define _gloffset_BindFramebufferEXT 756
-#define _gloffset_BindRenderbufferEXT 757
-#define _gloffset_CheckFramebufferStatusEXT 758
-#define _gloffset_DeleteFramebuffersEXT 759
-#define _gloffset_DeleteRenderbuffersEXT 760
-#define _gloffset_FramebufferRenderbufferEXT 761
-#define _gloffset_FramebufferTexture1DEXT 762
-#define _gloffset_FramebufferTexture2DEXT 763
-#define _gloffset_FramebufferTexture3DEXT 764
-#define _gloffset_GenFramebuffersEXT 765
-#define _gloffset_GenRenderbuffersEXT 766
-#define _gloffset_GenerateMipmapEXT 767
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 768
-#define _gloffset_GetRenderbufferParameterivEXT 769
-#define _gloffset_IsFramebufferEXT 770
-#define _gloffset_IsRenderbufferEXT 771
-#define _gloffset_RenderbufferStorageEXT 772
-#define _gloffset_BlitFramebufferEXT 773
-#define _gloffset_BufferParameteriAPPLE 774
-#define _gloffset_FlushMappedBufferRangeAPPLE 775
-#define _gloffset_FramebufferTextureLayerEXT 776
-#define _gloffset_ProvokingVertexEXT 777
-#define _gloffset_GetTexParameterPointervAPPLE 778
-#define _gloffset_TextureRangeAPPLE 779
-#define _gloffset_StencilFuncSeparateATI 780
-#define _gloffset_ProgramEnvParameters4fvEXT 781
-#define _gloffset_ProgramLocalParameters4fvEXT 782
-#define _gloffset_GetQueryObjecti64vEXT 783
-#define _gloffset_GetQueryObjectui64vEXT 784
-#define _gloffset_FIRST_DYNAMIC 785
+#define _gloffset_ClientWaitSync 567
+#define _gloffset_DeleteSync 568
+#define _gloffset_FenceSync 569
+#define _gloffset_GetInteger64v 570
+#define _gloffset_GetSynciv 571
+#define _gloffset_IsSync 572
+#define _gloffset_WaitSync 573
+#define _gloffset_PolygonOffsetEXT 574
+#define _gloffset_GetPixelTexGenParameterfvSGIS 575
+#define _gloffset_GetPixelTexGenParameterivSGIS 576
+#define _gloffset_PixelTexGenParameterfSGIS 577
+#define _gloffset_PixelTexGenParameterfvSGIS 578
+#define _gloffset_PixelTexGenParameteriSGIS 579
+#define _gloffset_PixelTexGenParameterivSGIS 580
+#define _gloffset_SampleMaskSGIS 581
+#define _gloffset_SamplePatternSGIS 582
+#define _gloffset_ColorPointerEXT 583
+#define _gloffset_EdgeFlagPointerEXT 584
+#define _gloffset_IndexPointerEXT 585
+#define _gloffset_NormalPointerEXT 586
+#define _gloffset_TexCoordPointerEXT 587
+#define _gloffset_VertexPointerEXT 588
+#define _gloffset_PointParameterfEXT 589
+#define _gloffset_PointParameterfvEXT 590
+#define _gloffset_LockArraysEXT 591
+#define _gloffset_UnlockArraysEXT 592
+#define _gloffset_CullParameterdvEXT 593
+#define _gloffset_CullParameterfvEXT 594
+#define _gloffset_SecondaryColor3bEXT 595
+#define _gloffset_SecondaryColor3bvEXT 596
+#define _gloffset_SecondaryColor3dEXT 597
+#define _gloffset_SecondaryColor3dvEXT 598
+#define _gloffset_SecondaryColor3fEXT 599
+#define _gloffset_SecondaryColor3fvEXT 600
+#define _gloffset_SecondaryColor3iEXT 601
+#define _gloffset_SecondaryColor3ivEXT 602
+#define _gloffset_SecondaryColor3sEXT 603
+#define _gloffset_SecondaryColor3svEXT 604
+#define _gloffset_SecondaryColor3ubEXT 605
+#define _gloffset_SecondaryColor3ubvEXT 606
+#define _gloffset_SecondaryColor3uiEXT 607
+#define _gloffset_SecondaryColor3uivEXT 608
+#define _gloffset_SecondaryColor3usEXT 609
+#define _gloffset_SecondaryColor3usvEXT 610
+#define _gloffset_SecondaryColorPointerEXT 611
+#define _gloffset_MultiDrawArraysEXT 612
+#define _gloffset_MultiDrawElementsEXT 613
+#define _gloffset_FogCoordPointerEXT 614
+#define _gloffset_FogCoorddEXT 615
+#define _gloffset_FogCoorddvEXT 616
+#define _gloffset_FogCoordfEXT 617
+#define _gloffset_FogCoordfvEXT 618
+#define _gloffset_PixelTexGenSGIX 619
+#define _gloffset_BlendFuncSeparateEXT 620
+#define _gloffset_FlushVertexArrayRangeNV 621
+#define _gloffset_VertexArrayRangeNV 622
+#define _gloffset_CombinerInputNV 623
+#define _gloffset_CombinerOutputNV 624
+#define _gloffset_CombinerParameterfNV 625
+#define _gloffset_CombinerParameterfvNV 626
+#define _gloffset_CombinerParameteriNV 627
+#define _gloffset_CombinerParameterivNV 628
+#define _gloffset_FinalCombinerInputNV 629
+#define _gloffset_GetCombinerInputParameterfvNV 630
+#define _gloffset_GetCombinerInputParameterivNV 631
+#define _gloffset_GetCombinerOutputParameterfvNV 632
+#define _gloffset_GetCombinerOutputParameterivNV 633
+#define _gloffset_GetFinalCombinerInputParameterfvNV 634
+#define _gloffset_GetFinalCombinerInputParameterivNV 635
+#define _gloffset_ResizeBuffersMESA 636
+#define _gloffset_WindowPos2dMESA 637
+#define _gloffset_WindowPos2dvMESA 638
+#define _gloffset_WindowPos2fMESA 639
+#define _gloffset_WindowPos2fvMESA 640
+#define _gloffset_WindowPos2iMESA 641
+#define _gloffset_WindowPos2ivMESA 642
+#define _gloffset_WindowPos2sMESA 643
+#define _gloffset_WindowPos2svMESA 644
+#define _gloffset_WindowPos3dMESA 645
+#define _gloffset_WindowPos3dvMESA 646
+#define _gloffset_WindowPos3fMESA 647
+#define _gloffset_WindowPos3fvMESA 648
+#define _gloffset_WindowPos3iMESA 649
+#define _gloffset_WindowPos3ivMESA 650
+#define _gloffset_WindowPos3sMESA 651
+#define _gloffset_WindowPos3svMESA 652
+#define _gloffset_WindowPos4dMESA 653
+#define _gloffset_WindowPos4dvMESA 654
+#define _gloffset_WindowPos4fMESA 655
+#define _gloffset_WindowPos4fvMESA 656
+#define _gloffset_WindowPos4iMESA 657
+#define _gloffset_WindowPos4ivMESA 658
+#define _gloffset_WindowPos4sMESA 659
+#define _gloffset_WindowPos4svMESA 660
+#define _gloffset_MultiModeDrawArraysIBM 661
+#define _gloffset_MultiModeDrawElementsIBM 662
+#define _gloffset_DeleteFencesNV 663
+#define _gloffset_FinishFenceNV 664
+#define _gloffset_GenFencesNV 665
+#define _gloffset_GetFenceivNV 666
+#define _gloffset_IsFenceNV 667
+#define _gloffset_SetFenceNV 668
+#define _gloffset_TestFenceNV 669
+#define _gloffset_AreProgramsResidentNV 670
+#define _gloffset_BindProgramNV 671
+#define _gloffset_DeleteProgramsNV 672
+#define _gloffset_ExecuteProgramNV 673
+#define _gloffset_GenProgramsNV 674
+#define _gloffset_GetProgramParameterdvNV 675
+#define _gloffset_GetProgramParameterfvNV 676
+#define _gloffset_GetProgramStringNV 677
+#define _gloffset_GetProgramivNV 678
+#define _gloffset_GetTrackMatrixivNV 679
+#define _gloffset_GetVertexAttribPointervNV 680
+#define _gloffset_GetVertexAttribdvNV 681
+#define _gloffset_GetVertexAttribfvNV 682
+#define _gloffset_GetVertexAttribivNV 683
+#define _gloffset_IsProgramNV 684
+#define _gloffset_LoadProgramNV 685
+#define _gloffset_ProgramParameters4dvNV 686
+#define _gloffset_ProgramParameters4fvNV 687
+#define _gloffset_RequestResidentProgramsNV 688
+#define _gloffset_TrackMatrixNV 689
+#define _gloffset_VertexAttrib1dNV 690
+#define _gloffset_VertexAttrib1dvNV 691
+#define _gloffset_VertexAttrib1fNV 692
+#define _gloffset_VertexAttrib1fvNV 693
+#define _gloffset_VertexAttrib1sNV 694
+#define _gloffset_VertexAttrib1svNV 695
+#define _gloffset_VertexAttrib2dNV 696
+#define _gloffset_VertexAttrib2dvNV 697
+#define _gloffset_VertexAttrib2fNV 698
+#define _gloffset_VertexAttrib2fvNV 699
+#define _gloffset_VertexAttrib2sNV 700
+#define _gloffset_VertexAttrib2svNV 701
+#define _gloffset_VertexAttrib3dNV 702
+#define _gloffset_VertexAttrib3dvNV 703
+#define _gloffset_VertexAttrib3fNV 704
+#define _gloffset_VertexAttrib3fvNV 705
+#define _gloffset_VertexAttrib3sNV 706
+#define _gloffset_VertexAttrib3svNV 707
+#define _gloffset_VertexAttrib4dNV 708
+#define _gloffset_VertexAttrib4dvNV 709
+#define _gloffset_VertexAttrib4fNV 710
+#define _gloffset_VertexAttrib4fvNV 711
+#define _gloffset_VertexAttrib4sNV 712
+#define _gloffset_VertexAttrib4svNV 713
+#define _gloffset_VertexAttrib4ubNV 714
+#define _gloffset_VertexAttrib4ubvNV 715
+#define _gloffset_VertexAttribPointerNV 716
+#define _gloffset_VertexAttribs1dvNV 717
+#define _gloffset_VertexAttribs1fvNV 718
+#define _gloffset_VertexAttribs1svNV 719
+#define _gloffset_VertexAttribs2dvNV 720
+#define _gloffset_VertexAttribs2fvNV 721
+#define _gloffset_VertexAttribs2svNV 722
+#define _gloffset_VertexAttribs3dvNV 723
+#define _gloffset_VertexAttribs3fvNV 724
+#define _gloffset_VertexAttribs3svNV 725
+#define _gloffset_VertexAttribs4dvNV 726
+#define _gloffset_VertexAttribs4fvNV 727
+#define _gloffset_VertexAttribs4svNV 728
+#define _gloffset_VertexAttribs4ubvNV 729
+#define _gloffset_GetTexBumpParameterfvATI 730
+#define _gloffset_GetTexBumpParameterivATI 731
+#define _gloffset_TexBumpParameterfvATI 732
+#define _gloffset_TexBumpParameterivATI 733
+#define _gloffset_AlphaFragmentOp1ATI 734
+#define _gloffset_AlphaFragmentOp2ATI 735
+#define _gloffset_AlphaFragmentOp3ATI 736
+#define _gloffset_BeginFragmentShaderATI 737
+#define _gloffset_BindFragmentShaderATI 738
+#define _gloffset_ColorFragmentOp1ATI 739
+#define _gloffset_ColorFragmentOp2ATI 740
+#define _gloffset_ColorFragmentOp3ATI 741
+#define _gloffset_DeleteFragmentShaderATI 742
+#define _gloffset_EndFragmentShaderATI 743
+#define _gloffset_GenFragmentShadersATI 744
+#define _gloffset_PassTexCoordATI 745
+#define _gloffset_SampleMapATI 746
+#define _gloffset_SetFragmentShaderConstantATI 747
+#define _gloffset_PointParameteriNV 748
+#define _gloffset_PointParameterivNV 749
+#define _gloffset_ActiveStencilFaceEXT 750
+#define _gloffset_BindVertexArrayAPPLE 751
+#define _gloffset_DeleteVertexArraysAPPLE 752
+#define _gloffset_GenVertexArraysAPPLE 753
+#define _gloffset_IsVertexArrayAPPLE 754
+#define _gloffset_GetProgramNamedParameterdvNV 755
+#define _gloffset_GetProgramNamedParameterfvNV 756
+#define _gloffset_ProgramNamedParameter4dNV 757
+#define _gloffset_ProgramNamedParameter4dvNV 758
+#define _gloffset_ProgramNamedParameter4fNV 759
+#define _gloffset_ProgramNamedParameter4fvNV 760
+#define _gloffset_DepthBoundsEXT 761
+#define _gloffset_BlendEquationSeparateEXT 762
+#define _gloffset_BindFramebufferEXT 763
+#define _gloffset_BindRenderbufferEXT 764
+#define _gloffset_CheckFramebufferStatusEXT 765
+#define _gloffset_DeleteFramebuffersEXT 766
+#define _gloffset_DeleteRenderbuffersEXT 767
+#define _gloffset_FramebufferRenderbufferEXT 768
+#define _gloffset_FramebufferTexture1DEXT 769
+#define _gloffset_FramebufferTexture2DEXT 770
+#define _gloffset_FramebufferTexture3DEXT 771
+#define _gloffset_GenFramebuffersEXT 772
+#define _gloffset_GenRenderbuffersEXT 773
+#define _gloffset_GenerateMipmapEXT 774
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 775
+#define _gloffset_GetRenderbufferParameterivEXT 776
+#define _gloffset_IsFramebufferEXT 777
+#define _gloffset_IsRenderbufferEXT 778
+#define _gloffset_RenderbufferStorageEXT 779
+#define _gloffset_BlitFramebufferEXT 780
+#define _gloffset_BufferParameteriAPPLE 781
+#define _gloffset_FlushMappedBufferRangeAPPLE 782
+#define _gloffset_FramebufferTextureLayerEXT 783
+#define _gloffset_ProvokingVertexEXT 784
+#define _gloffset_GetTexParameterPointervAPPLE 785
+#define _gloffset_TextureRangeAPPLE 786
+#define _gloffset_StencilFuncSeparateATI 787
+#define _gloffset_ProgramEnvParameters4fvEXT 788
+#define _gloffset_ProgramLocalParameters4fvEXT 789
+#define _gloffset_GetQueryObjecti64vEXT 790
+#define _gloffset_GetQueryObjectui64vEXT 791
+#define _gloffset_FIRST_DYNAMIC 792
 
 #else
 
@@ -980,6 +987,13 @@
 #define _gloffset_BindVertexArray driDispatchRemapTable[BindVertexArray_remap_index]
 #define _gloffset_GenVertexArrays driDispatchRemapTable[GenVertexArrays_remap_index]
 #define _gloffset_CopyBufferSubData driDispatchRemapTable[CopyBufferSubData_remap_index]
+#define _gloffset_ClientWaitSync driDispatchRemapTable[ClientWaitSync_remap_index]
+#define _gloffset_DeleteSync driDispatchRemapTable[DeleteSync_remap_index]
+#define _gloffset_FenceSync driDispatchRemapTable[FenceSync_remap_index]
+#define _gloffset_GetInteger64v driDispatchRemapTable[GetInteger64v_remap_index]
+#define _gloffset_GetSynciv driDispatchRemapTable[GetSynciv_remap_index]
+#define _gloffset_IsSync driDispatchRemapTable[IsSync_remap_index]
+#define _gloffset_WaitSync driDispatchRemapTable[WaitSync_remap_index]
 #define _gloffset_PolygonOffsetEXT driDispatchRemapTable[PolygonOffsetEXT_remap_index]
 #define _gloffset_GetPixelTexGenParameterfvSGIS driDispatchRemapTable[GetPixelTexGenParameterfvSGIS_remap_index]
 #define _gloffset_GetPixelTexGenParameterivSGIS driDispatchRemapTable[GetPixelTexGenParameterivSGIS_remap_index]
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index c23e9a63cf..2c661a0ae5 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -607,224 +607,231 @@ struct _glapi_table
    void (GLAPIENTRYP BindVertexArray)(GLuint array); /* 564 */
    void (GLAPIENTRYP GenVertexArrays)(GLsizei n, GLuint * arrays); /* 565 */
    void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 566 */
-   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 567 */
-   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 568 */
-   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 569 */
-   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 570 */
-   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 571 */
-   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 572 */
-   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 573 */
-   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 574 */
-   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 575 */
-   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 576 */
-   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 577 */
-   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 578 */
-   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 579 */
-   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 580 */
-   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 581 */
-   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 582 */
-   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 583 */
-   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 584 */
-   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 585 */
-   void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 586 */
-   void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 587 */
-   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 588 */
-   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 589 */
-   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 590 */
-   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 591 */
-   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 592 */
-   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 593 */
-   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 594 */
-   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 595 */
-   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 596 */
-   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 597 */
-   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 598 */
-   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 599 */
-   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 600 */
-   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 601 */
-   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 602 */
-   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 603 */
-   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 604 */
-   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 605 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 606 */
-   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 607 */
-   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 608 */
-   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 609 */
-   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 610 */
-   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 611 */
-   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 612 */
-   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 613 */
-   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 614 */
-   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 615 */
-   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 616 */
-   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 617 */
-   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 618 */
-   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 619 */
-   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 620 */
-   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 621 */
-   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 622 */
-   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 623 */
-   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 624 */
-   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 625 */
-   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 626 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 627 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 628 */
-   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 629 */
-   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 630 */
-   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 631 */
-   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 632 */
-   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 633 */
-   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 634 */
-   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 635 */
-   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 636 */
-   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 637 */
-   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 638 */
-   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 639 */
-   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 640 */
-   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 641 */
-   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 642 */
-   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 643 */
-   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 644 */
-   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 645 */
-   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 646 */
-   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 647 */
-   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 648 */
-   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 649 */
-   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 650 */
-   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 651 */
-   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 652 */
-   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 653 */
-   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 654 */
-   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 655 */
-   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 656 */
-   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 657 */
-   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 658 */
-   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 659 */
-   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 660 */
-   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 661 */
-   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 662 */
-   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 663 */
-   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 664 */
-   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 665 */
-   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 666 */
-   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 667 */
-   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 668 */
-   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 669 */
-   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 670 */
-   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 671 */
-   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 672 */
-   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 673 */
-   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 674 */
-   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 675 */
-   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 676 */
-   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 677 */
-   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 678 */
-   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 679 */
-   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 680 */
-   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 681 */
-   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 682 */
-   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 683 */
-   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 684 */
-   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 685 */
-   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 686 */
-   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 687 */
-   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 688 */
-   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 689 */
-   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 690 */
-   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 691 */
-   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 692 */
-   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 693 */
-   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 694 */
-   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 695 */
-   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 696 */
-   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 697 */
-   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 698 */
-   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 699 */
-   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 700 */
-   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 701 */
-   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 702 */
-   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 703 */
-   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 704 */
-   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 705 */
-   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 706 */
-   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 707 */
-   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 708 */
-   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 709 */
-   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 710 */
-   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 711 */
-   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 712 */
-   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 713 */
-   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 714 */
-   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 715 */
-   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 716 */
-   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 717 */
-   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 718 */
-   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 719 */
-   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 720 */
-   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 721 */
-   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 722 */
-   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 723 */
-   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 724 */
-   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 725 */
-   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 726 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 727 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 728 */
-   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 729 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 730 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 731 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 732 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 733 */
-   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 734 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 735 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 736 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 737 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 738 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 739 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 740 */
-   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 741 */
-   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 742 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 743 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 744 */
-   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 745 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 746 */
-   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 747 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 748 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 749 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 750 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 751 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 752 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 753 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 754 */
-   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 755 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 756 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 757 */
-   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 758 */
-   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 759 */
-   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 760 */
-   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 761 */
-   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 762 */
-   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 763 */
-   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 764 */
-   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 765 */
-   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 766 */
-   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 767 */
-   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 768 */
-   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 769 */
-   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 770 */
-   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 771 */
-   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 772 */
-   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 773 */
-   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 774 */
-   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 775 */
-   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 776 */
-   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 777 */
-   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 778 */
-   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 779 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 780 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 781 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 782 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 783 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 784 */
+   void (GLAPIENTRYP ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 567 */
+   void (GLAPIENTRYP DeleteSync)(GLsync sync); /* 568 */
+   GLuint (GLAPIENTRYP FenceSync)(GLenum condition, GLbitfield flags); /* 569 */
+   void (GLAPIENTRYP GetInteger64v)(GLenum pname, GLint64 * params); /* 570 */
+   void (GLAPIENTRYP GetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 571 */
+   GLboolean (GLAPIENTRYP IsSync)(GLsync sync); /* 572 */
+   void (GLAPIENTRYP WaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 573 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 574 */
+   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 575 */
+   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 576 */
+   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 577 */
+   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 578 */
+   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 579 */
+   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 580 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 581 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 582 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 583 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 584 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 585 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 586 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 587 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 588 */
+   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 589 */
+   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 590 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 591 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 592 */
+   void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 593 */
+   void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 594 */
+   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 595 */
+   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 596 */
+   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 597 */
+   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 598 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 599 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 600 */
+   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 601 */
+   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 602 */
+   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 603 */
+   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 604 */
+   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 605 */
+   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 606 */
+   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 607 */
+   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 608 */
+   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 609 */
+   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 610 */
+   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 611 */
+   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 612 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 613 */
+   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 614 */
+   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 615 */
+   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 616 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 617 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 618 */
+   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 619 */
+   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 620 */
+   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 621 */
+   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 622 */
+   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 623 */
+   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 624 */
+   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 625 */
+   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 626 */
+   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 627 */
+   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 628 */
+   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 629 */
+   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 630 */
+   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 631 */
+   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 632 */
+   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 633 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 634 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 635 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 636 */
+   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 637 */
+   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 638 */
+   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 639 */
+   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 640 */
+   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 641 */
+   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 642 */
+   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 643 */
+   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 644 */
+   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 645 */
+   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 646 */
+   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 647 */
+   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 648 */
+   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 649 */
+   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 650 */
+   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 651 */
+   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 652 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 653 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 654 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 655 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 656 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 657 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 658 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 659 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 660 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 661 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 662 */
+   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 663 */
+   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 664 */
+   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 665 */
+   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 666 */
+   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 667 */
+   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 668 */
+   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 669 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 670 */
+   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 671 */
+   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 672 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 673 */
+   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 674 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 675 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 676 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 677 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 678 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 679 */
+   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 680 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 681 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 682 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 683 */
+   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 684 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 685 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 686 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 687 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 688 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 689 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 690 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 691 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 692 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 693 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 694 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 695 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 696 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 697 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 698 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 699 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 700 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 701 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 702 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 703 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 704 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 705 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 706 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 707 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 708 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 709 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 710 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 711 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 712 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 713 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 714 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 715 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 716 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 717 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 718 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 719 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 720 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 721 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 722 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 723 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 724 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 725 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 726 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 727 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 728 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 729 */
+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 730 */
+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 731 */
+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 732 */
+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 733 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 734 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 735 */
+   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 736 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 737 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 738 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 739 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 740 */
+   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 741 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 742 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 743 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 744 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 745 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 746 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 747 */
+   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 748 */
+   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 749 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 750 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 751 */
+   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 752 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 753 */
+   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 754 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 755 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 756 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 757 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 758 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 759 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 760 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 761 */
+   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 762 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 763 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 764 */
+   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 765 */
+   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 766 */
+   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 767 */
+   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 768 */
+   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 769 */
+   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 770 */
+   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 771 */
+   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 772 */
+   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 773 */
+   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 774 */
+   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 775 */
+   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 776 */
+   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 777 */
+   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 778 */
+   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 779 */
+   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 780 */
+   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 781 */
+   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 782 */
+   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 783 */
+   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 784 */
+   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 785 */
+   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 786 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 787 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 788 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 789 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 790 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 791 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 68e7a9a4f0..7b211918c1 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -4036,63 +4036,98 @@ KEYWORD1 void KEYWORD2 NAME(CopyBufferSubData)(GLenum readTarget, GLenum writeTa
    DISPATCH(CopyBufferSubData, (readTarget, writeTarget, readOffset, writeOffset, size), (F, "glCopyBufferSubData(0x%x, 0x%x, %d, %d, %d);\n", readTarget, writeTarget, readOffset, writeOffset, size));
 }
 
+KEYWORD1 void KEYWORD2 NAME(ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout)
+{
+   DISPATCH(ClientWaitSync, (sync, flags, timeout), (F, "glClientWaitSync(%d, %d, %d);\n", sync, flags, timeout));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DeleteSync)(GLsync sync)
+{
+   DISPATCH(DeleteSync, (sync), (F, "glDeleteSync(%d);\n", sync));
+}
+
+KEYWORD1 GLuint KEYWORD2 NAME(FenceSync)(GLenum condition, GLbitfield flags)
+{
+   RETURN_DISPATCH(FenceSync, (condition, flags), (F, "glFenceSync(0x%x, %d);\n", condition, flags));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetInteger64v)(GLenum pname, GLint64 * params)
+{
+   DISPATCH(GetInteger64v, (pname, params), (F, "glGetInteger64v(0x%x, %p);\n", pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values)
+{
+   DISPATCH(GetSynciv, (sync, pname, bufSize, length, values), (F, "glGetSynciv(%d, 0x%x, %d, %p, %p);\n", sync, pname, bufSize, (const void *) length, (const void *) values));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsSync)(GLsync sync)
+{
+   RETURN_DISPATCH(IsSync, (sync), (F, "glIsSync(%d);\n", sync));
+}
+
+KEYWORD1 void KEYWORD2 NAME(WaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout)
+{
+   DISPATCH(WaitSync, (sync, flags, timeout), (F, "glWaitSync(%d, %d, %d);\n", sync, flags, timeout));
+}
+
 KEYWORD1 void KEYWORD2 NAME(PolygonOffsetEXT)(GLfloat factor, GLfloat bias)
 {
    DISPATCH(PolygonOffsetEXT, (factor, bias), (F, "glPolygonOffsetEXT(%f, %f);\n", factor, bias));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_575)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_568)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_575)(GLenum pname, GLfloat * params)
 {
    DISPATCH(GetPixelTexGenParameterfvSGIS, (pname, params), (F, "glGetPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_576)(GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_569)(GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_576)(GLenum pname, GLint * params)
 {
    DISPATCH(GetPixelTexGenParameterivSGIS, (pname, params), (F, "glGetPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_577)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_570)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_577)(GLenum pname, GLfloat param)
 {
    DISPATCH(PixelTexGenParameterfSGIS, (pname, param), (F, "glPixelTexGenParameterfSGIS(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_578)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_571)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_578)(GLenum pname, const GLfloat * params)
 {
    DISPATCH(PixelTexGenParameterfvSGIS, (pname, params), (F, "glPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_572)(GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_579)(GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_572)(GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_579)(GLenum pname, GLint param)
 {
    DISPATCH(PixelTexGenParameteriSGIS, (pname, param), (F, "glPixelTexGenParameteriSGIS(0x%x, %d);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_573)(GLenum pname, const GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_580)(GLenum pname, const GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_573)(GLenum pname, const GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_580)(GLenum pname, const GLint * params)
 {
    DISPATCH(PixelTexGenParameterivSGIS, (pname, params), (F, "glPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_574)(GLclampf value, GLboolean invert);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLclampf value, GLboolean invert);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_574)(GLclampf value, GLboolean invert)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_581)(GLclampf value, GLboolean invert)
 {
    DISPATCH(SampleMaskSGIS, (value, invert), (F, "glSampleMaskSGIS(%f, %d);\n", value, invert));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_575)(GLenum pattern);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pattern);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_575)(GLenum pattern)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pattern)
 {
    DISPATCH(SamplePatternSGIS, (pattern), (F, "glSamplePatternSGIS(0x%x);\n", pattern));
 }
@@ -4142,9 +4177,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfEXT)(GLenum pname, GLfloat param)
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfEXT(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_589)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_582)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_589)(GLenum pname, GLfloat param)
 {
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfSGIS(0x%x, %f);\n", pname, param));
 }
@@ -4164,9 +4199,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfvEXT)(GLenum pname, const GLfloat * p
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_583)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_590)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_583)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_590)(GLenum pname, const GLfloat * params)
 {
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
@@ -4181,16 +4216,16 @@ KEYWORD1 void KEYWORD2 NAME(UnlockArraysEXT)(void)
    DISPATCH(UnlockArraysEXT, (), (F, "glUnlockArraysEXT();\n"));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_586)(GLenum pname, GLdouble * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_593)(GLenum pname, GLdouble * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_586)(GLenum pname, GLdouble * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_593)(GLenum pname, GLdouble * params)
 {
    DISPATCH(CullParameterdvEXT, (pname, params), (F, "glCullParameterdvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_587)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_594)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_587)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_594)(GLenum pname, GLfloat * params)
 {
    DISPATCH(CullParameterfvEXT, (pname, params), (F, "glCullParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
@@ -4435,9 +4470,9 @@ KEYWORD1 void KEYWORD2 NAME(FogCoordfvEXT)(const GLfloat * coord)
    DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfvEXT(%p);\n", (const void *) coord));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_612)(GLenum mode);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_619)(GLenum mode);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_612)(GLenum mode)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_619)(GLenum mode)
 {
    DISPATCH(PixelTexGenSGIX, (mode), (F, "glPixelTexGenSGIX(0x%x);\n", mode));
 }
@@ -4452,9 +4487,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfac
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateEXT(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_613)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_620)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_613)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_620)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateINGR(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
@@ -4819,65 +4854,65 @@ KEYWORD1 void KEYWORD2 NAME(WindowPos4svMESA)(const GLshort * v)
    DISPATCH(WindowPos4svMESA, (v), (F, "glWindowPos4svMESA(%p);\n", (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_661)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_654)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_661)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
 {
    DISPATCH(MultiModeDrawArraysIBM, (mode, first, count, primcount, modestride), (F, "glMultiModeDrawArraysIBM(%p, %p, %p, %d, %d);\n", (const void *) mode, (const void *) first, (const void *) count, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_662)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_655)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_662)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
 {
    DISPATCH(MultiModeDrawElementsIBM, (mode, count, type, indices, primcount, modestride), (F, "glMultiModeDrawElementsIBM(%p, %p, 0x%x, %p, %d, %d);\n", (const void *) mode, (const void *) count, type, (const void *) indices, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLsizei n, const GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_663)(GLsizei n, const GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_656)(GLsizei n, const GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_663)(GLsizei n, const GLuint * fences)
 {
    DISPATCH(DeleteFencesNV, (n, fences), (F, "glDeleteFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_664)(GLuint fence);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_657)(GLuint fence)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_664)(GLuint fence)
 {
    DISPATCH(FinishFenceNV, (fence), (F, "glFinishFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_658)(GLsizei n, GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_665)(GLsizei n, GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_658)(GLsizei n, GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_665)(GLsizei n, GLuint * fences)
 {
    DISPATCH(GenFencesNV, (n, fences), (F, "glGenFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_659)(GLuint fence, GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_666)(GLuint fence, GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_659)(GLuint fence, GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_666)(GLuint fence, GLenum pname, GLint * params)
 {
    DISPATCH(GetFenceivNV, (fence, pname, params), (F, "glGetFenceivNV(%d, 0x%x, %p);\n", fence, pname, (const void *) params));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_660)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_667)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_660)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_667)(GLuint fence)
 {
    RETURN_DISPATCH(IsFenceNV, (fence), (F, "glIsFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_661)(GLuint fence, GLenum condition);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_668)(GLuint fence, GLenum condition);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_661)(GLuint fence, GLenum condition)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_668)(GLuint fence, GLenum condition)
 {
    DISPATCH(SetFenceNV, (fence, condition), (F, "glSetFenceNV(%d, 0x%x);\n", fence, condition));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_662)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_669)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_662)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_669)(GLuint fence)
 {
    RETURN_DISPATCH(TestFenceNV, (fence), (F, "glTestFenceNV(%d);\n", fence));
 }
@@ -5322,16 +5357,16 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterivNV)(GLenum pname, const GLint * para
    DISPATCH(PointParameterivNV, (pname, params), (F, "glPointParameterivNV(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_743)(GLenum face);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_750)(GLenum face);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_743)(GLenum face)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_750)(GLenum face)
 {
    DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLuint array);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_751)(GLuint array);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_744)(GLuint array)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_751)(GLuint array)
 {
    DISPATCH(BindVertexArrayAPPLE, (array), (F, "glBindVertexArrayAPPLE(%d);\n", array));
 }
@@ -5341,16 +5376,16 @@ KEYWORD1 void KEYWORD2 NAME(DeleteVertexArrays)(GLsizei n, const GLuint * arrays
    DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArrays(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_745)(GLsizei n, const GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_752)(GLsizei n, const GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_745)(GLsizei n, const GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_752)(GLsizei n, const GLuint * arrays)
 {
    DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_746)(GLsizei n, GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_753)(GLsizei n, GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_746)(GLsizei n, GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_753)(GLsizei n, GLuint * arrays)
 {
    DISPATCH(GenVertexArraysAPPLE, (n, arrays), (F, "glGenVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
@@ -5360,9 +5395,9 @@ KEYWORD1 GLboolean KEYWORD2 NAME(IsVertexArray)(GLuint array)
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArray(%d);\n", array));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_747)(GLuint array);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_754)(GLuint array);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_747)(GLuint array)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_754)(GLuint array)
 {
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArrayAPPLE(%d);\n", array));
 }
@@ -5397,9 +5432,9 @@ 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_754)(GLclampd zmin, GLclampd zmax);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_761)(GLclampd zmin, GLclampd zmax);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_754)(GLclampd zmin, GLclampd zmax)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_761)(GLclampd zmin, GLclampd zmax)
 {
    DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
 }
@@ -5409,9 +5444,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_755)(GLenum modeRGB, GLenum modeA);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_762)(GLenum modeRGB, GLenum modeA);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_755)(GLenum modeRGB, GLenum modeA)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_762)(GLenum modeRGB, GLenum modeA)
 {
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparateEXT(0x%x, 0x%x);\n", modeRGB, modeA));
 }
@@ -5591,23 +5626,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_773)(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_780)(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_773)(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_780)(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_774)(GLenum target, GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(GLenum target, GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_774)(GLenum target, GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(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_775)(GLenum target, GLintptr offset, GLsizeiptr size);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(GLenum target, GLintptr offset, GLsizeiptr size);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_775)(GLenum target, GLintptr offset, GLsizeiptr size)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(GLenum target, GLintptr offset, GLsizeiptr size)
 {
    DISPATCH(FlushMappedBufferRangeAPPLE, (target, offset, size), (F, "glFlushMappedBufferRangeAPPLE(0x%x, %d, %d);\n", target, offset, size));
 }
@@ -5627,51 +5662,51 @@ KEYWORD1 void KEYWORD2 NAME(ProvokingVertexEXT)(GLenum mode)
    DISPATCH(ProvokingVertexEXT, (mode), (F, "glProvokingVertexEXT(0x%x);\n", mode));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLenum target, GLenum pname, GLvoid ** params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_785)(GLenum target, GLenum pname, GLvoid ** params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLenum target, GLenum pname, GLvoid ** params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_785)(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_779)(GLenum target, GLsizei length, GLvoid * pointer);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_786)(GLenum target, GLsizei length, GLvoid * pointer);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_779)(GLenum target, GLsizei length, GLvoid * pointer)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_786)(GLenum target, GLsizei length, GLvoid * pointer)
 {
    DISPATCH(TextureRangeAPPLE, (target, length, pointer), (F, "glTextureRangeAPPLE(0x%x, %d, %p);\n", target, length, (const void *) pointer));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_787)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_787)(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_781)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_788)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_788)(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_782)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_789)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_789)(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_783)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_790)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_790)(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_784)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_791)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_784)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_791)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
@@ -6257,15 +6292,22 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(BindVertexArray),
    TABLE_ENTRY(GenVertexArrays),
    TABLE_ENTRY(CopyBufferSubData),
+   TABLE_ENTRY(ClientWaitSync),
+   TABLE_ENTRY(DeleteSync),
+   TABLE_ENTRY(FenceSync),
+   TABLE_ENTRY(GetInteger64v),
+   TABLE_ENTRY(GetSynciv),
+   TABLE_ENTRY(IsSync),
+   TABLE_ENTRY(WaitSync),
    TABLE_ENTRY(PolygonOffsetEXT),
-   TABLE_ENTRY(_dispatch_stub_568),
-   TABLE_ENTRY(_dispatch_stub_569),
-   TABLE_ENTRY(_dispatch_stub_570),
-   TABLE_ENTRY(_dispatch_stub_571),
-   TABLE_ENTRY(_dispatch_stub_572),
-   TABLE_ENTRY(_dispatch_stub_573),
-   TABLE_ENTRY(_dispatch_stub_574),
    TABLE_ENTRY(_dispatch_stub_575),
+   TABLE_ENTRY(_dispatch_stub_576),
+   TABLE_ENTRY(_dispatch_stub_577),
+   TABLE_ENTRY(_dispatch_stub_578),
+   TABLE_ENTRY(_dispatch_stub_579),
+   TABLE_ENTRY(_dispatch_stub_580),
+   TABLE_ENTRY(_dispatch_stub_581),
+   TABLE_ENTRY(_dispatch_stub_582),
    TABLE_ENTRY(ColorPointerEXT),
    TABLE_ENTRY(EdgeFlagPointerEXT),
    TABLE_ENTRY(IndexPointerEXT),
@@ -6276,8 +6318,8 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(PointParameterfvEXT),
    TABLE_ENTRY(LockArraysEXT),
    TABLE_ENTRY(UnlockArraysEXT),
-   TABLE_ENTRY(_dispatch_stub_586),
-   TABLE_ENTRY(_dispatch_stub_587),
+   TABLE_ENTRY(_dispatch_stub_593),
+   TABLE_ENTRY(_dispatch_stub_594),
    TABLE_ENTRY(SecondaryColor3bEXT),
    TABLE_ENTRY(SecondaryColor3bvEXT),
    TABLE_ENTRY(SecondaryColor3dEXT),
@@ -6302,7 +6344,7 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(FogCoorddvEXT),
    TABLE_ENTRY(FogCoordfEXT),
    TABLE_ENTRY(FogCoordfvEXT),
-   TABLE_ENTRY(_dispatch_stub_612),
+   TABLE_ENTRY(_dispatch_stub_619),
    TABLE_ENTRY(BlendFuncSeparateEXT),
    TABLE_ENTRY(FlushVertexArrayRangeNV),
    TABLE_ENTRY(VertexArrayRangeNV),
@@ -6344,15 +6386,15 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(WindowPos4ivMESA),
    TABLE_ENTRY(WindowPos4sMESA),
    TABLE_ENTRY(WindowPos4svMESA),
-   TABLE_ENTRY(_dispatch_stub_654),
-   TABLE_ENTRY(_dispatch_stub_655),
-   TABLE_ENTRY(_dispatch_stub_656),
-   TABLE_ENTRY(_dispatch_stub_657),
-   TABLE_ENTRY(_dispatch_stub_658),
-   TABLE_ENTRY(_dispatch_stub_659),
-   TABLE_ENTRY(_dispatch_stub_660),
    TABLE_ENTRY(_dispatch_stub_661),
    TABLE_ENTRY(_dispatch_stub_662),
+   TABLE_ENTRY(_dispatch_stub_663),
+   TABLE_ENTRY(_dispatch_stub_664),
+   TABLE_ENTRY(_dispatch_stub_665),
+   TABLE_ENTRY(_dispatch_stub_666),
+   TABLE_ENTRY(_dispatch_stub_667),
+   TABLE_ENTRY(_dispatch_stub_668),
+   TABLE_ENTRY(_dispatch_stub_669),
    TABLE_ENTRY(AreProgramsResidentNV),
    TABLE_ENTRY(BindProgramNV),
    TABLE_ENTRY(DeleteProgramsNV),
@@ -6433,19 +6475,19 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(SetFragmentShaderConstantATI),
    TABLE_ENTRY(PointParameteriNV),
    TABLE_ENTRY(PointParameterivNV),
-   TABLE_ENTRY(_dispatch_stub_743),
-   TABLE_ENTRY(_dispatch_stub_744),
-   TABLE_ENTRY(_dispatch_stub_745),
-   TABLE_ENTRY(_dispatch_stub_746),
-   TABLE_ENTRY(_dispatch_stub_747),
+   TABLE_ENTRY(_dispatch_stub_750),
+   TABLE_ENTRY(_dispatch_stub_751),
+   TABLE_ENTRY(_dispatch_stub_752),
+   TABLE_ENTRY(_dispatch_stub_753),
+   TABLE_ENTRY(_dispatch_stub_754),
    TABLE_ENTRY(GetProgramNamedParameterdvNV),
    TABLE_ENTRY(GetProgramNamedParameterfvNV),
    TABLE_ENTRY(ProgramNamedParameter4dNV),
    TABLE_ENTRY(ProgramNamedParameter4dvNV),
    TABLE_ENTRY(ProgramNamedParameter4fNV),
    TABLE_ENTRY(ProgramNamedParameter4fvNV),
-   TABLE_ENTRY(_dispatch_stub_754),
-   TABLE_ENTRY(_dispatch_stub_755),
+   TABLE_ENTRY(_dispatch_stub_761),
+   TABLE_ENTRY(_dispatch_stub_762),
    TABLE_ENTRY(BindFramebufferEXT),
    TABLE_ENTRY(BindRenderbufferEXT),
    TABLE_ENTRY(CheckFramebufferStatusEXT),
@@ -6463,18 +6505,18 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(IsFramebufferEXT),
    TABLE_ENTRY(IsRenderbufferEXT),
    TABLE_ENTRY(RenderbufferStorageEXT),
-   TABLE_ENTRY(_dispatch_stub_773),
-   TABLE_ENTRY(_dispatch_stub_774),
-   TABLE_ENTRY(_dispatch_stub_775),
-   TABLE_ENTRY(FramebufferTextureLayerEXT),
-   TABLE_ENTRY(ProvokingVertexEXT),
-   TABLE_ENTRY(_dispatch_stub_778),
-   TABLE_ENTRY(_dispatch_stub_779),
    TABLE_ENTRY(_dispatch_stub_780),
    TABLE_ENTRY(_dispatch_stub_781),
    TABLE_ENTRY(_dispatch_stub_782),
-   TABLE_ENTRY(_dispatch_stub_783),
-   TABLE_ENTRY(_dispatch_stub_784),
+   TABLE_ENTRY(FramebufferTextureLayerEXT),
+   TABLE_ENTRY(ProvokingVertexEXT),
+   TABLE_ENTRY(_dispatch_stub_785),
+   TABLE_ENTRY(_dispatch_stub_786),
+   TABLE_ENTRY(_dispatch_stub_787),
+   TABLE_ENTRY(_dispatch_stub_788),
+   TABLE_ENTRY(_dispatch_stub_789),
+   TABLE_ENTRY(_dispatch_stub_790),
+   TABLE_ENTRY(_dispatch_stub_791),
    /* A whole bunch of no-op functions.  These might be called
     * when someone tries to call a dynamically-registered
     * extension function without a current rendering context.
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index 21e96a9325..ae6603262e 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -619,6 +619,13 @@ static const char gl_string_table[] =
     "glBindVertexArray\0"
     "glGenVertexArrays\0"
     "glCopyBufferSubData\0"
+    "glClientWaitSync\0"
+    "glDeleteSync\0"
+    "glFenceSync\0"
+    "glGetInteger64v\0"
+    "glGetSynciv\0"
+    "glIsSync\0"
+    "glWaitSync\0"
     "glPolygonOffsetEXT\0"
     "glGetPixelTexGenParameterfvSGIS\0"
     "glGetPixelTexGenParameterivSGIS\0"
@@ -1154,43 +1161,43 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_364 mgl_dispatch_stub_364
 #define gl_dispatch_stub_365 mgl_dispatch_stub_365
 #define gl_dispatch_stub_366 mgl_dispatch_stub_366
-#define gl_dispatch_stub_568 mgl_dispatch_stub_568
-#define gl_dispatch_stub_569 mgl_dispatch_stub_569
-#define gl_dispatch_stub_570 mgl_dispatch_stub_570
-#define gl_dispatch_stub_571 mgl_dispatch_stub_571
-#define gl_dispatch_stub_572 mgl_dispatch_stub_572
-#define gl_dispatch_stub_573 mgl_dispatch_stub_573
-#define gl_dispatch_stub_574 mgl_dispatch_stub_574
 #define gl_dispatch_stub_575 mgl_dispatch_stub_575
-#define gl_dispatch_stub_586 mgl_dispatch_stub_586
-#define gl_dispatch_stub_587 mgl_dispatch_stub_587
-#define gl_dispatch_stub_612 mgl_dispatch_stub_612
-#define gl_dispatch_stub_654 mgl_dispatch_stub_654
-#define gl_dispatch_stub_655 mgl_dispatch_stub_655
-#define gl_dispatch_stub_656 mgl_dispatch_stub_656
-#define gl_dispatch_stub_657 mgl_dispatch_stub_657
-#define gl_dispatch_stub_658 mgl_dispatch_stub_658
-#define gl_dispatch_stub_659 mgl_dispatch_stub_659
-#define gl_dispatch_stub_660 mgl_dispatch_stub_660
+#define gl_dispatch_stub_576 mgl_dispatch_stub_576
+#define gl_dispatch_stub_577 mgl_dispatch_stub_577
+#define gl_dispatch_stub_578 mgl_dispatch_stub_578
+#define gl_dispatch_stub_579 mgl_dispatch_stub_579
+#define gl_dispatch_stub_580 mgl_dispatch_stub_580
+#define gl_dispatch_stub_581 mgl_dispatch_stub_581
+#define gl_dispatch_stub_582 mgl_dispatch_stub_582
+#define gl_dispatch_stub_593 mgl_dispatch_stub_593
+#define gl_dispatch_stub_594 mgl_dispatch_stub_594
+#define gl_dispatch_stub_619 mgl_dispatch_stub_619
 #define gl_dispatch_stub_661 mgl_dispatch_stub_661
 #define gl_dispatch_stub_662 mgl_dispatch_stub_662
-#define gl_dispatch_stub_743 mgl_dispatch_stub_743
-#define gl_dispatch_stub_744 mgl_dispatch_stub_744
-#define gl_dispatch_stub_745 mgl_dispatch_stub_745
-#define gl_dispatch_stub_746 mgl_dispatch_stub_746
-#define gl_dispatch_stub_747 mgl_dispatch_stub_747
+#define gl_dispatch_stub_663 mgl_dispatch_stub_663
+#define gl_dispatch_stub_664 mgl_dispatch_stub_664
+#define gl_dispatch_stub_665 mgl_dispatch_stub_665
+#define gl_dispatch_stub_666 mgl_dispatch_stub_666
+#define gl_dispatch_stub_667 mgl_dispatch_stub_667
+#define gl_dispatch_stub_668 mgl_dispatch_stub_668
+#define gl_dispatch_stub_669 mgl_dispatch_stub_669
+#define gl_dispatch_stub_750 mgl_dispatch_stub_750
+#define gl_dispatch_stub_751 mgl_dispatch_stub_751
+#define gl_dispatch_stub_752 mgl_dispatch_stub_752
+#define gl_dispatch_stub_753 mgl_dispatch_stub_753
 #define gl_dispatch_stub_754 mgl_dispatch_stub_754
-#define gl_dispatch_stub_755 mgl_dispatch_stub_755
-#define gl_dispatch_stub_773 mgl_dispatch_stub_773
-#define gl_dispatch_stub_774 mgl_dispatch_stub_774
-#define gl_dispatch_stub_775 mgl_dispatch_stub_775
-#define gl_dispatch_stub_778 mgl_dispatch_stub_778
-#define gl_dispatch_stub_779 mgl_dispatch_stub_779
+#define gl_dispatch_stub_761 mgl_dispatch_stub_761
+#define gl_dispatch_stub_762 mgl_dispatch_stub_762
 #define gl_dispatch_stub_780 mgl_dispatch_stub_780
 #define gl_dispatch_stub_781 mgl_dispatch_stub_781
 #define gl_dispatch_stub_782 mgl_dispatch_stub_782
-#define gl_dispatch_stub_783 mgl_dispatch_stub_783
-#define gl_dispatch_stub_784 mgl_dispatch_stub_784
+#define gl_dispatch_stub_785 mgl_dispatch_stub_785
+#define gl_dispatch_stub_786 mgl_dispatch_stub_786
+#define gl_dispatch_stub_787 mgl_dispatch_stub_787
+#define gl_dispatch_stub_788 mgl_dispatch_stub_788
+#define gl_dispatch_stub_789 mgl_dispatch_stub_789
+#define gl_dispatch_stub_790 mgl_dispatch_stub_790
+#define gl_dispatch_stub_791 mgl_dispatch_stub_791
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1208,43 +1215,43 @@ void GLAPIENTRY gl_dispatch_stub_363(GLenum target, GLenum pname, GLint * params
 void GLAPIENTRY gl_dispatch_stub_364(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);
 void GLAPIENTRY gl_dispatch_stub_365(GLenum target, GLenum pname, GLfloat * params);
 void GLAPIENTRY gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_568(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_569(GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_570(GLenum pname, GLfloat param);
-void GLAPIENTRY gl_dispatch_stub_571(GLenum pname, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_572(GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_573(GLenum pname, const GLint * params);
-void GLAPIENTRY gl_dispatch_stub_574(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_575(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_586(GLenum pname, GLdouble * params);
-void GLAPIENTRY gl_dispatch_stub_587(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_612(GLenum mode);
-void GLAPIENTRY gl_dispatch_stub_654(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_655(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_656(GLsizei n, const GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_657(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_658(GLsizei n, GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_659(GLuint fence, GLenum pname, GLint * params);
-GLboolean GLAPIENTRY gl_dispatch_stub_660(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_661(GLuint fence, GLenum condition);
-GLboolean GLAPIENTRY gl_dispatch_stub_662(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_743(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_744(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_745(GLsizei n, const GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_746(GLsizei n, GLuint * arrays);
-GLboolean GLAPIENTRY gl_dispatch_stub_747(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_754(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_755(GLenum modeRGB, GLenum modeA);
-void GLAPIENTRY gl_dispatch_stub_773(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_774(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_775(GLenum target, GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_778(GLenum target, GLenum pname, GLvoid ** params);
-void GLAPIENTRY gl_dispatch_stub_779(GLenum target, GLsizei length, GLvoid * pointer);
-void GLAPIENTRY gl_dispatch_stub_780(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_781(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_782(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_783(GLuint id, GLenum pname, GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_784(GLuint id, GLenum pname, GLuint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_575(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_576(GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_577(GLenum pname, GLfloat param);
+void GLAPIENTRY gl_dispatch_stub_578(GLenum pname, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_579(GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_580(GLenum pname, const GLint * params);
+void GLAPIENTRY gl_dispatch_stub_581(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_582(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_593(GLenum pname, GLdouble * params);
+void GLAPIENTRY gl_dispatch_stub_594(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_619(GLenum mode);
+void GLAPIENTRY gl_dispatch_stub_661(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_662(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_663(GLsizei n, const GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_664(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_665(GLsizei n, GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_666(GLuint fence, GLenum pname, GLint * params);
+GLboolean GLAPIENTRY gl_dispatch_stub_667(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_668(GLuint fence, GLenum condition);
+GLboolean GLAPIENTRY gl_dispatch_stub_669(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_750(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_751(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_752(GLsizei n, const GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_753(GLsizei n, GLuint * arrays);
+GLboolean GLAPIENTRY gl_dispatch_stub_754(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_761(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_762(GLenum modeRGB, GLenum modeA);
+void GLAPIENTRY gl_dispatch_stub_780(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_781(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_782(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_785(GLenum target, GLenum pname, GLvoid ** params);
+void GLAPIENTRY gl_dispatch_stub_786(GLenum target, GLsizei length, GLvoid * pointer);
+void GLAPIENTRY gl_dispatch_stub_787(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_788(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_789(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_790(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_791(GLuint id, GLenum pname, GLuint64EXT * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -1815,524 +1822,531 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET( 9026, glBindVertexArray, glBindVertexArray, NULL, _gloffset_BindVertexArray),
     NAME_FUNC_OFFSET( 9044, glGenVertexArrays, glGenVertexArrays, NULL, _gloffset_GenVertexArrays),
     NAME_FUNC_OFFSET( 9062, glCopyBufferSubData, glCopyBufferSubData, NULL, _gloffset_CopyBufferSubData),
-    NAME_FUNC_OFFSET( 9082, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, _gloffset_PolygonOffsetEXT),
-    NAME_FUNC_OFFSET( 9101, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_GetPixelTexGenParameterfvSGIS),
-    NAME_FUNC_OFFSET( 9133, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_GetPixelTexGenParameterivSGIS),
-    NAME_FUNC_OFFSET( 9165, gl_dispatch_stub_570, gl_dispatch_stub_570, NULL, _gloffset_PixelTexGenParameterfSGIS),
-    NAME_FUNC_OFFSET( 9193, gl_dispatch_stub_571, gl_dispatch_stub_571, NULL, _gloffset_PixelTexGenParameterfvSGIS),
-    NAME_FUNC_OFFSET( 9222, gl_dispatch_stub_572, gl_dispatch_stub_572, NULL, _gloffset_PixelTexGenParameteriSGIS),
-    NAME_FUNC_OFFSET( 9250, gl_dispatch_stub_573, gl_dispatch_stub_573, NULL, _gloffset_PixelTexGenParameterivSGIS),
-    NAME_FUNC_OFFSET( 9279, gl_dispatch_stub_574, gl_dispatch_stub_574, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET( 9296, gl_dispatch_stub_575, gl_dispatch_stub_575, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET( 9316, glColorPointerEXT, glColorPointerEXT, NULL, _gloffset_ColorPointerEXT),
-    NAME_FUNC_OFFSET( 9334, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, _gloffset_EdgeFlagPointerEXT),
-    NAME_FUNC_OFFSET( 9355, glIndexPointerEXT, glIndexPointerEXT, NULL, _gloffset_IndexPointerEXT),
-    NAME_FUNC_OFFSET( 9373, glNormalPointerEXT, glNormalPointerEXT, NULL, _gloffset_NormalPointerEXT),
-    NAME_FUNC_OFFSET( 9392, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, _gloffset_TexCoordPointerEXT),
-    NAME_FUNC_OFFSET( 9413, glVertexPointerEXT, glVertexPointerEXT, NULL, _gloffset_VertexPointerEXT),
-    NAME_FUNC_OFFSET( 9432, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET( 9453, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET( 9475, glLockArraysEXT, glLockArraysEXT, NULL, _gloffset_LockArraysEXT),
-    NAME_FUNC_OFFSET( 9491, glUnlockArraysEXT, glUnlockArraysEXT, NULL, _gloffset_UnlockArraysEXT),
-    NAME_FUNC_OFFSET( 9509, gl_dispatch_stub_586, gl_dispatch_stub_586, NULL, _gloffset_CullParameterdvEXT),
-    NAME_FUNC_OFFSET( 9530, gl_dispatch_stub_587, gl_dispatch_stub_587, NULL, _gloffset_CullParameterfvEXT),
-    NAME_FUNC_OFFSET( 9551, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET( 9573, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET( 9596, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET( 9618, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET( 9641, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET( 9663, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET( 9686, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET( 9708, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET( 9731, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET( 9753, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET( 9776, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET( 9799, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET( 9823, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET( 9846, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET( 9870, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET( 9893, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET( 9917, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET( 9944, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET( 9965, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET( 9988, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(10009, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(10024, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(10040, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(10055, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(10071, gl_dispatch_stub_612, gl_dispatch_stub_612, NULL, _gloffset_PixelTexGenSGIX),
-    NAME_FUNC_OFFSET(10089, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(10112, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, _gloffset_FlushVertexArrayRangeNV),
-    NAME_FUNC_OFFSET(10138, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, _gloffset_VertexArrayRangeNV),
-    NAME_FUNC_OFFSET(10159, glCombinerInputNV, glCombinerInputNV, NULL, _gloffset_CombinerInputNV),
-    NAME_FUNC_OFFSET(10177, glCombinerOutputNV, glCombinerOutputNV, NULL, _gloffset_CombinerOutputNV),
-    NAME_FUNC_OFFSET(10196, glCombinerParameterfNV, glCombinerParameterfNV, NULL, _gloffset_CombinerParameterfNV),
-    NAME_FUNC_OFFSET(10219, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, _gloffset_CombinerParameterfvNV),
-    NAME_FUNC_OFFSET(10243, glCombinerParameteriNV, glCombinerParameteriNV, NULL, _gloffset_CombinerParameteriNV),
-    NAME_FUNC_OFFSET(10266, glCombinerParameterivNV, glCombinerParameterivNV, NULL, _gloffset_CombinerParameterivNV),
-    NAME_FUNC_OFFSET(10290, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, _gloffset_FinalCombinerInputNV),
-    NAME_FUNC_OFFSET(10313, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, _gloffset_GetCombinerInputParameterfvNV),
-    NAME_FUNC_OFFSET(10345, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, _gloffset_GetCombinerInputParameterivNV),
-    NAME_FUNC_OFFSET(10377, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, _gloffset_GetCombinerOutputParameterfvNV),
-    NAME_FUNC_OFFSET(10410, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, _gloffset_GetCombinerOutputParameterivNV),
-    NAME_FUNC_OFFSET(10443, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, _gloffset_GetFinalCombinerInputParameterfvNV),
-    NAME_FUNC_OFFSET(10480, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, _gloffset_GetFinalCombinerInputParameterivNV),
-    NAME_FUNC_OFFSET(10517, glResizeBuffersMESA, glResizeBuffersMESA, NULL, _gloffset_ResizeBuffersMESA),
-    NAME_FUNC_OFFSET(10537, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(10555, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(10574, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(10592, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(10611, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(10629, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(10648, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(10666, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(10685, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(10703, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(10722, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(10740, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(10759, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(10777, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(10796, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(10814, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(10833, glWindowPos4dMESA, glWindowPos4dMESA, NULL, _gloffset_WindowPos4dMESA),
-    NAME_FUNC_OFFSET(10851, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, _gloffset_WindowPos4dvMESA),
-    NAME_FUNC_OFFSET(10870, glWindowPos4fMESA, glWindowPos4fMESA, NULL, _gloffset_WindowPos4fMESA),
-    NAME_FUNC_OFFSET(10888, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, _gloffset_WindowPos4fvMESA),
-    NAME_FUNC_OFFSET(10907, glWindowPos4iMESA, glWindowPos4iMESA, NULL, _gloffset_WindowPos4iMESA),
-    NAME_FUNC_OFFSET(10925, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, _gloffset_WindowPos4ivMESA),
-    NAME_FUNC_OFFSET(10944, glWindowPos4sMESA, glWindowPos4sMESA, NULL, _gloffset_WindowPos4sMESA),
-    NAME_FUNC_OFFSET(10962, glWindowPos4svMESA, glWindowPos4svMESA, NULL, _gloffset_WindowPos4svMESA),
-    NAME_FUNC_OFFSET(10981, gl_dispatch_stub_654, gl_dispatch_stub_654, NULL, _gloffset_MultiModeDrawArraysIBM),
-    NAME_FUNC_OFFSET(11006, gl_dispatch_stub_655, gl_dispatch_stub_655, NULL, _gloffset_MultiModeDrawElementsIBM),
-    NAME_FUNC_OFFSET(11033, gl_dispatch_stub_656, gl_dispatch_stub_656, NULL, _gloffset_DeleteFencesNV),
-    NAME_FUNC_OFFSET(11050, gl_dispatch_stub_657, gl_dispatch_stub_657, NULL, _gloffset_FinishFenceNV),
-    NAME_FUNC_OFFSET(11066, gl_dispatch_stub_658, gl_dispatch_stub_658, NULL, _gloffset_GenFencesNV),
-    NAME_FUNC_OFFSET(11080, gl_dispatch_stub_659, gl_dispatch_stub_659, NULL, _gloffset_GetFenceivNV),
-    NAME_FUNC_OFFSET(11095, gl_dispatch_stub_660, gl_dispatch_stub_660, NULL, _gloffset_IsFenceNV),
-    NAME_FUNC_OFFSET(11107, gl_dispatch_stub_661, gl_dispatch_stub_661, NULL, _gloffset_SetFenceNV),
-    NAME_FUNC_OFFSET(11120, gl_dispatch_stub_662, gl_dispatch_stub_662, NULL, _gloffset_TestFenceNV),
-    NAME_FUNC_OFFSET(11134, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, _gloffset_AreProgramsResidentNV),
-    NAME_FUNC_OFFSET(11158, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(11174, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(11193, glExecuteProgramNV, glExecuteProgramNV, NULL, _gloffset_ExecuteProgramNV),
-    NAME_FUNC_OFFSET(11212, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(11228, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, _gloffset_GetProgramParameterdvNV),
-    NAME_FUNC_OFFSET(11254, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, _gloffset_GetProgramParameterfvNV),
-    NAME_FUNC_OFFSET(11280, glGetProgramStringNV, glGetProgramStringNV, NULL, _gloffset_GetProgramStringNV),
-    NAME_FUNC_OFFSET(11301, glGetProgramivNV, glGetProgramivNV, NULL, _gloffset_GetProgramivNV),
-    NAME_FUNC_OFFSET(11318, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, _gloffset_GetTrackMatrixivNV),
-    NAME_FUNC_OFFSET(11339, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(11367, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, _gloffset_GetVertexAttribdvNV),
-    NAME_FUNC_OFFSET(11389, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, _gloffset_GetVertexAttribfvNV),
-    NAME_FUNC_OFFSET(11411, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, _gloffset_GetVertexAttribivNV),
-    NAME_FUNC_OFFSET(11433, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(11447, glLoadProgramNV, glLoadProgramNV, NULL, _gloffset_LoadProgramNV),
-    NAME_FUNC_OFFSET(11463, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, _gloffset_ProgramParameters4dvNV),
-    NAME_FUNC_OFFSET(11488, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, _gloffset_ProgramParameters4fvNV),
-    NAME_FUNC_OFFSET(11513, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, _gloffset_RequestResidentProgramsNV),
-    NAME_FUNC_OFFSET(11541, glTrackMatrixNV, glTrackMatrixNV, NULL, _gloffset_TrackMatrixNV),
-    NAME_FUNC_OFFSET(11557, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, _gloffset_VertexAttrib1dNV),
-    NAME_FUNC_OFFSET(11576, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, _gloffset_VertexAttrib1dvNV),
-    NAME_FUNC_OFFSET(11596, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, _gloffset_VertexAttrib1fNV),
-    NAME_FUNC_OFFSET(11615, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, _gloffset_VertexAttrib1fvNV),
-    NAME_FUNC_OFFSET(11635, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, _gloffset_VertexAttrib1sNV),
-    NAME_FUNC_OFFSET(11654, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, _gloffset_VertexAttrib1svNV),
-    NAME_FUNC_OFFSET(11674, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, _gloffset_VertexAttrib2dNV),
-    NAME_FUNC_OFFSET(11693, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, _gloffset_VertexAttrib2dvNV),
-    NAME_FUNC_OFFSET(11713, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, _gloffset_VertexAttrib2fNV),
-    NAME_FUNC_OFFSET(11732, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, _gloffset_VertexAttrib2fvNV),
-    NAME_FUNC_OFFSET(11752, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, _gloffset_VertexAttrib2sNV),
-    NAME_FUNC_OFFSET(11771, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, _gloffset_VertexAttrib2svNV),
-    NAME_FUNC_OFFSET(11791, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, _gloffset_VertexAttrib3dNV),
-    NAME_FUNC_OFFSET(11810, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, _gloffset_VertexAttrib3dvNV),
-    NAME_FUNC_OFFSET(11830, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, _gloffset_VertexAttrib3fNV),
-    NAME_FUNC_OFFSET(11849, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, _gloffset_VertexAttrib3fvNV),
-    NAME_FUNC_OFFSET(11869, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, _gloffset_VertexAttrib3sNV),
-    NAME_FUNC_OFFSET(11888, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, _gloffset_VertexAttrib3svNV),
-    NAME_FUNC_OFFSET(11908, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, _gloffset_VertexAttrib4dNV),
-    NAME_FUNC_OFFSET(11927, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, _gloffset_VertexAttrib4dvNV),
-    NAME_FUNC_OFFSET(11947, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, _gloffset_VertexAttrib4fNV),
-    NAME_FUNC_OFFSET(11966, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, _gloffset_VertexAttrib4fvNV),
-    NAME_FUNC_OFFSET(11986, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, _gloffset_VertexAttrib4sNV),
-    NAME_FUNC_OFFSET(12005, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, _gloffset_VertexAttrib4svNV),
-    NAME_FUNC_OFFSET(12025, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, _gloffset_VertexAttrib4ubNV),
-    NAME_FUNC_OFFSET(12045, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, _gloffset_VertexAttrib4ubvNV),
-    NAME_FUNC_OFFSET(12066, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, _gloffset_VertexAttribPointerNV),
-    NAME_FUNC_OFFSET(12090, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, _gloffset_VertexAttribs1dvNV),
-    NAME_FUNC_OFFSET(12111, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, _gloffset_VertexAttribs1fvNV),
-    NAME_FUNC_OFFSET(12132, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, _gloffset_VertexAttribs1svNV),
-    NAME_FUNC_OFFSET(12153, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, _gloffset_VertexAttribs2dvNV),
-    NAME_FUNC_OFFSET(12174, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, _gloffset_VertexAttribs2fvNV),
-    NAME_FUNC_OFFSET(12195, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, _gloffset_VertexAttribs2svNV),
-    NAME_FUNC_OFFSET(12216, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, _gloffset_VertexAttribs3dvNV),
-    NAME_FUNC_OFFSET(12237, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, _gloffset_VertexAttribs3fvNV),
-    NAME_FUNC_OFFSET(12258, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, _gloffset_VertexAttribs3svNV),
-    NAME_FUNC_OFFSET(12279, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, _gloffset_VertexAttribs4dvNV),
-    NAME_FUNC_OFFSET(12300, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, _gloffset_VertexAttribs4fvNV),
-    NAME_FUNC_OFFSET(12321, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, _gloffset_VertexAttribs4svNV),
-    NAME_FUNC_OFFSET(12342, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, _gloffset_VertexAttribs4ubvNV),
-    NAME_FUNC_OFFSET(12364, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, _gloffset_GetTexBumpParameterfvATI),
-    NAME_FUNC_OFFSET(12391, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, _gloffset_GetTexBumpParameterivATI),
-    NAME_FUNC_OFFSET(12418, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, _gloffset_TexBumpParameterfvATI),
-    NAME_FUNC_OFFSET(12442, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, _gloffset_TexBumpParameterivATI),
-    NAME_FUNC_OFFSET(12466, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, _gloffset_AlphaFragmentOp1ATI),
-    NAME_FUNC_OFFSET(12488, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, _gloffset_AlphaFragmentOp2ATI),
-    NAME_FUNC_OFFSET(12510, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, _gloffset_AlphaFragmentOp3ATI),
-    NAME_FUNC_OFFSET(12532, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, _gloffset_BeginFragmentShaderATI),
-    NAME_FUNC_OFFSET(12557, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, _gloffset_BindFragmentShaderATI),
-    NAME_FUNC_OFFSET(12581, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, _gloffset_ColorFragmentOp1ATI),
-    NAME_FUNC_OFFSET(12603, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, _gloffset_ColorFragmentOp2ATI),
-    NAME_FUNC_OFFSET(12625, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, _gloffset_ColorFragmentOp3ATI),
-    NAME_FUNC_OFFSET(12647, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, _gloffset_DeleteFragmentShaderATI),
-    NAME_FUNC_OFFSET(12673, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, _gloffset_EndFragmentShaderATI),
-    NAME_FUNC_OFFSET(12696, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, _gloffset_GenFragmentShadersATI),
-    NAME_FUNC_OFFSET(12720, glPassTexCoordATI, glPassTexCoordATI, NULL, _gloffset_PassTexCoordATI),
-    NAME_FUNC_OFFSET(12738, glSampleMapATI, glSampleMapATI, NULL, _gloffset_SampleMapATI),
-    NAME_FUNC_OFFSET(12753, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, _gloffset_SetFragmentShaderConstantATI),
-    NAME_FUNC_OFFSET(12784, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(12804, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(12825, gl_dispatch_stub_743, gl_dispatch_stub_743, NULL, _gloffset_ActiveStencilFaceEXT),
-    NAME_FUNC_OFFSET(12848, gl_dispatch_stub_744, gl_dispatch_stub_744, NULL, _gloffset_BindVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(12871, gl_dispatch_stub_745, gl_dispatch_stub_745, NULL, _gloffset_DeleteVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(12897, gl_dispatch_stub_746, gl_dispatch_stub_746, NULL, _gloffset_GenVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(12920, gl_dispatch_stub_747, gl_dispatch_stub_747, NULL, _gloffset_IsVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(12941, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, _gloffset_GetProgramNamedParameterdvNV),
-    NAME_FUNC_OFFSET(12972, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, _gloffset_GetProgramNamedParameterfvNV),
-    NAME_FUNC_OFFSET(13003, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, _gloffset_ProgramNamedParameter4dNV),
-    NAME_FUNC_OFFSET(13031, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, _gloffset_ProgramNamedParameter4dvNV),
-    NAME_FUNC_OFFSET(13060, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, _gloffset_ProgramNamedParameter4fNV),
-    NAME_FUNC_OFFSET(13088, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, _gloffset_ProgramNamedParameter4fvNV),
-    NAME_FUNC_OFFSET(13117, gl_dispatch_stub_754, gl_dispatch_stub_754, NULL, _gloffset_DepthBoundsEXT),
-    NAME_FUNC_OFFSET(13134, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(13161, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(13182, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(13204, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(13232, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(13256, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13281, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(13310, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(13336, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(13362, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(13388, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(13409, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(13431, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(13451, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(13492, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(13524, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(13543, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(13563, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(13588, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(13609, gl_dispatch_stub_774, gl_dispatch_stub_774, NULL, _gloffset_BufferParameteriAPPLE),
-    NAME_FUNC_OFFSET(13633, gl_dispatch_stub_775, gl_dispatch_stub_775, NULL, _gloffset_FlushMappedBufferRangeAPPLE),
-    NAME_FUNC_OFFSET(13663, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
-    NAME_FUNC_OFFSET(13692, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
-    NAME_FUNC_OFFSET(13713, gl_dispatch_stub_778, gl_dispatch_stub_778, NULL, _gloffset_GetTexParameterPointervAPPLE),
-    NAME_FUNC_OFFSET(13744, gl_dispatch_stub_779, gl_dispatch_stub_779, NULL, _gloffset_TextureRangeAPPLE),
-    NAME_FUNC_OFFSET(13764, gl_dispatch_stub_780, gl_dispatch_stub_780, NULL, _gloffset_StencilFuncSeparateATI),
-    NAME_FUNC_OFFSET(13789, gl_dispatch_stub_781, gl_dispatch_stub_781, NULL, _gloffset_ProgramEnvParameters4fvEXT),
-    NAME_FUNC_OFFSET(13818, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL, _gloffset_ProgramLocalParameters4fvEXT),
-    NAME_FUNC_OFFSET(13849, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, _gloffset_GetQueryObjecti64vEXT),
-    NAME_FUNC_OFFSET(13873, gl_dispatch_stub_784, gl_dispatch_stub_784, NULL, _gloffset_GetQueryObjectui64vEXT),
-    NAME_FUNC_OFFSET(13898, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
-    NAME_FUNC_OFFSET(13916, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
-    NAME_FUNC_OFFSET(13933, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
-    NAME_FUNC_OFFSET(13949, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
-    NAME_FUNC_OFFSET(13974, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
-    NAME_FUNC_OFFSET(13994, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
-    NAME_FUNC_OFFSET(14014, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
-    NAME_FUNC_OFFSET(14037, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
-    NAME_FUNC_OFFSET(14060, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
-    NAME_FUNC_OFFSET(14080, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
-    NAME_FUNC_OFFSET(14097, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
-    NAME_FUNC_OFFSET(14114, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
-    NAME_FUNC_OFFSET(14129, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
-    NAME_FUNC_OFFSET(14153, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
-    NAME_FUNC_OFFSET(14172, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
-    NAME_FUNC_OFFSET(14191, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
-    NAME_FUNC_OFFSET(14207, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
-    NAME_FUNC_OFFSET(14226, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
-    NAME_FUNC_OFFSET(14249, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14265, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14281, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
-    NAME_FUNC_OFFSET(14308, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
-    NAME_FUNC_OFFSET(14335, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
-    NAME_FUNC_OFFSET(14355, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14374, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14393, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14423, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14453, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14483, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14513, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
-    NAME_FUNC_OFFSET(14532, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
-    NAME_FUNC_OFFSET(14555, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14580, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14605, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
-    NAME_FUNC_OFFSET(14632, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14660, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
-    NAME_FUNC_OFFSET(14687, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14715, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14744, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14773, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
-    NAME_FUNC_OFFSET(14799, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
-    NAME_FUNC_OFFSET(14830, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
-    NAME_FUNC_OFFSET(14861, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
-    NAME_FUNC_OFFSET(14885, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
-    NAME_FUNC_OFFSET(14908, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
-    NAME_FUNC_OFFSET(14926, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
-    NAME_FUNC_OFFSET(14955, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
-    NAME_FUNC_OFFSET(14984, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
-    NAME_FUNC_OFFSET(14999, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
-    NAME_FUNC_OFFSET(15025, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
-    NAME_FUNC_OFFSET(15051, glHistogram, glHistogram, NULL, _gloffset_Histogram),
-    NAME_FUNC_OFFSET(15066, glMinmax, glMinmax, NULL, _gloffset_Minmax),
-    NAME_FUNC_OFFSET(15078, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
-    NAME_FUNC_OFFSET(15098, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
-    NAME_FUNC_OFFSET(15115, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
-    NAME_FUNC_OFFSET(15131, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
-    NAME_FUNC_OFFSET(15150, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
-    NAME_FUNC_OFFSET(15173, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
-    NAME_FUNC_OFFSET(15189, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
-    NAME_FUNC_OFFSET(15211, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
-    NAME_FUNC_OFFSET(15229, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
-    NAME_FUNC_OFFSET(15248, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
-    NAME_FUNC_OFFSET(15266, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
-    NAME_FUNC_OFFSET(15285, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
-    NAME_FUNC_OFFSET(15303, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
-    NAME_FUNC_OFFSET(15322, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
-    NAME_FUNC_OFFSET(15340, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
-    NAME_FUNC_OFFSET(15359, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
-    NAME_FUNC_OFFSET(15377, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
-    NAME_FUNC_OFFSET(15396, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
-    NAME_FUNC_OFFSET(15414, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
-    NAME_FUNC_OFFSET(15433, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
-    NAME_FUNC_OFFSET(15451, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
-    NAME_FUNC_OFFSET(15470, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
-    NAME_FUNC_OFFSET(15488, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
-    NAME_FUNC_OFFSET(15507, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
-    NAME_FUNC_OFFSET(15525, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
-    NAME_FUNC_OFFSET(15544, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
-    NAME_FUNC_OFFSET(15562, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
-    NAME_FUNC_OFFSET(15581, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
-    NAME_FUNC_OFFSET(15599, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
-    NAME_FUNC_OFFSET(15618, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
-    NAME_FUNC_OFFSET(15636, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
-    NAME_FUNC_OFFSET(15655, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
-    NAME_FUNC_OFFSET(15673, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
-    NAME_FUNC_OFFSET(15692, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
-    NAME_FUNC_OFFSET(15710, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
-    NAME_FUNC_OFFSET(15729, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
-    NAME_FUNC_OFFSET(15747, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
-    NAME_FUNC_OFFSET(15766, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
-    NAME_FUNC_OFFSET(15784, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
-    NAME_FUNC_OFFSET(15803, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
-    NAME_FUNC_OFFSET(15826, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15849, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15872, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(15895, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(15918, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
-    NAME_FUNC_OFFSET(15935, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
-    NAME_FUNC_OFFSET(15958, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
-    NAME_FUNC_OFFSET(15981, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
-    NAME_FUNC_OFFSET(16004, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
-    NAME_FUNC_OFFSET(16030, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
-    NAME_FUNC_OFFSET(16056, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
-    NAME_FUNC_OFFSET(16082, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
-    NAME_FUNC_OFFSET(16106, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(16133, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(16159, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
-    NAME_FUNC_OFFSET(16179, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
-    NAME_FUNC_OFFSET(16199, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
-    NAME_FUNC_OFFSET(16219, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
-    NAME_FUNC_OFFSET(16242, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
-    NAME_FUNC_OFFSET(16266, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
-    NAME_FUNC_OFFSET(16289, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
-    NAME_FUNC_OFFSET(16313, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
-    NAME_FUNC_OFFSET(16330, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
-    NAME_FUNC_OFFSET(16348, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
-    NAME_FUNC_OFFSET(16365, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
-    NAME_FUNC_OFFSET(16383, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
-    NAME_FUNC_OFFSET(16400, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
-    NAME_FUNC_OFFSET(16418, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
-    NAME_FUNC_OFFSET(16435, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
-    NAME_FUNC_OFFSET(16453, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
-    NAME_FUNC_OFFSET(16470, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
-    NAME_FUNC_OFFSET(16488, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
-    NAME_FUNC_OFFSET(16505, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
-    NAME_FUNC_OFFSET(16523, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
-    NAME_FUNC_OFFSET(16540, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
-    NAME_FUNC_OFFSET(16558, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
-    NAME_FUNC_OFFSET(16575, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
-    NAME_FUNC_OFFSET(16593, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
-    NAME_FUNC_OFFSET(16610, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
-    NAME_FUNC_OFFSET(16628, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
-    NAME_FUNC_OFFSET(16647, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
-    NAME_FUNC_OFFSET(16666, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
-    NAME_FUNC_OFFSET(16685, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
-    NAME_FUNC_OFFSET(16704, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
-    NAME_FUNC_OFFSET(16724, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
-    NAME_FUNC_OFFSET(16744, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(16764, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
-    NAME_FUNC_OFFSET(16782, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(16799, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(16817, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(16834, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(16852, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
-    NAME_FUNC_OFFSET(16870, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(16887, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(16905, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
-    NAME_FUNC_OFFSET(16924, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
-    NAME_FUNC_OFFSET(16943, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
-    NAME_FUNC_OFFSET(16962, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(16984, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(16997, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(17010, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(17026, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(17042, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(17055, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(17078, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(17098, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(17117, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(17128, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(17140, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(17154, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(17167, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(17183, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(17194, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(17207, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(17226, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(17246, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(17259, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(17269, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(17285, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(17304, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(17322, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(17343, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(17358, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(17373, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(17387, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(17402, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(17414, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(17427, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(17439, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(17452, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(17464, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(17477, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(17489, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(17502, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(17514, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(17527, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(17539, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(17552, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(17564, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(17577, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(17589, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(17602, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(17621, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(17640, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(17659, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(17672, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(17690, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(17711, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(17729, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(17749, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17763, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17780, gl_dispatch_stub_574, gl_dispatch_stub_574, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(17796, gl_dispatch_stub_575, gl_dispatch_stub_575, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(17815, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17833, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17854, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17876, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17895, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17917, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17940, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(17959, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(17979, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(17998, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(18018, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(18037, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(18057, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(18076, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(18096, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(18115, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(18135, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(18155, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(18176, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(18196, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(18217, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(18237, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(18258, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(18282, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(18300, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(18320, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(18338, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(18350, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(18363, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(18375, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(18388, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18408, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18432, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18446, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18463, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18478, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18496, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18510, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18527, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18542, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18560, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18574, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18591, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18606, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18624, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18638, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18655, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18670, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18688, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18702, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18719, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18734, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18752, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18766, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18783, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18798, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18816, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18830, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18847, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18862, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18880, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18894, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18911, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18926, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18944, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(18961, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(18981, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(18998, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(19024, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(19053, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(19068, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(19086, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(19105, gl_dispatch_stub_745, gl_dispatch_stub_745, NULL, _gloffset_DeleteVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(19126, gl_dispatch_stub_747, gl_dispatch_stub_747, NULL, _gloffset_IsVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(19142, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(19166, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(19193, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(19211, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(19230, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(19255, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(19276, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19298, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(19324, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(19347, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(19370, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(19393, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(19411, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19430, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(19447, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(19485, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(19514, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(19530, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(19547, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(19569, gl_dispatch_stub_773, gl_dispatch_stub_773, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(19587, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET( 9082, glClientWaitSync, glClientWaitSync, NULL, _gloffset_ClientWaitSync),
+    NAME_FUNC_OFFSET( 9099, glDeleteSync, glDeleteSync, NULL, _gloffset_DeleteSync),
+    NAME_FUNC_OFFSET( 9112, glFenceSync, glFenceSync, NULL, _gloffset_FenceSync),
+    NAME_FUNC_OFFSET( 9124, glGetInteger64v, glGetInteger64v, NULL, _gloffset_GetInteger64v),
+    NAME_FUNC_OFFSET( 9140, glGetSynciv, glGetSynciv, NULL, _gloffset_GetSynciv),
+    NAME_FUNC_OFFSET( 9152, glIsSync, glIsSync, NULL, _gloffset_IsSync),
+    NAME_FUNC_OFFSET( 9161, glWaitSync, glWaitSync, NULL, _gloffset_WaitSync),
+    NAME_FUNC_OFFSET( 9172, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, _gloffset_PolygonOffsetEXT),
+    NAME_FUNC_OFFSET( 9191, gl_dispatch_stub_575, gl_dispatch_stub_575, NULL, _gloffset_GetPixelTexGenParameterfvSGIS),
+    NAME_FUNC_OFFSET( 9223, gl_dispatch_stub_576, gl_dispatch_stub_576, NULL, _gloffset_GetPixelTexGenParameterivSGIS),
+    NAME_FUNC_OFFSET( 9255, gl_dispatch_stub_577, gl_dispatch_stub_577, NULL, _gloffset_PixelTexGenParameterfSGIS),
+    NAME_FUNC_OFFSET( 9283, gl_dispatch_stub_578, gl_dispatch_stub_578, NULL, _gloffset_PixelTexGenParameterfvSGIS),
+    NAME_FUNC_OFFSET( 9312, gl_dispatch_stub_579, gl_dispatch_stub_579, NULL, _gloffset_PixelTexGenParameteriSGIS),
+    NAME_FUNC_OFFSET( 9340, gl_dispatch_stub_580, gl_dispatch_stub_580, NULL, _gloffset_PixelTexGenParameterivSGIS),
+    NAME_FUNC_OFFSET( 9369, gl_dispatch_stub_581, gl_dispatch_stub_581, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET( 9386, gl_dispatch_stub_582, gl_dispatch_stub_582, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET( 9406, glColorPointerEXT, glColorPointerEXT, NULL, _gloffset_ColorPointerEXT),
+    NAME_FUNC_OFFSET( 9424, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, _gloffset_EdgeFlagPointerEXT),
+    NAME_FUNC_OFFSET( 9445, glIndexPointerEXT, glIndexPointerEXT, NULL, _gloffset_IndexPointerEXT),
+    NAME_FUNC_OFFSET( 9463, glNormalPointerEXT, glNormalPointerEXT, NULL, _gloffset_NormalPointerEXT),
+    NAME_FUNC_OFFSET( 9482, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, _gloffset_TexCoordPointerEXT),
+    NAME_FUNC_OFFSET( 9503, glVertexPointerEXT, glVertexPointerEXT, NULL, _gloffset_VertexPointerEXT),
+    NAME_FUNC_OFFSET( 9522, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET( 9543, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET( 9565, glLockArraysEXT, glLockArraysEXT, NULL, _gloffset_LockArraysEXT),
+    NAME_FUNC_OFFSET( 9581, glUnlockArraysEXT, glUnlockArraysEXT, NULL, _gloffset_UnlockArraysEXT),
+    NAME_FUNC_OFFSET( 9599, gl_dispatch_stub_593, gl_dispatch_stub_593, NULL, _gloffset_CullParameterdvEXT),
+    NAME_FUNC_OFFSET( 9620, gl_dispatch_stub_594, gl_dispatch_stub_594, NULL, _gloffset_CullParameterfvEXT),
+    NAME_FUNC_OFFSET( 9641, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET( 9663, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET( 9686, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET( 9708, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET( 9731, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET( 9753, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET( 9776, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET( 9798, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET( 9821, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET( 9843, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET( 9866, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET( 9889, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET( 9913, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET( 9936, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET( 9960, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET( 9983, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(10007, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(10034, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(10055, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(10078, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(10099, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(10114, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(10130, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(10145, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(10161, gl_dispatch_stub_619, gl_dispatch_stub_619, NULL, _gloffset_PixelTexGenSGIX),
+    NAME_FUNC_OFFSET(10179, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(10202, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, _gloffset_FlushVertexArrayRangeNV),
+    NAME_FUNC_OFFSET(10228, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, _gloffset_VertexArrayRangeNV),
+    NAME_FUNC_OFFSET(10249, glCombinerInputNV, glCombinerInputNV, NULL, _gloffset_CombinerInputNV),
+    NAME_FUNC_OFFSET(10267, glCombinerOutputNV, glCombinerOutputNV, NULL, _gloffset_CombinerOutputNV),
+    NAME_FUNC_OFFSET(10286, glCombinerParameterfNV, glCombinerParameterfNV, NULL, _gloffset_CombinerParameterfNV),
+    NAME_FUNC_OFFSET(10309, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, _gloffset_CombinerParameterfvNV),
+    NAME_FUNC_OFFSET(10333, glCombinerParameteriNV, glCombinerParameteriNV, NULL, _gloffset_CombinerParameteriNV),
+    NAME_FUNC_OFFSET(10356, glCombinerParameterivNV, glCombinerParameterivNV, NULL, _gloffset_CombinerParameterivNV),
+    NAME_FUNC_OFFSET(10380, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, _gloffset_FinalCombinerInputNV),
+    NAME_FUNC_OFFSET(10403, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, _gloffset_GetCombinerInputParameterfvNV),
+    NAME_FUNC_OFFSET(10435, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, _gloffset_GetCombinerInputParameterivNV),
+    NAME_FUNC_OFFSET(10467, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, _gloffset_GetCombinerOutputParameterfvNV),
+    NAME_FUNC_OFFSET(10500, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, _gloffset_GetCombinerOutputParameterivNV),
+    NAME_FUNC_OFFSET(10533, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, _gloffset_GetFinalCombinerInputParameterfvNV),
+    NAME_FUNC_OFFSET(10570, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, _gloffset_GetFinalCombinerInputParameterivNV),
+    NAME_FUNC_OFFSET(10607, glResizeBuffersMESA, glResizeBuffersMESA, NULL, _gloffset_ResizeBuffersMESA),
+    NAME_FUNC_OFFSET(10627, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(10645, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(10664, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(10682, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(10701, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(10719, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(10738, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(10756, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(10775, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(10793, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(10812, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(10830, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(10849, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(10867, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(10886, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(10904, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(10923, glWindowPos4dMESA, glWindowPos4dMESA, NULL, _gloffset_WindowPos4dMESA),
+    NAME_FUNC_OFFSET(10941, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, _gloffset_WindowPos4dvMESA),
+    NAME_FUNC_OFFSET(10960, glWindowPos4fMESA, glWindowPos4fMESA, NULL, _gloffset_WindowPos4fMESA),
+    NAME_FUNC_OFFSET(10978, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, _gloffset_WindowPos4fvMESA),
+    NAME_FUNC_OFFSET(10997, glWindowPos4iMESA, glWindowPos4iMESA, NULL, _gloffset_WindowPos4iMESA),
+    NAME_FUNC_OFFSET(11015, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, _gloffset_WindowPos4ivMESA),
+    NAME_FUNC_OFFSET(11034, glWindowPos4sMESA, glWindowPos4sMESA, NULL, _gloffset_WindowPos4sMESA),
+    NAME_FUNC_OFFSET(11052, glWindowPos4svMESA, glWindowPos4svMESA, NULL, _gloffset_WindowPos4svMESA),
+    NAME_FUNC_OFFSET(11071, gl_dispatch_stub_661, gl_dispatch_stub_661, NULL, _gloffset_MultiModeDrawArraysIBM),
+    NAME_FUNC_OFFSET(11096, gl_dispatch_stub_662, gl_dispatch_stub_662, NULL, _gloffset_MultiModeDrawElementsIBM),
+    NAME_FUNC_OFFSET(11123, gl_dispatch_stub_663, gl_dispatch_stub_663, NULL, _gloffset_DeleteFencesNV),
+    NAME_FUNC_OFFSET(11140, gl_dispatch_stub_664, gl_dispatch_stub_664, NULL, _gloffset_FinishFenceNV),
+    NAME_FUNC_OFFSET(11156, gl_dispatch_stub_665, gl_dispatch_stub_665, NULL, _gloffset_GenFencesNV),
+    NAME_FUNC_OFFSET(11170, gl_dispatch_stub_666, gl_dispatch_stub_666, NULL, _gloffset_GetFenceivNV),
+    NAME_FUNC_OFFSET(11185, gl_dispatch_stub_667, gl_dispatch_stub_667, NULL, _gloffset_IsFenceNV),
+    NAME_FUNC_OFFSET(11197, gl_dispatch_stub_668, gl_dispatch_stub_668, NULL, _gloffset_SetFenceNV),
+    NAME_FUNC_OFFSET(11210, gl_dispatch_stub_669, gl_dispatch_stub_669, NULL, _gloffset_TestFenceNV),
+    NAME_FUNC_OFFSET(11224, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, _gloffset_AreProgramsResidentNV),
+    NAME_FUNC_OFFSET(11248, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(11264, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(11283, glExecuteProgramNV, glExecuteProgramNV, NULL, _gloffset_ExecuteProgramNV),
+    NAME_FUNC_OFFSET(11302, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(11318, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, _gloffset_GetProgramParameterdvNV),
+    NAME_FUNC_OFFSET(11344, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, _gloffset_GetProgramParameterfvNV),
+    NAME_FUNC_OFFSET(11370, glGetProgramStringNV, glGetProgramStringNV, NULL, _gloffset_GetProgramStringNV),
+    NAME_FUNC_OFFSET(11391, glGetProgramivNV, glGetProgramivNV, NULL, _gloffset_GetProgramivNV),
+    NAME_FUNC_OFFSET(11408, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, _gloffset_GetTrackMatrixivNV),
+    NAME_FUNC_OFFSET(11429, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(11457, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, _gloffset_GetVertexAttribdvNV),
+    NAME_FUNC_OFFSET(11479, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, _gloffset_GetVertexAttribfvNV),
+    NAME_FUNC_OFFSET(11501, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, _gloffset_GetVertexAttribivNV),
+    NAME_FUNC_OFFSET(11523, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(11537, glLoadProgramNV, glLoadProgramNV, NULL, _gloffset_LoadProgramNV),
+    NAME_FUNC_OFFSET(11553, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, _gloffset_ProgramParameters4dvNV),
+    NAME_FUNC_OFFSET(11578, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, _gloffset_ProgramParameters4fvNV),
+    NAME_FUNC_OFFSET(11603, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, _gloffset_RequestResidentProgramsNV),
+    NAME_FUNC_OFFSET(11631, glTrackMatrixNV, glTrackMatrixNV, NULL, _gloffset_TrackMatrixNV),
+    NAME_FUNC_OFFSET(11647, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, _gloffset_VertexAttrib1dNV),
+    NAME_FUNC_OFFSET(11666, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, _gloffset_VertexAttrib1dvNV),
+    NAME_FUNC_OFFSET(11686, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, _gloffset_VertexAttrib1fNV),
+    NAME_FUNC_OFFSET(11705, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, _gloffset_VertexAttrib1fvNV),
+    NAME_FUNC_OFFSET(11725, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, _gloffset_VertexAttrib1sNV),
+    NAME_FUNC_OFFSET(11744, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, _gloffset_VertexAttrib1svNV),
+    NAME_FUNC_OFFSET(11764, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, _gloffset_VertexAttrib2dNV),
+    NAME_FUNC_OFFSET(11783, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, _gloffset_VertexAttrib2dvNV),
+    NAME_FUNC_OFFSET(11803, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, _gloffset_VertexAttrib2fNV),
+    NAME_FUNC_OFFSET(11822, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, _gloffset_VertexAttrib2fvNV),
+    NAME_FUNC_OFFSET(11842, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, _gloffset_VertexAttrib2sNV),
+    NAME_FUNC_OFFSET(11861, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, _gloffset_VertexAttrib2svNV),
+    NAME_FUNC_OFFSET(11881, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, _gloffset_VertexAttrib3dNV),
+    NAME_FUNC_OFFSET(11900, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, _gloffset_VertexAttrib3dvNV),
+    NAME_FUNC_OFFSET(11920, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, _gloffset_VertexAttrib3fNV),
+    NAME_FUNC_OFFSET(11939, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, _gloffset_VertexAttrib3fvNV),
+    NAME_FUNC_OFFSET(11959, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, _gloffset_VertexAttrib3sNV),
+    NAME_FUNC_OFFSET(11978, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, _gloffset_VertexAttrib3svNV),
+    NAME_FUNC_OFFSET(11998, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, _gloffset_VertexAttrib4dNV),
+    NAME_FUNC_OFFSET(12017, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, _gloffset_VertexAttrib4dvNV),
+    NAME_FUNC_OFFSET(12037, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, _gloffset_VertexAttrib4fNV),
+    NAME_FUNC_OFFSET(12056, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, _gloffset_VertexAttrib4fvNV),
+    NAME_FUNC_OFFSET(12076, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, _gloffset_VertexAttrib4sNV),
+    NAME_FUNC_OFFSET(12095, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, _gloffset_VertexAttrib4svNV),
+    NAME_FUNC_OFFSET(12115, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, _gloffset_VertexAttrib4ubNV),
+    NAME_FUNC_OFFSET(12135, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, _gloffset_VertexAttrib4ubvNV),
+    NAME_FUNC_OFFSET(12156, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, _gloffset_VertexAttribPointerNV),
+    NAME_FUNC_OFFSET(12180, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, _gloffset_VertexAttribs1dvNV),
+    NAME_FUNC_OFFSET(12201, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, _gloffset_VertexAttribs1fvNV),
+    NAME_FUNC_OFFSET(12222, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, _gloffset_VertexAttribs1svNV),
+    NAME_FUNC_OFFSET(12243, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, _gloffset_VertexAttribs2dvNV),
+    NAME_FUNC_OFFSET(12264, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, _gloffset_VertexAttribs2fvNV),
+    NAME_FUNC_OFFSET(12285, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, _gloffset_VertexAttribs2svNV),
+    NAME_FUNC_OFFSET(12306, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, _gloffset_VertexAttribs3dvNV),
+    NAME_FUNC_OFFSET(12327, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, _gloffset_VertexAttribs3fvNV),
+    NAME_FUNC_OFFSET(12348, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, _gloffset_VertexAttribs3svNV),
+    NAME_FUNC_OFFSET(12369, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, _gloffset_VertexAttribs4dvNV),
+    NAME_FUNC_OFFSET(12390, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, _gloffset_VertexAttribs4fvNV),
+    NAME_FUNC_OFFSET(12411, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, _gloffset_VertexAttribs4svNV),
+    NAME_FUNC_OFFSET(12432, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, _gloffset_VertexAttribs4ubvNV),
+    NAME_FUNC_OFFSET(12454, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, _gloffset_GetTexBumpParameterfvATI),
+    NAME_FUNC_OFFSET(12481, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, _gloffset_GetTexBumpParameterivATI),
+    NAME_FUNC_OFFSET(12508, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, _gloffset_TexBumpParameterfvATI),
+    NAME_FUNC_OFFSET(12532, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, _gloffset_TexBumpParameterivATI),
+    NAME_FUNC_OFFSET(12556, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, _gloffset_AlphaFragmentOp1ATI),
+    NAME_FUNC_OFFSET(12578, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, _gloffset_AlphaFragmentOp2ATI),
+    NAME_FUNC_OFFSET(12600, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, _gloffset_AlphaFragmentOp3ATI),
+    NAME_FUNC_OFFSET(12622, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, _gloffset_BeginFragmentShaderATI),
+    NAME_FUNC_OFFSET(12647, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, _gloffset_BindFragmentShaderATI),
+    NAME_FUNC_OFFSET(12671, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, _gloffset_ColorFragmentOp1ATI),
+    NAME_FUNC_OFFSET(12693, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, _gloffset_ColorFragmentOp2ATI),
+    NAME_FUNC_OFFSET(12715, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, _gloffset_ColorFragmentOp3ATI),
+    NAME_FUNC_OFFSET(12737, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, _gloffset_DeleteFragmentShaderATI),
+    NAME_FUNC_OFFSET(12763, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, _gloffset_EndFragmentShaderATI),
+    NAME_FUNC_OFFSET(12786, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, _gloffset_GenFragmentShadersATI),
+    NAME_FUNC_OFFSET(12810, glPassTexCoordATI, glPassTexCoordATI, NULL, _gloffset_PassTexCoordATI),
+    NAME_FUNC_OFFSET(12828, glSampleMapATI, glSampleMapATI, NULL, _gloffset_SampleMapATI),
+    NAME_FUNC_OFFSET(12843, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, _gloffset_SetFragmentShaderConstantATI),
+    NAME_FUNC_OFFSET(12874, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(12894, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(12915, gl_dispatch_stub_750, gl_dispatch_stub_750, NULL, _gloffset_ActiveStencilFaceEXT),
+    NAME_FUNC_OFFSET(12938, gl_dispatch_stub_751, gl_dispatch_stub_751, NULL, _gloffset_BindVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(12961, gl_dispatch_stub_752, gl_dispatch_stub_752, NULL, _gloffset_DeleteVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(12987, gl_dispatch_stub_753, gl_dispatch_stub_753, NULL, _gloffset_GenVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(13010, gl_dispatch_stub_754, gl_dispatch_stub_754, NULL, _gloffset_IsVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(13031, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, _gloffset_GetProgramNamedParameterdvNV),
+    NAME_FUNC_OFFSET(13062, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, _gloffset_GetProgramNamedParameterfvNV),
+    NAME_FUNC_OFFSET(13093, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, _gloffset_ProgramNamedParameter4dNV),
+    NAME_FUNC_OFFSET(13121, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, _gloffset_ProgramNamedParameter4dvNV),
+    NAME_FUNC_OFFSET(13150, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, _gloffset_ProgramNamedParameter4fNV),
+    NAME_FUNC_OFFSET(13178, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, _gloffset_ProgramNamedParameter4fvNV),
+    NAME_FUNC_OFFSET(13207, gl_dispatch_stub_761, gl_dispatch_stub_761, NULL, _gloffset_DepthBoundsEXT),
+    NAME_FUNC_OFFSET(13224, gl_dispatch_stub_762, gl_dispatch_stub_762, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(13251, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(13272, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(13294, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(13322, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(13346, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13371, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(13400, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(13426, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(13452, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(13478, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(13499, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(13521, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(13541, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(13582, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(13614, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(13633, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(13653, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(13678, gl_dispatch_stub_780, gl_dispatch_stub_780, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(13699, gl_dispatch_stub_781, gl_dispatch_stub_781, NULL, _gloffset_BufferParameteriAPPLE),
+    NAME_FUNC_OFFSET(13723, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL, _gloffset_FlushMappedBufferRangeAPPLE),
+    NAME_FUNC_OFFSET(13753, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(13782, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
+    NAME_FUNC_OFFSET(13803, gl_dispatch_stub_785, gl_dispatch_stub_785, NULL, _gloffset_GetTexParameterPointervAPPLE),
+    NAME_FUNC_OFFSET(13834, gl_dispatch_stub_786, gl_dispatch_stub_786, NULL, _gloffset_TextureRangeAPPLE),
+    NAME_FUNC_OFFSET(13854, gl_dispatch_stub_787, gl_dispatch_stub_787, NULL, _gloffset_StencilFuncSeparateATI),
+    NAME_FUNC_OFFSET(13879, gl_dispatch_stub_788, gl_dispatch_stub_788, NULL, _gloffset_ProgramEnvParameters4fvEXT),
+    NAME_FUNC_OFFSET(13908, gl_dispatch_stub_789, gl_dispatch_stub_789, NULL, _gloffset_ProgramLocalParameters4fvEXT),
+    NAME_FUNC_OFFSET(13939, gl_dispatch_stub_790, gl_dispatch_stub_790, NULL, _gloffset_GetQueryObjecti64vEXT),
+    NAME_FUNC_OFFSET(13963, gl_dispatch_stub_791, gl_dispatch_stub_791, NULL, _gloffset_GetQueryObjectui64vEXT),
+    NAME_FUNC_OFFSET(13988, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
+    NAME_FUNC_OFFSET(14006, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
+    NAME_FUNC_OFFSET(14023, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
+    NAME_FUNC_OFFSET(14039, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
+    NAME_FUNC_OFFSET(14064, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
+    NAME_FUNC_OFFSET(14084, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
+    NAME_FUNC_OFFSET(14104, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
+    NAME_FUNC_OFFSET(14127, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
+    NAME_FUNC_OFFSET(14150, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
+    NAME_FUNC_OFFSET(14170, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
+    NAME_FUNC_OFFSET(14187, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
+    NAME_FUNC_OFFSET(14204, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
+    NAME_FUNC_OFFSET(14219, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
+    NAME_FUNC_OFFSET(14243, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
+    NAME_FUNC_OFFSET(14262, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
+    NAME_FUNC_OFFSET(14281, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
+    NAME_FUNC_OFFSET(14297, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
+    NAME_FUNC_OFFSET(14316, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
+    NAME_FUNC_OFFSET(14339, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14355, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14371, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
+    NAME_FUNC_OFFSET(14398, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
+    NAME_FUNC_OFFSET(14425, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
+    NAME_FUNC_OFFSET(14445, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14464, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14483, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14513, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14543, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14573, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14603, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
+    NAME_FUNC_OFFSET(14622, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
+    NAME_FUNC_OFFSET(14645, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14670, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14695, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
+    NAME_FUNC_OFFSET(14722, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14750, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
+    NAME_FUNC_OFFSET(14777, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14805, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
+    NAME_FUNC_OFFSET(14834, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
+    NAME_FUNC_OFFSET(14863, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
+    NAME_FUNC_OFFSET(14889, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
+    NAME_FUNC_OFFSET(14920, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
+    NAME_FUNC_OFFSET(14951, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
+    NAME_FUNC_OFFSET(14975, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
+    NAME_FUNC_OFFSET(14998, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
+    NAME_FUNC_OFFSET(15016, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
+    NAME_FUNC_OFFSET(15045, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
+    NAME_FUNC_OFFSET(15074, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
+    NAME_FUNC_OFFSET(15089, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
+    NAME_FUNC_OFFSET(15115, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
+    NAME_FUNC_OFFSET(15141, glHistogram, glHistogram, NULL, _gloffset_Histogram),
+    NAME_FUNC_OFFSET(15156, glMinmax, glMinmax, NULL, _gloffset_Minmax),
+    NAME_FUNC_OFFSET(15168, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
+    NAME_FUNC_OFFSET(15188, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
+    NAME_FUNC_OFFSET(15205, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
+    NAME_FUNC_OFFSET(15221, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
+    NAME_FUNC_OFFSET(15240, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
+    NAME_FUNC_OFFSET(15263, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
+    NAME_FUNC_OFFSET(15279, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
+    NAME_FUNC_OFFSET(15301, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
+    NAME_FUNC_OFFSET(15319, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
+    NAME_FUNC_OFFSET(15338, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
+    NAME_FUNC_OFFSET(15356, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
+    NAME_FUNC_OFFSET(15375, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
+    NAME_FUNC_OFFSET(15393, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
+    NAME_FUNC_OFFSET(15412, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
+    NAME_FUNC_OFFSET(15430, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
+    NAME_FUNC_OFFSET(15449, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
+    NAME_FUNC_OFFSET(15467, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
+    NAME_FUNC_OFFSET(15486, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
+    NAME_FUNC_OFFSET(15504, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
+    NAME_FUNC_OFFSET(15523, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
+    NAME_FUNC_OFFSET(15541, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
+    NAME_FUNC_OFFSET(15560, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
+    NAME_FUNC_OFFSET(15578, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
+    NAME_FUNC_OFFSET(15597, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
+    NAME_FUNC_OFFSET(15615, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
+    NAME_FUNC_OFFSET(15634, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
+    NAME_FUNC_OFFSET(15652, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
+    NAME_FUNC_OFFSET(15671, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
+    NAME_FUNC_OFFSET(15689, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
+    NAME_FUNC_OFFSET(15708, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
+    NAME_FUNC_OFFSET(15726, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
+    NAME_FUNC_OFFSET(15745, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
+    NAME_FUNC_OFFSET(15763, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
+    NAME_FUNC_OFFSET(15782, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
+    NAME_FUNC_OFFSET(15800, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
+    NAME_FUNC_OFFSET(15819, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
+    NAME_FUNC_OFFSET(15837, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
+    NAME_FUNC_OFFSET(15856, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
+    NAME_FUNC_OFFSET(15874, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
+    NAME_FUNC_OFFSET(15893, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
+    NAME_FUNC_OFFSET(15916, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15939, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(15962, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(15985, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(16008, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
+    NAME_FUNC_OFFSET(16025, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
+    NAME_FUNC_OFFSET(16048, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
+    NAME_FUNC_OFFSET(16071, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
+    NAME_FUNC_OFFSET(16094, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
+    NAME_FUNC_OFFSET(16120, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
+    NAME_FUNC_OFFSET(16146, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
+    NAME_FUNC_OFFSET(16172, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
+    NAME_FUNC_OFFSET(16196, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(16223, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(16249, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
+    NAME_FUNC_OFFSET(16269, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
+    NAME_FUNC_OFFSET(16289, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
+    NAME_FUNC_OFFSET(16309, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
+    NAME_FUNC_OFFSET(16332, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
+    NAME_FUNC_OFFSET(16356, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
+    NAME_FUNC_OFFSET(16379, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
+    NAME_FUNC_OFFSET(16403, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
+    NAME_FUNC_OFFSET(16420, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
+    NAME_FUNC_OFFSET(16438, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
+    NAME_FUNC_OFFSET(16455, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
+    NAME_FUNC_OFFSET(16473, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
+    NAME_FUNC_OFFSET(16490, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
+    NAME_FUNC_OFFSET(16508, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
+    NAME_FUNC_OFFSET(16525, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
+    NAME_FUNC_OFFSET(16543, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
+    NAME_FUNC_OFFSET(16560, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
+    NAME_FUNC_OFFSET(16578, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
+    NAME_FUNC_OFFSET(16595, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
+    NAME_FUNC_OFFSET(16613, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
+    NAME_FUNC_OFFSET(16630, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
+    NAME_FUNC_OFFSET(16648, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
+    NAME_FUNC_OFFSET(16665, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
+    NAME_FUNC_OFFSET(16683, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
+    NAME_FUNC_OFFSET(16700, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
+    NAME_FUNC_OFFSET(16718, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
+    NAME_FUNC_OFFSET(16737, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
+    NAME_FUNC_OFFSET(16756, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
+    NAME_FUNC_OFFSET(16775, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
+    NAME_FUNC_OFFSET(16794, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
+    NAME_FUNC_OFFSET(16814, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
+    NAME_FUNC_OFFSET(16834, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
+    NAME_FUNC_OFFSET(16854, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
+    NAME_FUNC_OFFSET(16872, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
+    NAME_FUNC_OFFSET(16889, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
+    NAME_FUNC_OFFSET(16907, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
+    NAME_FUNC_OFFSET(16924, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
+    NAME_FUNC_OFFSET(16942, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
+    NAME_FUNC_OFFSET(16960, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
+    NAME_FUNC_OFFSET(16977, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
+    NAME_FUNC_OFFSET(16995, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
+    NAME_FUNC_OFFSET(17014, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
+    NAME_FUNC_OFFSET(17033, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
+    NAME_FUNC_OFFSET(17052, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
+    NAME_FUNC_OFFSET(17074, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
+    NAME_FUNC_OFFSET(17087, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
+    NAME_FUNC_OFFSET(17100, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
+    NAME_FUNC_OFFSET(17116, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
+    NAME_FUNC_OFFSET(17132, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
+    NAME_FUNC_OFFSET(17145, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
+    NAME_FUNC_OFFSET(17168, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
+    NAME_FUNC_OFFSET(17188, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
+    NAME_FUNC_OFFSET(17207, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
+    NAME_FUNC_OFFSET(17218, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
+    NAME_FUNC_OFFSET(17230, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
+    NAME_FUNC_OFFSET(17244, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
+    NAME_FUNC_OFFSET(17257, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
+    NAME_FUNC_OFFSET(17273, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
+    NAME_FUNC_OFFSET(17284, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
+    NAME_FUNC_OFFSET(17297, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
+    NAME_FUNC_OFFSET(17316, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
+    NAME_FUNC_OFFSET(17336, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
+    NAME_FUNC_OFFSET(17349, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
+    NAME_FUNC_OFFSET(17359, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
+    NAME_FUNC_OFFSET(17375, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
+    NAME_FUNC_OFFSET(17394, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
+    NAME_FUNC_OFFSET(17412, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
+    NAME_FUNC_OFFSET(17433, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
+    NAME_FUNC_OFFSET(17448, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
+    NAME_FUNC_OFFSET(17463, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
+    NAME_FUNC_OFFSET(17477, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
+    NAME_FUNC_OFFSET(17492, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
+    NAME_FUNC_OFFSET(17504, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
+    NAME_FUNC_OFFSET(17517, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
+    NAME_FUNC_OFFSET(17529, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
+    NAME_FUNC_OFFSET(17542, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
+    NAME_FUNC_OFFSET(17554, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
+    NAME_FUNC_OFFSET(17567, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
+    NAME_FUNC_OFFSET(17579, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
+    NAME_FUNC_OFFSET(17592, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
+    NAME_FUNC_OFFSET(17604, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
+    NAME_FUNC_OFFSET(17617, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
+    NAME_FUNC_OFFSET(17629, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
+    NAME_FUNC_OFFSET(17642, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
+    NAME_FUNC_OFFSET(17654, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
+    NAME_FUNC_OFFSET(17667, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
+    NAME_FUNC_OFFSET(17679, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
+    NAME_FUNC_OFFSET(17692, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
+    NAME_FUNC_OFFSET(17711, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
+    NAME_FUNC_OFFSET(17730, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
+    NAME_FUNC_OFFSET(17749, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
+    NAME_FUNC_OFFSET(17762, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
+    NAME_FUNC_OFFSET(17780, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
+    NAME_FUNC_OFFSET(17801, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
+    NAME_FUNC_OFFSET(17819, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
+    NAME_FUNC_OFFSET(17839, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17853, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(17870, gl_dispatch_stub_581, gl_dispatch_stub_581, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET(17886, gl_dispatch_stub_582, gl_dispatch_stub_582, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET(17905, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17923, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17944, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(17966, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(17985, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(18007, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(18030, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET(18049, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET(18069, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET(18088, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET(18108, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET(18127, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET(18147, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET(18166, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET(18186, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET(18205, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET(18225, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET(18245, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET(18266, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET(18286, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET(18307, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET(18327, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(18348, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(18372, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(18390, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(18410, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(18428, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(18440, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(18453, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(18465, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(18478, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18498, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18522, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18536, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18553, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18568, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18586, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18600, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18617, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18632, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(18650, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18664, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(18681, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18696, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(18714, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18728, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(18745, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18760, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(18778, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18792, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(18809, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18824, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(18842, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18856, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(18873, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18888, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(18906, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18920, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(18937, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18952, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(18970, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(18984, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(19001, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(19016, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(19034, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(19051, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(19071, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(19088, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(19114, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(19143, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(19158, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(19176, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(19195, gl_dispatch_stub_752, gl_dispatch_stub_752, NULL, _gloffset_DeleteVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(19216, gl_dispatch_stub_754, gl_dispatch_stub_754, NULL, _gloffset_IsVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(19232, gl_dispatch_stub_762, gl_dispatch_stub_762, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(19256, gl_dispatch_stub_762, gl_dispatch_stub_762, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(19283, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(19301, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(19320, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(19345, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(19366, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19388, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(19414, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(19437, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(19460, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(19483, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(19501, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19520, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(19537, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(19575, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(19604, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(19620, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(19637, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(19659, gl_dispatch_stub_780, gl_dispatch_stub_780, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(19677, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index ad40bb6e78..9f650dadd3 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -82,6 +82,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ALPHA_TEST\0"
    "GL_ALPHA_TEST_FUNC\0"
    "GL_ALPHA_TEST_REF\0"
+   "GL_ALREADY_SIGNALED\0"
    "GL_ALWAYS\0"
    "GL_AMBIENT\0"
    "GL_AMBIENT_AND_DIFFUSE\0"
@@ -305,6 +306,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_COMPRESSED_SRGB\0"
    "GL_COMPRESSED_SRGB_ALPHA\0"
    "GL_COMPRESSED_TEXTURE_FORMATS\0"
+   "GL_CONDITION_SATISFIED\0"
    "GL_CONSTANT\0"
    "GL_CONSTANT_ALPHA\0"
    "GL_CONSTANT_ALPHA_EXT\0"
@@ -944,6 +946,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_RECTANGLE_TEXTURE_SIZE_NV\0"
    "GL_MAX_RENDERBUFFER_SIZE_EXT\0"
    "GL_MAX_SAMPLES\0"
+   "GL_MAX_SERVER_WAIT_TIMEOUT\0"
    "GL_MAX_SHININESS_NV\0"
    "GL_MAX_SPOT_EXPONENT_NV\0"
    "GL_MAX_TEXTURE_COORDS\0"
@@ -1072,6 +1075,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_OBJECT_PLANE\0"
    "GL_OBJECT_SHADER_SOURCE_LENGTH_ARB\0"
    "GL_OBJECT_SUBTYPE_ARB\0"
+   "GL_OBJECT_TYPE\0"
    "GL_OBJECT_TYPE_ARB\0"
    "GL_OBJECT_VALIDATE_STATUS_ARB\0"
    "GL_OCCLUSION_TEST_HP\0"
@@ -1452,6 +1456,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_SHARED_TEXTURE_PALETTE_EXT\0"
    "GL_SHININESS\0"
    "GL_SHORT\0"
+   "GL_SIGNALED\0"
    "GL_SIGNED_NORMALIZED\0"
    "GL_SINGLE_COLOR\0"
    "GL_SINGLE_COLOR_EXT\0"
@@ -1556,6 +1561,12 @@ LONGSTRING static const char enum_string_table[] =
    "GL_SUBPIXEL_BITS\0"
    "GL_SUBTRACT\0"
    "GL_SUBTRACT_ARB\0"
+   "GL_SYNC_CONDITION\0"
+   "GL_SYNC_FENCE\0"
+   "GL_SYNC_FLAGS\0"
+   "GL_SYNC_FLUSH_COMMANDS_BIT\0"
+   "GL_SYNC_GPU_COMMANDS_COMPLETE\0"
+   "GL_SYNC_STATUS\0"
    "GL_T\0"
    "GL_T2F_C3F_V3F\0"
    "GL_T2F_C4F_N3F_V3F\0"
@@ -1752,6 +1763,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_WRAP_R\0"
    "GL_TEXTURE_WRAP_S\0"
    "GL_TEXTURE_WRAP_T\0"
+   "GL_TIMEOUT_EXPIRED\0"
+   "GL_TIMEOUT_IGNORED\0"
    "GL_TIME_ELAPSED_EXT\0"
    "GL_TRACK_MATRIX_NV\0"
    "GL_TRACK_MATRIX_TRANSFORM_NV\0"
@@ -1779,6 +1792,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_UNPACK_SKIP_PIXELS\0"
    "GL_UNPACK_SKIP_ROWS\0"
    "GL_UNPACK_SWAP_BYTES\0"
+   "GL_UNSIGNALED\0"
    "GL_UNSIGNED_BYTE\0"
    "GL_UNSIGNED_BYTE_2_3_3_REV\0"
    "GL_UNSIGNED_BYTE_3_3_2\0"
@@ -1861,6 +1875,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_VERTEX_STATE_PROGRAM_NV\0"
    "GL_VIEWPORT\0"
    "GL_VIEWPORT_BIT\0"
+   "GL_WAIT_FAILED\0"
    "GL_WEIGHT_ARRAY_ARB\0"
    "GL_WEIGHT_ARRAY_BUFFER_BINDING\0"
    "GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB\0"
@@ -1880,7 +1895,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1842] =
+static const enum_elt all_enums[1857] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -1928,3139 +1943,3168 @@ static const enum_elt all_enums[1842] =
    {   728, 0x00000BC0 }, /* GL_ALPHA_TEST */
    {   742, 0x00000BC1 }, /* GL_ALPHA_TEST_FUNC */
    {   761, 0x00000BC2 }, /* GL_ALPHA_TEST_REF */
-   {   779, 0x00000207 }, /* GL_ALWAYS */
-   {   789, 0x00001200 }, /* GL_AMBIENT */
-   {   800, 0x00001602 }, /* GL_AMBIENT_AND_DIFFUSE */
-   {   823, 0x00001501 }, /* GL_AND */
-   {   830, 0x00001504 }, /* GL_AND_INVERTED */
-   {   846, 0x00001502 }, /* GL_AND_REVERSE */
-   {   861, 0x00008892 }, /* GL_ARRAY_BUFFER */
-   {   877, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING */
-   {   901, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING_ARB */
-   {   929, 0x00008B85 }, /* GL_ATTACHED_SHADERS */
-   {   949, 0x00008645 }, /* GL_ATTRIB_ARRAY_POINTER_NV */
-   {   976, 0x00008623 }, /* GL_ATTRIB_ARRAY_SIZE_NV */
-   {  1000, 0x00008624 }, /* GL_ATTRIB_ARRAY_STRIDE_NV */
-   {  1026, 0x00008625 }, /* GL_ATTRIB_ARRAY_TYPE_NV */
-   {  1050, 0x00000BB0 }, /* GL_ATTRIB_STACK_DEPTH */
-   {  1072, 0x00000D80 }, /* GL_AUTO_NORMAL */
-   {  1087, 0x00000409 }, /* GL_AUX0 */
-   {  1095, 0x0000040A }, /* GL_AUX1 */
-   {  1103, 0x0000040B }, /* GL_AUX2 */
-   {  1111, 0x0000040C }, /* GL_AUX3 */
-   {  1119, 0x00000C00 }, /* GL_AUX_BUFFERS */
-   {  1134, 0x00000405 }, /* GL_BACK */
-   {  1142, 0x00000402 }, /* GL_BACK_LEFT */
-   {  1155, 0x00000403 }, /* GL_BACK_RIGHT */
-   {  1169, 0x000080E0 }, /* GL_BGR */
-   {  1176, 0x000080E1 }, /* GL_BGRA */
-   {  1184, 0x00001A00 }, /* GL_BITMAP */
-   {  1194, 0x00000704 }, /* GL_BITMAP_TOKEN */
-   {  1210, 0x00000BE2 }, /* GL_BLEND */
-   {  1219, 0x00008005 }, /* GL_BLEND_COLOR */
-   {  1234, 0x00008005 }, /* GL_BLEND_COLOR_EXT */
-   {  1253, 0x00000BE0 }, /* GL_BLEND_DST */
-   {  1266, 0x000080CA }, /* GL_BLEND_DST_ALPHA */
-   {  1285, 0x000080C8 }, /* GL_BLEND_DST_RGB */
-   {  1302, 0x00008009 }, /* GL_BLEND_EQUATION */
-   {  1320, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA */
-   {  1344, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_EXT */
-   {  1372, 0x00008009 }, /* GL_BLEND_EQUATION_EXT */
-   {  1394, 0x00008009 }, /* GL_BLEND_EQUATION_RGB */
-   {  1416, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_EXT */
-   {  1442, 0x00000BE1 }, /* GL_BLEND_SRC */
-   {  1455, 0x000080CB }, /* GL_BLEND_SRC_ALPHA */
-   {  1474, 0x000080C9 }, /* GL_BLEND_SRC_RGB */
-   {  1491, 0x00001905 }, /* GL_BLUE */
-   {  1499, 0x00000D1B }, /* GL_BLUE_BIAS */
-   {  1512, 0x00000D54 }, /* GL_BLUE_BITS */
-   {  1525, 0x00000D1A }, /* GL_BLUE_SCALE */
-   {  1539, 0x00008B56 }, /* GL_BOOL */
-   {  1547, 0x00008B56 }, /* GL_BOOL_ARB */
-   {  1559, 0x00008B57 }, /* GL_BOOL_VEC2 */
-   {  1572, 0x00008B57 }, /* GL_BOOL_VEC2_ARB */
-   {  1589, 0x00008B58 }, /* GL_BOOL_VEC3 */
-   {  1602, 0x00008B58 }, /* GL_BOOL_VEC3_ARB */
-   {  1619, 0x00008B59 }, /* GL_BOOL_VEC4 */
-   {  1632, 0x00008B59 }, /* GL_BOOL_VEC4_ARB */
-   {  1649, 0x000088BB }, /* GL_BUFFER_ACCESS */
-   {  1666, 0x000088BB }, /* GL_BUFFER_ACCESS_ARB */
-   {  1687, 0x00008A13 }, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-   {  1718, 0x000088BC }, /* GL_BUFFER_MAPPED */
-   {  1735, 0x000088BC }, /* GL_BUFFER_MAPPED_ARB */
-   {  1756, 0x000088BD }, /* GL_BUFFER_MAP_POINTER */
-   {  1778, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_ARB */
-   {  1804, 0x00008A12 }, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
-   {  1838, 0x00008764 }, /* GL_BUFFER_SIZE */
-   {  1853, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */
-   {  1872, 0x00008765 }, /* GL_BUFFER_USAGE */
-   {  1888, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */
-   {  1908, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */
-   {  1927, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */
-   {  1953, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */
-   {  1976, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
-   {  2004, 0x0000877C }, /* GL_BUMP_TARGET_ATI */
-   {  2023, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */
-   {  2045, 0x00001400 }, /* GL_BYTE */
-   {  2053, 0x00002A24 }, /* GL_C3F_V3F */
-   {  2064, 0x00002A26 }, /* GL_C4F_N3F_V3F */
-   {  2079, 0x00002A22 }, /* GL_C4UB_V2F */
-   {  2091, 0x00002A23 }, /* GL_C4UB_V3F */
-   {  2103, 0x00000901 }, /* GL_CCW */
-   {  2110, 0x00002900 }, /* GL_CLAMP */
-   {  2119, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
-   {  2138, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
-   {  2161, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
-   {  2185, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
-   {  2202, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
-   {  2224, 0x00001500 }, /* GL_CLEAR */
-   {  2233, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
-   {  2258, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
-   {  2287, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
-   {  2313, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
-   {  2342, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
-   {  2368, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
-   {  2395, 0x00003000 }, /* GL_CLIP_PLANE0 */
-   {  2410, 0x00003001 }, /* GL_CLIP_PLANE1 */
-   {  2425, 0x00003002 }, /* GL_CLIP_PLANE2 */
-   {  2440, 0x00003003 }, /* GL_CLIP_PLANE3 */
-   {  2455, 0x00003004 }, /* GL_CLIP_PLANE4 */
-   {  2470, 0x00003005 }, /* GL_CLIP_PLANE5 */
-   {  2485, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-   {  2518, 0x00000A00 }, /* GL_COEFF */
-   {  2527, 0x00001800 }, /* GL_COLOR */
-   {  2536, 0x00008076 }, /* GL_COLOR_ARRAY */
-   {  2551, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-   {  2581, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   {  2615, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
-   {  2638, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
-   {  2658, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
-   {  2680, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
-   {  2700, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
-   {  2721, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
-   {  2746, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
-   {  2767, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
-   {  2789, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
-   {  2815, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
-   {  2837, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
-   {  2863, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
-   {  2885, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
-   {  2911, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
-   {  2933, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
-   {  2959, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
-   {  2981, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
-   {  3007, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
-   {  3029, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
-   {  3055, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
-   {  3080, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
-   {  3101, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
-   {  3126, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
-   {  3147, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
-   {  3172, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
-   {  3193, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
-   {  3218, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
-   {  3239, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
-   {  3264, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
-   {  3285, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
-   {  3310, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
-   {  3331, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
-   {  3356, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
-   {  3377, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
-   {  3402, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
-   {  3423, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
-   {  3448, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
-   {  3468, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
-   {  3489, 0x00001900 }, /* GL_COLOR_INDEX */
-   {  3504, 0x00001603 }, /* GL_COLOR_INDEXES */
-   {  3521, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
-   {  3539, 0x00000B57 }, /* GL_COLOR_MATERIAL */
-   {  3557, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
-   {  3580, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
-   {  3608, 0x000080B1 }, /* GL_COLOR_MATRIX */
-   {  3624, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
-   {  3644, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
-   {  3672, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
-   {  3704, 0x00008458 }, /* GL_COLOR_SUM */
-   {  3717, 0x00008458 }, /* GL_COLOR_SUM_ARB */
-   {  3734, 0x000080D0 }, /* GL_COLOR_TABLE */
-   {  3749, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
-   {  3775, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
-   {  3805, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
-   {  3835, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
-   {  3855, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
-   {  3879, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
-   {  3904, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
-   {  3933, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
-   {  3962, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
-   {  3984, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
-   {  4010, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
-   {  4036, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
-   {  4062, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
-   {  4092, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
-   {  4122, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
-   {  4152, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
-   {  4186, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
-   {  4220, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-   {  4250, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
-   {  4284, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
-   {  4318, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
-   {  4342, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
-   {  4370, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
-   {  4398, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
-   {  4419, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
-   {  4444, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
-   {  4465, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
-   {  4490, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
-   {  4515, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
-   {  4534, 0x00008570 }, /* GL_COMBINE */
-   {  4545, 0x00008503 }, /* GL_COMBINE4 */
-   {  4557, 0x00008572 }, /* GL_COMBINE_ALPHA */
-   {  4574, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
-   {  4595, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
-   {  4616, 0x00008570 }, /* GL_COMBINE_ARB */
-   {  4631, 0x00008570 }, /* GL_COMBINE_EXT */
-   {  4646, 0x00008571 }, /* GL_COMBINE_RGB */
-   {  4661, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
-   {  4680, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
-   {  4699, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
-   {  4735, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
-   {  4759, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
-   {  4787, 0x00001300 }, /* GL_COMPILE */
-   {  4798, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
-   {  4821, 0x00008B81 }, /* GL_COMPILE_STATUS */
-   {  4839, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
-   {  4859, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
-   {  4883, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
-   {  4907, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
-   {  4935, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
-   {  4959, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-   {  4989, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
-   {  5023, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
-   {  5051, 0x000084ED }, /* GL_COMPRESSED_RGB */
-   {  5069, 0x000084EE }, /* GL_COMPRESSED_RGBA */
-   {  5088, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
-   {  5111, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-   {  5140, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-   {  5173, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-   {  5206, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-   {  5239, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
-   {  5261, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-   {  5289, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-   {  5321, 0x00008C4A }, /* GL_COMPRESSED_SLUMINANCE */
-   {  5346, 0x00008C4B }, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-   {  5377, 0x00008C48 }, /* GL_COMPRESSED_SRGB */
-   {  5396, 0x00008C49 }, /* GL_COMPRESSED_SRGB_ALPHA */
-   {  5421, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
-   {  5451, 0x00008576 }, /* GL_CONSTANT */
-   {  5463, 0x00008003 }, /* GL_CONSTANT_ALPHA */
-   {  5481, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
-   {  5503, 0x00008576 }, /* GL_CONSTANT_ARB */
-   {  5519, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
-   {  5543, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
-   {  5565, 0x00008001 }, /* GL_CONSTANT_COLOR */
-   {  5583, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
-   {  5605, 0x00008576 }, /* GL_CONSTANT_EXT */
-   {  5621, 0x00008010 }, /* GL_CONVOLUTION_1D */
-   {  5639, 0x00008011 }, /* GL_CONVOLUTION_2D */
-   {  5657, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
-   {  5685, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
-   {  5716, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
-   {  5743, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
-   {  5774, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
-   {  5801, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
-   {  5832, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
-   {  5860, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
-   {  5892, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
-   {  5914, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
-   {  5940, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
-   {  5962, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
-   {  5988, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
-   {  6009, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
-   {  6034, 0x00008862 }, /* GL_COORD_REPLACE */
-   {  6051, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
-   {  6072, 0x00008862 }, /* GL_COORD_REPLACE_NV */
-   {  6092, 0x00001503 }, /* GL_COPY */
-   {  6100, 0x0000150C }, /* GL_COPY_INVERTED */
-   {  6117, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
-   {  6137, 0x00008F36 }, /* GL_COPY_READ_BUFFER */
-   {  6157, 0x00008F37 }, /* GL_COPY_WRITE_BUFFER */
-   {  6178, 0x00000B44 }, /* GL_CULL_FACE */
-   {  6191, 0x00000B45 }, /* GL_CULL_FACE_MODE */
-   {  6209, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
-   {  6228, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-   {  6260, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-   {  6295, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
-   {  6316, 0x00000001 }, /* GL_CURRENT_BIT */
-   {  6331, 0x00000B00 }, /* GL_CURRENT_COLOR */
-   {  6348, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
-   {  6369, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
-   {  6395, 0x00000B01 }, /* GL_CURRENT_INDEX */
-   {  6412, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
-   {  6434, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
-   {  6462, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
-   {  6483, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-   {  6517, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
-   {  6550, 0x00000B02 }, /* GL_CURRENT_NORMAL */
-   {  6568, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-   {  6598, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
-   {  6617, 0x00008865 }, /* GL_CURRENT_QUERY */
-   {  6634, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
-   {  6655, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
-   {  6679, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
-   {  6706, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
-   {  6730, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
-   {  6757, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
-   {  6790, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
-   {  6824, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-   {  6857, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
-   {  6884, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
-   {  6910, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
-   {  6935, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
-   {  6964, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
-   {  6986, 0x00000900 }, /* GL_CW */
-   {  6992, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
-   {  7013, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
-   {  7034, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
-   {  7054, 0x00002101 }, /* GL_DECAL */
-   {  7063, 0x00001E03 }, /* GL_DECR */
-   {  7071, 0x00008508 }, /* GL_DECR_WRAP */
-   {  7084, 0x00008508 }, /* GL_DECR_WRAP_EXT */
-   {  7101, 0x00008B80 }, /* GL_DELETE_STATUS */
-   {  7118, 0x00001801 }, /* GL_DEPTH */
-   {  7127, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
-   {  7147, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
-   {  7167, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
-   {  7191, 0x00000D1F }, /* GL_DEPTH_BIAS */
-   {  7205, 0x00000D56 }, /* GL_DEPTH_BITS */
-   {  7219, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
-   {  7239, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
-   {  7264, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
-   {  7284, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
-   {  7302, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
-   {  7323, 0x00001902 }, /* GL_DEPTH_COMPONENT */
-   {  7342, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
-   {  7363, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
-   {  7388, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
-   {  7414, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
-   {  7435, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
-   {  7460, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
-   {  7486, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
-   {  7507, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
-   {  7532, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
-   {  7558, 0x00000B74 }, /* GL_DEPTH_FUNC */
-   {  7572, 0x00000B70 }, /* GL_DEPTH_RANGE */
-   {  7587, 0x00000D1E }, /* GL_DEPTH_SCALE */
-   {  7602, 0x000084F9 }, /* GL_DEPTH_STENCIL */
-   {  7619, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
-   {  7647, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
-   {  7667, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-   {  7695, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-   {  7723, 0x00000B71 }, /* GL_DEPTH_TEST */
-   {  7737, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
-   {  7759, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
-   {  7785, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
-   {  7804, 0x00001201 }, /* GL_DIFFUSE */
-   {  7815, 0x00000BD0 }, /* GL_DITHER */
-   {  7825, 0x00000A02 }, /* GL_DOMAIN */
-   {  7835, 0x00001100 }, /* GL_DONT_CARE */
-   {  7848, 0x000086AE }, /* GL_DOT3_RGB */
-   {  7860, 0x000086AF }, /* GL_DOT3_RGBA */
-   {  7873, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
-   {  7890, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
-   {  7907, 0x000086AE }, /* GL_DOT3_RGB_ARB */
-   {  7923, 0x00008740 }, /* GL_DOT3_RGB_EXT */
-   {  7939, 0x0000140A }, /* GL_DOUBLE */
-   {  7949, 0x00000C32 }, /* GL_DOUBLEBUFFER */
-   {  7965, 0x00000C01 }, /* GL_DRAW_BUFFER */
-   {  7980, 0x00008825 }, /* GL_DRAW_BUFFER0 */
-   {  7996, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
-   {  8016, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
-   {  8036, 0x00008826 }, /* GL_DRAW_BUFFER1 */
-   {  8052, 0x0000882F }, /* GL_DRAW_BUFFER10 */
-   {  8069, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
-   {  8090, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
-   {  8111, 0x00008830 }, /* GL_DRAW_BUFFER11 */
-   {  8128, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
-   {  8149, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
-   {  8170, 0x00008831 }, /* GL_DRAW_BUFFER12 */
-   {  8187, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
-   {  8208, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
-   {  8229, 0x00008832 }, /* GL_DRAW_BUFFER13 */
-   {  8246, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
-   {  8267, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
-   {  8288, 0x00008833 }, /* GL_DRAW_BUFFER14 */
-   {  8305, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
-   {  8326, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
-   {  8347, 0x00008834 }, /* GL_DRAW_BUFFER15 */
-   {  8364, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
-   {  8385, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
-   {  8406, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
-   {  8426, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
-   {  8446, 0x00008827 }, /* GL_DRAW_BUFFER2 */
-   {  8462, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
-   {  8482, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
-   {  8502, 0x00008828 }, /* GL_DRAW_BUFFER3 */
-   {  8518, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
-   {  8538, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
-   {  8558, 0x00008829 }, /* GL_DRAW_BUFFER4 */
-   {  8574, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
-   {  8594, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
-   {  8614, 0x0000882A }, /* GL_DRAW_BUFFER5 */
-   {  8630, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
-   {  8650, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
-   {  8670, 0x0000882B }, /* GL_DRAW_BUFFER6 */
-   {  8686, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
-   {  8706, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
-   {  8726, 0x0000882C }, /* GL_DRAW_BUFFER7 */
-   {  8742, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
-   {  8762, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
-   {  8782, 0x0000882D }, /* GL_DRAW_BUFFER8 */
-   {  8798, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
-   {  8818, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
-   {  8838, 0x0000882E }, /* GL_DRAW_BUFFER9 */
-   {  8854, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
-   {  8874, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
-   {  8894, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
-   {  8914, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-   {  8946, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
-   {  8970, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
-   {  8990, 0x00000304 }, /* GL_DST_ALPHA */
-   {  9003, 0x00000306 }, /* GL_DST_COLOR */
-   {  9016, 0x0000877A }, /* GL_DU8DV8_ATI */
-   {  9030, 0x00008779 }, /* GL_DUDV_ATI */
-   {  9042, 0x000088EA }, /* GL_DYNAMIC_COPY */
-   {  9058, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
-   {  9078, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
-   {  9094, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
-   {  9114, 0x000088E9 }, /* GL_DYNAMIC_READ */
-   {  9130, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
-   {  9150, 0x00000B43 }, /* GL_EDGE_FLAG */
-   {  9163, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
-   {  9182, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-   {  9216, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
-   {  9254, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
-   {  9281, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-   {  9307, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
-   {  9331, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-   {  9363, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
-   {  9399, 0x00001600 }, /* GL_EMISSION */
-   {  9411, 0x00002000 }, /* GL_ENABLE_BIT */
-   {  9425, 0x00000202 }, /* GL_EQUAL */
-   {  9434, 0x00001509 }, /* GL_EQUIV */
-   {  9443, 0x00010000 }, /* GL_EVAL_BIT */
-   {  9455, 0x00000800 }, /* GL_EXP */
-   {  9462, 0x00000801 }, /* GL_EXP2 */
-   {  9470, 0x00001F03 }, /* GL_EXTENSIONS */
-   {  9484, 0x00002400 }, /* GL_EYE_LINEAR */
-   {  9498, 0x00002502 }, /* GL_EYE_PLANE */
-   {  9511, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
-   {  9536, 0x0000855B }, /* GL_EYE_RADIAL_NV */
-   {  9553, 0x00000000 }, /* GL_FALSE */
-   {  9562, 0x00001101 }, /* GL_FASTEST */
-   {  9573, 0x00001C01 }, /* GL_FEEDBACK */
-   {  9585, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
-   {  9612, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
-   {  9636, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
-   {  9660, 0x00001B02 }, /* GL_FILL */
-   {  9668, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
-   {  9699, 0x00001D00 }, /* GL_FLAT */
-   {  9707, 0x00001406 }, /* GL_FLOAT */
-   {  9716, 0x00008B5A }, /* GL_FLOAT_MAT2 */
-   {  9730, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
-   {  9748, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
-   {  9764, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
-   {  9780, 0x00008B5B }, /* GL_FLOAT_MAT3 */
-   {  9794, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
-   {  9812, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
-   {  9828, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
-   {  9844, 0x00008B5C }, /* GL_FLOAT_MAT4 */
-   {  9858, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
-   {  9876, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
-   {  9892, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
-   {  9908, 0x00008B50 }, /* GL_FLOAT_VEC2 */
-   {  9922, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
-   {  9940, 0x00008B51 }, /* GL_FLOAT_VEC3 */
-   {  9954, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
-   {  9972, 0x00008B52 }, /* GL_FLOAT_VEC4 */
-   {  9986, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
-   { 10004, 0x00000B60 }, /* GL_FOG */
-   { 10011, 0x00000080 }, /* GL_FOG_BIT */
-   { 10022, 0x00000B66 }, /* GL_FOG_COLOR */
-   { 10035, 0x00008451 }, /* GL_FOG_COORD */
-   { 10048, 0x00008451 }, /* GL_FOG_COORDINATE */
-   { 10066, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
-   { 10090, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-   { 10129, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
-   { 10172, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-   { 10204, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-   { 10235, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-   { 10264, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
-   { 10289, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
-   { 10308, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
-   { 10342, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
-   { 10369, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
-   { 10395, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
-   { 10419, 0x00008450 }, /* GL_FOG_COORD_SRC */
-   { 10436, 0x00000B62 }, /* GL_FOG_DENSITY */
-   { 10451, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
-   { 10475, 0x00000B64 }, /* GL_FOG_END */
-   { 10486, 0x00000C54 }, /* GL_FOG_HINT */
-   { 10498, 0x00000B61 }, /* GL_FOG_INDEX */
-   { 10511, 0x00000B65 }, /* GL_FOG_MODE */
-   { 10523, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
-   { 10542, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
-   { 10567, 0x00000B63 }, /* GL_FOG_START */
-   { 10580, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
-   { 10598, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
-   { 10622, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
-   { 10641, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
-   { 10664, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-   { 10699, 0x00008D40 }, /* GL_FRAMEBUFFER */
-   { 10714, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-   { 10751, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-   { 10787, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-   { 10828, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-   { 10869, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-   { 10906, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-   { 10943, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-   { 10981, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-   { 11023, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-   { 11061, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-   { 11103, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-   { 11138, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-   { 11177, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-   { 11226, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-   { 11274, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-   { 11326, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-   { 11366, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-   { 11410, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-   { 11450, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-   { 11494, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
-   { 11521, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
-   { 11545, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-   { 11573, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
-   { 11596, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
-   { 11615, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-   { 11652, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-   { 11693, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-   { 11734, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-   { 11776, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-   { 11827, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-   { 11865, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-   { 11910, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-   { 11959, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-   { 11997, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-   { 12039, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   { 12071, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
-   { 12096, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
-   { 12123, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-   { 12154, 0x00000404 }, /* GL_FRONT */
-   { 12163, 0x00000408 }, /* GL_FRONT_AND_BACK */
-   { 12181, 0x00000B46 }, /* GL_FRONT_FACE */
-   { 12195, 0x00000400 }, /* GL_FRONT_LEFT */
-   { 12209, 0x00000401 }, /* GL_FRONT_RIGHT */
-   { 12224, 0x00008006 }, /* GL_FUNC_ADD */
-   { 12236, 0x00008006 }, /* GL_FUNC_ADD_EXT */
-   { 12252, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
-   { 12277, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
-   { 12306, 0x0000800A }, /* GL_FUNC_SUBTRACT */
-   { 12323, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
-   { 12344, 0x00008191 }, /* GL_GENERATE_MIPMAP */
-   { 12363, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
-   { 12387, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
-   { 12416, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
-   { 12440, 0x00000206 }, /* GL_GEQUAL */
-   { 12450, 0x00000204 }, /* GL_GREATER */
-   { 12461, 0x00001904 }, /* GL_GREEN */
-   { 12470, 0x00000D19 }, /* GL_GREEN_BIAS */
-   { 12484, 0x00000D53 }, /* GL_GREEN_BITS */
-   { 12498, 0x00000D18 }, /* GL_GREEN_SCALE */
-   { 12513, 0x00008000 }, /* GL_HINT_BIT */
-   { 12525, 0x00008024 }, /* GL_HISTOGRAM */
-   { 12538, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
-   { 12562, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
-   { 12590, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
-   { 12613, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
-   { 12640, 0x00008024 }, /* GL_HISTOGRAM_EXT */
-   { 12657, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
-   { 12677, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
-   { 12701, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
-   { 12725, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
-   { 12753, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-   { 12781, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
-   { 12813, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
-   { 12835, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
-   { 12861, 0x0000802D }, /* GL_HISTOGRAM_SINK */
-   { 12879, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
-   { 12901, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
-   { 12920, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
-   { 12943, 0x0000862A }, /* GL_IDENTITY_NV */
-   { 12958, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
-   { 12978, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-   { 13018, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-   { 13056, 0x00001E02 }, /* GL_INCR */
-   { 13064, 0x00008507 }, /* GL_INCR_WRAP */
-   { 13077, 0x00008507 }, /* GL_INCR_WRAP_EXT */
-   { 13094, 0x00008222 }, /* GL_INDEX */
-   { 13103, 0x00008077 }, /* GL_INDEX_ARRAY */
-   { 13118, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-   { 13148, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
-   { 13182, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
-   { 13205, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
-   { 13227, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
-   { 13247, 0x00000D51 }, /* GL_INDEX_BITS */
-   { 13261, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
-   { 13282, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
-   { 13300, 0x00000C30 }, /* GL_INDEX_MODE */
-   { 13314, 0x00000D13 }, /* GL_INDEX_OFFSET */
-   { 13330, 0x00000D12 }, /* GL_INDEX_SHIFT */
-   { 13345, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
-   { 13364, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
-   { 13383, 0x00001404 }, /* GL_INT */
-   { 13390, 0x00008049 }, /* GL_INTENSITY */
-   { 13403, 0x0000804C }, /* GL_INTENSITY12 */
-   { 13418, 0x0000804C }, /* GL_INTENSITY12_EXT */
-   { 13437, 0x0000804D }, /* GL_INTENSITY16 */
-   { 13452, 0x0000804D }, /* GL_INTENSITY16_EXT */
-   { 13471, 0x0000804A }, /* GL_INTENSITY4 */
-   { 13485, 0x0000804A }, /* GL_INTENSITY4_EXT */
-   { 13503, 0x0000804B }, /* GL_INTENSITY8 */
-   { 13517, 0x0000804B }, /* GL_INTENSITY8_EXT */
-   { 13535, 0x00008049 }, /* GL_INTENSITY_EXT */
-   { 13552, 0x00008575 }, /* GL_INTERPOLATE */
-   { 13567, 0x00008575 }, /* GL_INTERPOLATE_ARB */
-   { 13586, 0x00008575 }, /* GL_INTERPOLATE_EXT */
-   { 13605, 0x00008B53 }, /* GL_INT_VEC2 */
-   { 13617, 0x00008B53 }, /* GL_INT_VEC2_ARB */
-   { 13633, 0x00008B54 }, /* GL_INT_VEC3 */
-   { 13645, 0x00008B54 }, /* GL_INT_VEC3_ARB */
-   { 13661, 0x00008B55 }, /* GL_INT_VEC4 */
-   { 13673, 0x00008B55 }, /* GL_INT_VEC4_ARB */
-   { 13689, 0x00000500 }, /* GL_INVALID_ENUM */
-   { 13705, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
-   { 13738, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
-   { 13775, 0x00000502 }, /* GL_INVALID_OPERATION */
-   { 13796, 0x00000501 }, /* GL_INVALID_VALUE */
-   { 13813, 0x0000862B }, /* GL_INVERSE_NV */
-   { 13827, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
-   { 13851, 0x0000150A }, /* GL_INVERT */
-   { 13861, 0x00001E00 }, /* GL_KEEP */
-   { 13869, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
-   { 13899, 0x00000406 }, /* GL_LEFT */
-   { 13907, 0x00000203 }, /* GL_LEQUAL */
-   { 13917, 0x00000201 }, /* GL_LESS */
-   { 13925, 0x00004000 }, /* GL_LIGHT0 */
-   { 13935, 0x00004001 }, /* GL_LIGHT1 */
-   { 13945, 0x00004002 }, /* GL_LIGHT2 */
-   { 13955, 0x00004003 }, /* GL_LIGHT3 */
-   { 13965, 0x00004004 }, /* GL_LIGHT4 */
-   { 13975, 0x00004005 }, /* GL_LIGHT5 */
-   { 13985, 0x00004006 }, /* GL_LIGHT6 */
-   { 13995, 0x00004007 }, /* GL_LIGHT7 */
-   { 14005, 0x00000B50 }, /* GL_LIGHTING */
-   { 14017, 0x00000040 }, /* GL_LIGHTING_BIT */
-   { 14033, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
-   { 14056, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-   { 14085, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
-   { 14118, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-   { 14146, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
-   { 14170, 0x00001B01 }, /* GL_LINE */
-   { 14178, 0x00002601 }, /* GL_LINEAR */
-   { 14188, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
-   { 14210, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-   { 14240, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-   { 14271, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
-   { 14295, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
-   { 14320, 0x00000001 }, /* GL_LINES */
-   { 14329, 0x00000004 }, /* GL_LINE_BIT */
-   { 14341, 0x00000002 }, /* GL_LINE_LOOP */
-   { 14354, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
-   { 14374, 0x00000B20 }, /* GL_LINE_SMOOTH */
-   { 14389, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
-   { 14409, 0x00000B24 }, /* GL_LINE_STIPPLE */
-   { 14425, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
-   { 14449, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
-   { 14472, 0x00000003 }, /* GL_LINE_STRIP */
-   { 14486, 0x00000702 }, /* GL_LINE_TOKEN */
-   { 14500, 0x00000B21 }, /* GL_LINE_WIDTH */
-   { 14514, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
-   { 14540, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
-   { 14560, 0x00008B82 }, /* GL_LINK_STATUS */
-   { 14575, 0x00000B32 }, /* GL_LIST_BASE */
-   { 14588, 0x00020000 }, /* GL_LIST_BIT */
-   { 14600, 0x00000B33 }, /* GL_LIST_INDEX */
-   { 14614, 0x00000B30 }, /* GL_LIST_MODE */
-   { 14627, 0x00000101 }, /* GL_LOAD */
-   { 14635, 0x00000BF1 }, /* GL_LOGIC_OP */
-   { 14647, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
-   { 14664, 0x00008CA1 }, /* GL_LOWER_LEFT */
-   { 14678, 0x00001909 }, /* GL_LUMINANCE */
-   { 14691, 0x00008041 }, /* GL_LUMINANCE12 */
-   { 14706, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
-   { 14729, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
-   { 14756, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
-   { 14778, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
-   { 14804, 0x00008041 }, /* GL_LUMINANCE12_EXT */
-   { 14823, 0x00008042 }, /* GL_LUMINANCE16 */
-   { 14838, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
-   { 14861, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
-   { 14888, 0x00008042 }, /* GL_LUMINANCE16_EXT */
-   { 14907, 0x0000803F }, /* GL_LUMINANCE4 */
-   { 14921, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
-   { 14942, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
-   { 14967, 0x0000803F }, /* GL_LUMINANCE4_EXT */
-   { 14985, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
-   { 15006, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
-   { 15031, 0x00008040 }, /* GL_LUMINANCE8 */
-   { 15045, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
-   { 15066, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
-   { 15091, 0x00008040 }, /* GL_LUMINANCE8_EXT */
-   { 15109, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
-   { 15128, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
-   { 15144, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
-   { 15164, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
-   { 15186, 0x00000D91 }, /* GL_MAP1_INDEX */
-   { 15200, 0x00000D92 }, /* GL_MAP1_NORMAL */
-   { 15215, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
-   { 15239, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
-   { 15263, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
-   { 15287, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
-   { 15311, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
-   { 15328, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
-   { 15345, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-   { 15373, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-   { 15402, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-   { 15431, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-   { 15460, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-   { 15489, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-   { 15518, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-   { 15547, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-   { 15575, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-   { 15603, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-   { 15631, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-   { 15659, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-   { 15687, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-   { 15715, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-   { 15743, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-   { 15771, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-   { 15799, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
-   { 15815, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
-   { 15835, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
-   { 15857, 0x00000DB1 }, /* GL_MAP2_INDEX */
-   { 15871, 0x00000DB2 }, /* GL_MAP2_NORMAL */
-   { 15886, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
-   { 15910, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
-   { 15934, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
-   { 15958, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
-   { 15982, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
-   { 15999, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
-   { 16016, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-   { 16044, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-   { 16073, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-   { 16102, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-   { 16131, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-   { 16160, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-   { 16189, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-   { 16218, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-   { 16246, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-   { 16274, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-   { 16302, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-   { 16330, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-   { 16358, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-   { 16386, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
-   { 16414, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-   { 16442, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-   { 16470, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 16483, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
-   { 16509, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
-   { 16538, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
-   { 16566, 0x00000001 }, /* GL_MAP_READ_BIT */
-   { 16582, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 16597, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
-   { 16623, 0x00000002 }, /* GL_MAP_WRITE_BIT */
-   { 16640, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 16655, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 16669, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 16685, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 16701, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 16717, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 16733, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 16749, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 16765, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 16781, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 16797, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 16813, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 16829, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 16844, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 16858, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 16874, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 16890, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 16906, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 16922, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 16938, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 16954, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 16970, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 16986, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 17002, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 17018, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 17033, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 17047, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 17063, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 17079, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 17094, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 17108, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 17123, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 17137, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 17152, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 17166, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 17181, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 17195, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 17210, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 17224, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 17239, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 17254, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 17280, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 17314, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 17345, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 17378, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 17409, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 17424, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 17446, 0x00008008 }, /* GL_MAX */
-   { 17453, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 17476, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 17508, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 17534, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 17567, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 17593, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 17627, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 17646, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 17675, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 17707, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 17743, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 17779, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 17819, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 17845, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 17875, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 17900, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 17929, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 17958, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 17991, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 18011, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 18035, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 18059, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 18083, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 18108, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 18126, 0x00008008 }, /* GL_MAX_EXT */
-   { 18137, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 18172, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 18211, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 18225, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 18245, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 18283, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 18312, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 18336, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 18364, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 18387, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 18424, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 18460, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 18487, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 18516, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 18550, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 18586, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 18613, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 18645, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 18681, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 18710, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 18739, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 18767, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 18805, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 18849, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 18892, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 18926, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 18965, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 19002, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 19040, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 19083, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 19126, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 19156, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 19187, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 19223, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 19259, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 19289, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 19323, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 19356, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 19385, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 19400, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 19420, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 19444, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 19466, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 19492, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 19519, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19550, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 19574, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 19608, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 19628, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 19655, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 19676, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 19701, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 19726, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 19761, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 19783, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 19809, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 19831, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 19857, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 19891, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19929, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 19962, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 19999, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 20023, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 20044, 0x00008007 }, /* GL_MIN */
-   { 20051, 0x0000802E }, /* GL_MINMAX */
-   { 20061, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 20075, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 20092, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 20113, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 20128, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 20147, 0x00008007 }, /* GL_MIN_EXT */
-   { 20158, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 20177, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 20200, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 20223, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 20243, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 20263, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 20293, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 20321, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 20349, 0x00001700 }, /* GL_MODELVIEW */
-   { 20362, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 20380, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 20399, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 20418, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 20437, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 20456, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 20475, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 20494, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 20513, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 20532, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 20551, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 20570, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 20588, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 20607, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 20626, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 20645, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 20664, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 20683, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 20702, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 20721, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 20740, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 20759, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 20778, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 20796, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 20815, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 20834, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 20852, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 20870, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 20888, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 20906, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 20924, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 20942, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 20960, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 20980, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 21007, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 21032, 0x00002100 }, /* GL_MODULATE */
-   { 21044, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 21064, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 21091, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 21116, 0x00000103 }, /* GL_MULT */
-   { 21124, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 21139, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 21159, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 21178, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 21197, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 21221, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 21244, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 21274, 0x00002A25 }, /* GL_N3F_V3F */
-   { 21285, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 21305, 0x0000150E }, /* GL_NAND */
-   { 21313, 0x00002600 }, /* GL_NEAREST */
-   { 21324, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 21355, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 21387, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 21412, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 21438, 0x00000200 }, /* GL_NEVER */
-   { 21447, 0x00001102 }, /* GL_NICEST */
-   { 21457, 0x00000000 }, /* GL_NONE */
-   { 21465, 0x00001505 }, /* GL_NOOP */
-   { 21473, 0x00001508 }, /* GL_NOR */
-   { 21480, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 21493, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 21509, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 21540, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 21575, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 21599, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 21622, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 21643, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 21657, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 21675, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 21692, 0x00000205 }, /* GL_NOTEQUAL */
-   { 21704, 0x00000000 }, /* GL_NO_ERROR */
-   { 21716, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 21750, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 21788, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 21820, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 21862, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 21892, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 21932, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 21963, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 21992, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 22020, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 22050, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 22067, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 22093, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 22109, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 22144, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 22166, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 22185, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 22215, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 22236, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 22264, 0x00000001 }, /* GL_ONE */
-   { 22271, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 22299, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 22331, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 22359, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 22391, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 22414, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 22437, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 22460, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 22483, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 22501, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 22523, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 22545, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 22561, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 22581, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 22601, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 22619, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 22641, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 22663, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 22679, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 22699, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 22719, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 22737, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 22759, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 22781, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 22797, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 22817, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 22837, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 22858, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 22877, 0x00001507 }, /* GL_OR */
-   { 22883, 0x00000A01 }, /* GL_ORDER */
-   { 22892, 0x0000150D }, /* GL_OR_INVERTED */
-   { 22907, 0x0000150B }, /* GL_OR_REVERSE */
-   { 22921, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 22938, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 22956, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 22977, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 22997, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 23015, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 23034, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 23054, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 23074, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 23092, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 23111, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 23136, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 23160, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 23181, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 23203, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 23225, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 23250, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 23274, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 23295, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 23317, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 23339, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 23361, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 23392, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 23412, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 23437, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 23457, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 23482, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 23502, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 23527, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 23547, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 23572, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 23592, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 23617, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 23637, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 23662, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 23682, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 23707, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 23727, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 23752, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 23772, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 23797, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 23817, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 23842, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 23860, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 23881, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 23910, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 23943, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 23968, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 23991, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 24022, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 24057, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 24084, 0x00001B00 }, /* GL_POINT */
-   { 24093, 0x00000000 }, /* GL_POINTS */
-   { 24103, 0x00000002 }, /* GL_POINT_BIT */
-   { 24116, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 24146, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 24180, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 24214, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 24249, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 24278, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 24311, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 24344, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 24378, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 24392, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 24418, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 24436, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 24458, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 24480, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 24503, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 24521, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 24543, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 24565, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 24588, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 24608, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 24624, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 24645, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 24661, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 24681, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 24710, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 24729, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 24755, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 24770, 0x00000009 }, /* GL_POLYGON */
-   { 24781, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 24796, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 24812, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 24835, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 24860, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 24883, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 24906, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 24930, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 24954, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 24972, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 24995, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 25014, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 25037, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 25054, 0x00001203 }, /* GL_POSITION */
-   { 25066, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 25098, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 25134, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 25167, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 25204, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 25235, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 25270, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 25302, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 25338, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 25371, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 25403, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 25439, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 25472, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 25509, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 25539, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 25573, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 25604, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 25639, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 25670, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 25705, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 25737, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 25773, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 25803, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 25837, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 25868, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 25903, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 25935, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 25966, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 26001, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 26033, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 26069, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 26098, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 26131, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 26161, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 26195, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 26234, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 26267, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 26307, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 26341, 0x00008578 }, /* GL_PREVIOUS */
-   { 26353, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 26369, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 26385, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 26402, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 26423, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 26444, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 26477, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 26509, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 26532, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 26555, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 26585, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 26614, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 26642, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 26664, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 26692, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 26720, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 26742, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 26763, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 26803, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 26842, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 26872, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 26907, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 26940, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 26974, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 27013, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 27052, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 27074, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 27100, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 27124, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 27147, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 27169, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 27190, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 27211, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 27238, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 27270, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 27302, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 27337, 0x00001701 }, /* GL_PROJECTION */
-   { 27351, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 27372, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 27398, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
-   { 27422, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 27443, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 27462, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 27485, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 27524, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 27562, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 27582, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 27612, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 27636, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 27656, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 27686, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 27710, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 27730, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 27763, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 27789, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 27819, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 27850, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 27880, 0x00002003 }, /* GL_Q */
-   { 27885, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 27910, 0x00000007 }, /* GL_QUADS */
-   { 27919, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-   { 27967, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 27984, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 27998, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 28020, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 28046, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 28062, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 28082, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 28108, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 28138, 0x00002002 }, /* GL_R */
-   { 28143, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 28155, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 28188, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 28203, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 28223, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 28255, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 28279, 0x000088B8 }, /* GL_READ_ONLY */
-   { 28292, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 28309, 0x000088BA }, /* GL_READ_WRITE */
-   { 28323, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 28341, 0x00001903 }, /* GL_RED */
-   { 28348, 0x00008016 }, /* GL_REDUCE */
-   { 28358, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 28372, 0x00000D15 }, /* GL_RED_BIAS */
-   { 28384, 0x00000D52 }, /* GL_RED_BITS */
-   { 28396, 0x00000D14 }, /* GL_RED_SCALE */
-   { 28409, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 28427, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 28449, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 28470, 0x00001C00 }, /* GL_RENDER */
-   { 28480, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 28496, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 28523, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 28551, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 28577, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 28604, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 28624, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 28651, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 28674, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 28701, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 28733, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 28769, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 28794, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 28818, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 28847, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 28869, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 28895, 0x00001F01 }, /* GL_RENDERER */
-   { 28907, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 28922, 0x00002901 }, /* GL_REPEAT */
-   { 28932, 0x00001E01 }, /* GL_REPLACE */
-   { 28943, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 28958, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 28981, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 28999, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 29021, 0x00000102 }, /* GL_RETURN */
-   { 29031, 0x00001907 }, /* GL_RGB */
-   { 29038, 0x00008052 }, /* GL_RGB10 */
-   { 29047, 0x00008059 }, /* GL_RGB10_A2 */
-   { 29059, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 29075, 0x00008052 }, /* GL_RGB10_EXT */
-   { 29088, 0x00008053 }, /* GL_RGB12 */
-   { 29097, 0x00008053 }, /* GL_RGB12_EXT */
-   { 29110, 0x00008054 }, /* GL_RGB16 */
-   { 29119, 0x00008054 }, /* GL_RGB16_EXT */
-   { 29132, 0x0000804E }, /* GL_RGB2_EXT */
-   { 29144, 0x0000804F }, /* GL_RGB4 */
-   { 29152, 0x0000804F }, /* GL_RGB4_EXT */
-   { 29164, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 29177, 0x00008050 }, /* GL_RGB5 */
-   { 29185, 0x00008057 }, /* GL_RGB5_A1 */
-   { 29196, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 29211, 0x00008050 }, /* GL_RGB5_EXT */
-   { 29223, 0x00008051 }, /* GL_RGB8 */
-   { 29231, 0x00008051 }, /* GL_RGB8_EXT */
-   { 29243, 0x00001908 }, /* GL_RGBA */
-   { 29251, 0x0000805A }, /* GL_RGBA12 */
-   { 29261, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 29275, 0x0000805B }, /* GL_RGBA16 */
-   { 29285, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 29299, 0x00008055 }, /* GL_RGBA2 */
-   { 29308, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 29321, 0x00008056 }, /* GL_RGBA4 */
-   { 29330, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 29349, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 29362, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 29376, 0x00008058 }, /* GL_RGBA8 */
-   { 29385, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 29398, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 29413, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 29431, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 29444, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 29457, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 29471, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 29483, 0x00008573 }, /* GL_RGB_SCALE */
-   { 29496, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 29513, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 29530, 0x00000407 }, /* GL_RIGHT */
-   { 29539, 0x00002000 }, /* GL_S */
-   { 29544, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 29558, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 29579, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 29593, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 29614, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 29628, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 29644, 0x000080A9 }, /* GL_SAMPLES */
-   { 29655, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 29671, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 29686, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 29704, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 29726, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 29754, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 29786, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 29809, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 29836, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 29854, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 29877, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 29899, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 29918, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 29941, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 29967, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 29997, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 30022, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 30051, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 30066, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 30081, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 30097, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 30122, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 30162, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 30206, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 30239, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 30269, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 30301, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 30331, 0x00001C02 }, /* GL_SELECT */
-   { 30341, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 30369, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 30394, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 30410, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 30437, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 30468, 0x0000150F }, /* GL_SET */
-   { 30475, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 30496, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 30520, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 30535, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 30550, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 30578, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 30601, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 30631, 0x00001601 }, /* GL_SHININESS */
-   { 30644, 0x00001402 }, /* GL_SHORT */
-   { 30653, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 30674, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 30690, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 30710, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 30729, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 30743, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 30758, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 30780, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 30800, 0x00001D01 }, /* GL_SMOOTH */
-   { 30810, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 30843, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 30870, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 30903, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 30930, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 30947, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 30968, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 30989, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 31004, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 31023, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 31042, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 31059, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 31080, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 31101, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 31116, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 31135, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 31154, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 31171, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 31192, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 31213, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 31228, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 31247, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 31266, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 31286, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 31304, 0x00001202 }, /* GL_SPECULAR */
-   { 31316, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 31330, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 31345, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 31363, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 31380, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 31394, 0x00008580 }, /* GL_SRC0_RGB */
-   { 31406, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 31420, 0x00008581 }, /* GL_SRC1_RGB */
-   { 31432, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 31446, 0x00008582 }, /* GL_SRC2_RGB */
-   { 31458, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 31471, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 31493, 0x00000300 }, /* GL_SRC_COLOR */
-   { 31506, 0x00008C40 }, /* GL_SRGB */
-   { 31514, 0x00008C41 }, /* GL_SRGB8 */
-   { 31523, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 31539, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 31553, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 31571, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 31590, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 31605, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 31624, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 31639, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 31658, 0x000088E5 }, /* GL_STATIC_READ */
-   { 31673, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 31692, 0x00001802 }, /* GL_STENCIL */
-   { 31703, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 31725, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 31751, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 31772, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 31797, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 31818, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 31843, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 31875, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 31911, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 31943, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 31979, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 31999, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 32026, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 32052, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 32068, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 32090, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 32113, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 32129, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 32145, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 32162, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 32185, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 32207, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 32229, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 32251, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 32272, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 32299, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 32326, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 32341, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 32357, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 32386, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 32408, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 32429, 0x00000C33 }, /* GL_STEREO */
-   { 32439, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
-   { 32463, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
-   { 32488, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
-   { 32512, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 32527, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 32546, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 32561, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 32580, 0x000088E1 }, /* GL_STREAM_READ */
-   { 32595, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 32614, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 32631, 0x000084E7 }, /* GL_SUBTRACT */
-   { 32643, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 32659, 0x00002001 }, /* GL_T */
-   { 32664, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 32679, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 32698, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 32714, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 32729, 0x00002A27 }, /* GL_T2F_V3F */
-   { 32740, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 32759, 0x00002A28 }, /* GL_T4F_V4F */
-   { 32770, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 32793, 0x00001702 }, /* GL_TEXTURE */
-   { 32804, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 32816, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 32832, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 32844, 0x000084CA }, /* GL_TEXTURE10 */
-   { 32857, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 32874, 0x000084CB }, /* GL_TEXTURE11 */
-   { 32887, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 32904, 0x000084CC }, /* GL_TEXTURE12 */
-   { 32917, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 32934, 0x000084CD }, /* GL_TEXTURE13 */
-   { 32947, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 32964, 0x000084CE }, /* GL_TEXTURE14 */
-   { 32977, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 32994, 0x000084CF }, /* GL_TEXTURE15 */
-   { 33007, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 33024, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 33037, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 33054, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 33067, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 33084, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 33097, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 33114, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 33127, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 33144, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 33160, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 33172, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 33185, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 33202, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 33215, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 33232, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 33245, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 33262, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 33275, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 33292, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 33305, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 33322, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 33335, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 33352, 0x000084DA }, /* GL_TEXTURE26 */
-   { 33365, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 33382, 0x000084DB }, /* GL_TEXTURE27 */
-   { 33395, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 33412, 0x000084DC }, /* GL_TEXTURE28 */
-   { 33425, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 33442, 0x000084DD }, /* GL_TEXTURE29 */
-   { 33455, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 33472, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 33488, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 33500, 0x000084DE }, /* GL_TEXTURE30 */
-   { 33513, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 33530, 0x000084DF }, /* GL_TEXTURE31 */
-   { 33543, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 33560, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 33576, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 33588, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 33604, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 33616, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 33632, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 33644, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 33660, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 33672, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 33688, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 33700, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 33716, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 33728, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 33744, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 33758, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 33782, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 33796, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 33820, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 33834, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 33856, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 33882, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 33904, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 33926, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 33958, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 33980, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 34012, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 34034, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 34062, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 34094, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 34127, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 34159, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 34174, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 34195, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 34220, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 34238, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 34262, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 34293, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 34323, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 34353, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 34388, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 34419, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 34457, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 34484, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 34516, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 34550, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 34574, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 34602, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 34626, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 34654, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 34687, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 34711, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 34733, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 34755, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 34781, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 34815, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 34848, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 34885, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 34913, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 34945, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 34968, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 35006, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 35048, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 35079, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 35107, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 35137, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 35165, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 35185, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 35209, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 35240, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 35275, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 35306, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 35341, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 35372, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 35407, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 35438, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 35473, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 35504, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 35539, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 35570, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 35605, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-   { 35634, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 35651, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 35673, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 35699, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 35714, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 35735, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 35755, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 35781, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 35801, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 35818, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 35835, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 35852, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 35869, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 35894, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 35916, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 35942, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 35960, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 35986, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 36012, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 36042, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 36069, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 36094, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 36114, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 36138, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 36165, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 36192, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 36219, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 36245, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 36275, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 36297, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 36315, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 36345, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 36373, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 36401, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 36429, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 36450, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 36469, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 36491, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 36510, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 36530, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-   { 36560, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-   { 36591, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 36616, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 36640, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 36660, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 36684, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 36704, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 36727, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 36751, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-   { 36781, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 36806, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 36840, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 36857, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 36875, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 36893, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 36911, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 36931, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 36950, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 36979, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 36996, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 37022, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 37052, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 37084, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 37114, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 37148, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 37164, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 37195, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 37230, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 37258, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 37290, 0x00000004 }, /* GL_TRIANGLES */
-   { 37303, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 37319, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 37340, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 37358, 0x00000001 }, /* GL_TRUE */
-   { 37366, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 37386, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 37409, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 37429, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 37450, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 37472, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 37494, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 37514, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 37535, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 37552, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 37579, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 37602, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 37618, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 37645, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 37666, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 37690, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 37721, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 37745, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 37773, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 37796, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 37814, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 37844, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 37870, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 37900, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 37926, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 37950, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 37978, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 38006, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 38033, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 38065, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 38096, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 38110, 0x00002A20 }, /* GL_V2F */
-   { 38117, 0x00002A21 }, /* GL_V3F */
-   { 38124, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 38143, 0x00001F00 }, /* GL_VENDOR */
-   { 38153, 0x00001F02 }, /* GL_VERSION */
-   { 38164, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 38180, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 38204, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 38234, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 38265, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 38300, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 38324, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 38345, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 38368, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 38389, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 38416, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 38444, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 38472, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 38500, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 38528, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 38556, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 38584, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 38611, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 38638, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 38665, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 38692, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 38719, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 38746, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 38773, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 38800, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 38827, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 38865, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 38907, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 38938, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 38973, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 39007, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 39045, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 39076, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 39111, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 39139, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 39171, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 39201, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 39235, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 39263, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 39295, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 39315, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 39337, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 39366, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 39387, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 39416, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 39449, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 39481, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 39508, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 39539, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 39569, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 39586, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 39607, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 39634, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 39646, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 39662, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 39682, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 39713, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 39748, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 39776, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 39801, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 39828, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 39853, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 39877, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 39896, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 39910, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 39928, 0x00001506 }, /* GL_XOR */
-   { 39935, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 39954, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 39968, 0x00000000 }, /* GL_ZERO */
-   { 39976, 0x00000D16 }, /* GL_ZOOM_X */
-   { 39986, 0x00000D17 }, /* GL_ZOOM_Y */
+   {   779, 0x0000911A }, /* GL_ALREADY_SIGNALED */
+   {   799, 0x00000207 }, /* GL_ALWAYS */
+   {   809, 0x00001200 }, /* GL_AMBIENT */
+   {   820, 0x00001602 }, /* GL_AMBIENT_AND_DIFFUSE */
+   {   843, 0x00001501 }, /* GL_AND */
+   {   850, 0x00001504 }, /* GL_AND_INVERTED */
+   {   866, 0x00001502 }, /* GL_AND_REVERSE */
+   {   881, 0x00008892 }, /* GL_ARRAY_BUFFER */
+   {   897, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING */
+   {   921, 0x00008894 }, /* GL_ARRAY_BUFFER_BINDING_ARB */
+   {   949, 0x00008B85 }, /* GL_ATTACHED_SHADERS */
+   {   969, 0x00008645 }, /* GL_ATTRIB_ARRAY_POINTER_NV */
+   {   996, 0x00008623 }, /* GL_ATTRIB_ARRAY_SIZE_NV */
+   {  1020, 0x00008624 }, /* GL_ATTRIB_ARRAY_STRIDE_NV */
+   {  1046, 0x00008625 }, /* GL_ATTRIB_ARRAY_TYPE_NV */
+   {  1070, 0x00000BB0 }, /* GL_ATTRIB_STACK_DEPTH */
+   {  1092, 0x00000D80 }, /* GL_AUTO_NORMAL */
+   {  1107, 0x00000409 }, /* GL_AUX0 */
+   {  1115, 0x0000040A }, /* GL_AUX1 */
+   {  1123, 0x0000040B }, /* GL_AUX2 */
+   {  1131, 0x0000040C }, /* GL_AUX3 */
+   {  1139, 0x00000C00 }, /* GL_AUX_BUFFERS */
+   {  1154, 0x00000405 }, /* GL_BACK */
+   {  1162, 0x00000402 }, /* GL_BACK_LEFT */
+   {  1175, 0x00000403 }, /* GL_BACK_RIGHT */
+   {  1189, 0x000080E0 }, /* GL_BGR */
+   {  1196, 0x000080E1 }, /* GL_BGRA */
+   {  1204, 0x00001A00 }, /* GL_BITMAP */
+   {  1214, 0x00000704 }, /* GL_BITMAP_TOKEN */
+   {  1230, 0x00000BE2 }, /* GL_BLEND */
+   {  1239, 0x00008005 }, /* GL_BLEND_COLOR */
+   {  1254, 0x00008005 }, /* GL_BLEND_COLOR_EXT */
+   {  1273, 0x00000BE0 }, /* GL_BLEND_DST */
+   {  1286, 0x000080CA }, /* GL_BLEND_DST_ALPHA */
+   {  1305, 0x000080C8 }, /* GL_BLEND_DST_RGB */
+   {  1322, 0x00008009 }, /* GL_BLEND_EQUATION */
+   {  1340, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA */
+   {  1364, 0x0000883D }, /* GL_BLEND_EQUATION_ALPHA_EXT */
+   {  1392, 0x00008009 }, /* GL_BLEND_EQUATION_EXT */
+   {  1414, 0x00008009 }, /* GL_BLEND_EQUATION_RGB */
+   {  1436, 0x00008009 }, /* GL_BLEND_EQUATION_RGB_EXT */
+   {  1462, 0x00000BE1 }, /* GL_BLEND_SRC */
+   {  1475, 0x000080CB }, /* GL_BLEND_SRC_ALPHA */
+   {  1494, 0x000080C9 }, /* GL_BLEND_SRC_RGB */
+   {  1511, 0x00001905 }, /* GL_BLUE */
+   {  1519, 0x00000D1B }, /* GL_BLUE_BIAS */
+   {  1532, 0x00000D54 }, /* GL_BLUE_BITS */
+   {  1545, 0x00000D1A }, /* GL_BLUE_SCALE */
+   {  1559, 0x00008B56 }, /* GL_BOOL */
+   {  1567, 0x00008B56 }, /* GL_BOOL_ARB */
+   {  1579, 0x00008B57 }, /* GL_BOOL_VEC2 */
+   {  1592, 0x00008B57 }, /* GL_BOOL_VEC2_ARB */
+   {  1609, 0x00008B58 }, /* GL_BOOL_VEC3 */
+   {  1622, 0x00008B58 }, /* GL_BOOL_VEC3_ARB */
+   {  1639, 0x00008B59 }, /* GL_BOOL_VEC4 */
+   {  1652, 0x00008B59 }, /* GL_BOOL_VEC4_ARB */
+   {  1669, 0x000088BB }, /* GL_BUFFER_ACCESS */
+   {  1686, 0x000088BB }, /* GL_BUFFER_ACCESS_ARB */
+   {  1707, 0x00008A13 }, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
+   {  1738, 0x000088BC }, /* GL_BUFFER_MAPPED */
+   {  1755, 0x000088BC }, /* GL_BUFFER_MAPPED_ARB */
+   {  1776, 0x000088BD }, /* GL_BUFFER_MAP_POINTER */
+   {  1798, 0x000088BD }, /* GL_BUFFER_MAP_POINTER_ARB */
+   {  1824, 0x00008A12 }, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
+   {  1858, 0x00008764 }, /* GL_BUFFER_SIZE */
+   {  1873, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */
+   {  1892, 0x00008765 }, /* GL_BUFFER_USAGE */
+   {  1908, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */
+   {  1928, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */
+   {  1947, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+   {  1973, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */
+   {  1996, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+   {  2024, 0x0000877C }, /* GL_BUMP_TARGET_ATI */
+   {  2043, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */
+   {  2065, 0x00001400 }, /* GL_BYTE */
+   {  2073, 0x00002A24 }, /* GL_C3F_V3F */
+   {  2084, 0x00002A26 }, /* GL_C4F_N3F_V3F */
+   {  2099, 0x00002A22 }, /* GL_C4UB_V2F */
+   {  2111, 0x00002A23 }, /* GL_C4UB_V3F */
+   {  2123, 0x00000901 }, /* GL_CCW */
+   {  2130, 0x00002900 }, /* GL_CLAMP */
+   {  2139, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
+   {  2158, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
+   {  2181, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
+   {  2205, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
+   {  2222, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
+   {  2244, 0x00001500 }, /* GL_CLEAR */
+   {  2253, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
+   {  2278, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
+   {  2307, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
+   {  2333, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+   {  2362, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
+   {  2388, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
+   {  2415, 0x00003000 }, /* GL_CLIP_PLANE0 */
+   {  2430, 0x00003001 }, /* GL_CLIP_PLANE1 */
+   {  2445, 0x00003002 }, /* GL_CLIP_PLANE2 */
+   {  2460, 0x00003003 }, /* GL_CLIP_PLANE3 */
+   {  2475, 0x00003004 }, /* GL_CLIP_PLANE4 */
+   {  2490, 0x00003005 }, /* GL_CLIP_PLANE5 */
+   {  2505, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+   {  2538, 0x00000A00 }, /* GL_COEFF */
+   {  2547, 0x00001800 }, /* GL_COLOR */
+   {  2556, 0x00008076 }, /* GL_COLOR_ARRAY */
+   {  2571, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+   {  2601, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   {  2635, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
+   {  2658, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
+   {  2678, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
+   {  2700, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
+   {  2720, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
+   {  2741, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
+   {  2766, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
+   {  2787, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
+   {  2809, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
+   {  2835, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
+   {  2857, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
+   {  2883, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
+   {  2905, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
+   {  2931, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
+   {  2953, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
+   {  2979, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
+   {  3001, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
+   {  3027, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
+   {  3049, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
+   {  3075, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
+   {  3100, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
+   {  3121, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
+   {  3146, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
+   {  3167, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
+   {  3192, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
+   {  3213, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
+   {  3238, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
+   {  3259, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
+   {  3284, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
+   {  3305, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
+   {  3330, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
+   {  3351, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
+   {  3376, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
+   {  3397, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
+   {  3422, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
+   {  3443, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
+   {  3468, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
+   {  3488, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
+   {  3509, 0x00001900 }, /* GL_COLOR_INDEX */
+   {  3524, 0x00001603 }, /* GL_COLOR_INDEXES */
+   {  3541, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
+   {  3559, 0x00000B57 }, /* GL_COLOR_MATERIAL */
+   {  3577, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
+   {  3600, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
+   {  3628, 0x000080B1 }, /* GL_COLOR_MATRIX */
+   {  3644, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
+   {  3664, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
+   {  3692, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
+   {  3724, 0x00008458 }, /* GL_COLOR_SUM */
+   {  3737, 0x00008458 }, /* GL_COLOR_SUM_ARB */
+   {  3754, 0x000080D0 }, /* GL_COLOR_TABLE */
+   {  3769, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
+   {  3795, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
+   {  3825, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
+   {  3855, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
+   {  3875, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
+   {  3899, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
+   {  3924, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
+   {  3953, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
+   {  3982, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
+   {  4004, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
+   {  4030, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
+   {  4056, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
+   {  4082, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
+   {  4112, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
+   {  4142, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+   {  4172, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
+   {  4206, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
+   {  4240, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+   {  4270, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
+   {  4304, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
+   {  4338, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
+   {  4362, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
+   {  4390, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
+   {  4418, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
+   {  4439, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
+   {  4464, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
+   {  4485, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
+   {  4510, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
+   {  4535, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
+   {  4554, 0x00008570 }, /* GL_COMBINE */
+   {  4565, 0x00008503 }, /* GL_COMBINE4 */
+   {  4577, 0x00008572 }, /* GL_COMBINE_ALPHA */
+   {  4594, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
+   {  4615, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
+   {  4636, 0x00008570 }, /* GL_COMBINE_ARB */
+   {  4651, 0x00008570 }, /* GL_COMBINE_EXT */
+   {  4666, 0x00008571 }, /* GL_COMBINE_RGB */
+   {  4681, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
+   {  4700, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
+   {  4719, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
+   {  4755, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
+   {  4779, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
+   {  4807, 0x00001300 }, /* GL_COMPILE */
+   {  4818, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
+   {  4841, 0x00008B81 }, /* GL_COMPILE_STATUS */
+   {  4859, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
+   {  4879, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
+   {  4903, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
+   {  4927, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
+   {  4955, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
+   {  4979, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+   {  5009, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
+   {  5043, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
+   {  5071, 0x000084ED }, /* GL_COMPRESSED_RGB */
+   {  5089, 0x000084EE }, /* GL_COMPRESSED_RGBA */
+   {  5108, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
+   {  5131, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+   {  5160, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+   {  5193, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+   {  5226, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+   {  5259, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
+   {  5281, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+   {  5309, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+   {  5341, 0x00008C4A }, /* GL_COMPRESSED_SLUMINANCE */
+   {  5366, 0x00008C4B }, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
+   {  5397, 0x00008C48 }, /* GL_COMPRESSED_SRGB */
+   {  5416, 0x00008C49 }, /* GL_COMPRESSED_SRGB_ALPHA */
+   {  5441, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
+   {  5471, 0x0000911C }, /* GL_CONDITION_SATISFIED */
+   {  5494, 0x00008576 }, /* GL_CONSTANT */
+   {  5506, 0x00008003 }, /* GL_CONSTANT_ALPHA */
+   {  5524, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
+   {  5546, 0x00008576 }, /* GL_CONSTANT_ARB */
+   {  5562, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
+   {  5586, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
+   {  5608, 0x00008001 }, /* GL_CONSTANT_COLOR */
+   {  5626, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
+   {  5648, 0x00008576 }, /* GL_CONSTANT_EXT */
+   {  5664, 0x00008010 }, /* GL_CONVOLUTION_1D */
+   {  5682, 0x00008011 }, /* GL_CONVOLUTION_2D */
+   {  5700, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
+   {  5728, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
+   {  5759, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
+   {  5786, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
+   {  5817, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
+   {  5844, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
+   {  5875, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
+   {  5903, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
+   {  5935, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
+   {  5957, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
+   {  5983, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
+   {  6005, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
+   {  6031, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
+   {  6052, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
+   {  6077, 0x00008862 }, /* GL_COORD_REPLACE */
+   {  6094, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
+   {  6115, 0x00008862 }, /* GL_COORD_REPLACE_NV */
+   {  6135, 0x00001503 }, /* GL_COPY */
+   {  6143, 0x0000150C }, /* GL_COPY_INVERTED */
+   {  6160, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
+   {  6180, 0x00008F36 }, /* GL_COPY_READ_BUFFER */
+   {  6200, 0x00008F37 }, /* GL_COPY_WRITE_BUFFER */
+   {  6221, 0x00000B44 }, /* GL_CULL_FACE */
+   {  6234, 0x00000B45 }, /* GL_CULL_FACE_MODE */
+   {  6252, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
+   {  6271, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+   {  6303, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+   {  6338, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
+   {  6359, 0x00000001 }, /* GL_CURRENT_BIT */
+   {  6374, 0x00000B00 }, /* GL_CURRENT_COLOR */
+   {  6391, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
+   {  6412, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
+   {  6438, 0x00000B01 }, /* GL_CURRENT_INDEX */
+   {  6455, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
+   {  6477, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
+   {  6505, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
+   {  6526, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+   {  6560, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
+   {  6593, 0x00000B02 }, /* GL_CURRENT_NORMAL */
+   {  6611, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+   {  6641, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
+   {  6660, 0x00008865 }, /* GL_CURRENT_QUERY */
+   {  6677, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
+   {  6698, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
+   {  6722, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
+   {  6749, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
+   {  6773, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
+   {  6800, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
+   {  6833, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
+   {  6867, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+   {  6900, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
+   {  6927, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
+   {  6953, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
+   {  6978, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
+   {  7007, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
+   {  7029, 0x00000900 }, /* GL_CW */
+   {  7035, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
+   {  7056, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
+   {  7077, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
+   {  7097, 0x00002101 }, /* GL_DECAL */
+   {  7106, 0x00001E03 }, /* GL_DECR */
+   {  7114, 0x00008508 }, /* GL_DECR_WRAP */
+   {  7127, 0x00008508 }, /* GL_DECR_WRAP_EXT */
+   {  7144, 0x00008B80 }, /* GL_DELETE_STATUS */
+   {  7161, 0x00001801 }, /* GL_DEPTH */
+   {  7170, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
+   {  7190, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
+   {  7210, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
+   {  7234, 0x00000D1F }, /* GL_DEPTH_BIAS */
+   {  7248, 0x00000D56 }, /* GL_DEPTH_BITS */
+   {  7262, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
+   {  7282, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
+   {  7307, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
+   {  7327, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
+   {  7345, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
+   {  7366, 0x00001902 }, /* GL_DEPTH_COMPONENT */
+   {  7385, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
+   {  7406, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
+   {  7431, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
+   {  7457, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
+   {  7478, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
+   {  7503, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
+   {  7529, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
+   {  7550, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
+   {  7575, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
+   {  7601, 0x00000B74 }, /* GL_DEPTH_FUNC */
+   {  7615, 0x00000B70 }, /* GL_DEPTH_RANGE */
+   {  7630, 0x00000D1E }, /* GL_DEPTH_SCALE */
+   {  7645, 0x000084F9 }, /* GL_DEPTH_STENCIL */
+   {  7662, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
+   {  7690, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
+   {  7710, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+   {  7738, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+   {  7766, 0x00000B71 }, /* GL_DEPTH_TEST */
+   {  7780, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
+   {  7802, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
+   {  7828, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
+   {  7847, 0x00001201 }, /* GL_DIFFUSE */
+   {  7858, 0x00000BD0 }, /* GL_DITHER */
+   {  7868, 0x00000A02 }, /* GL_DOMAIN */
+   {  7878, 0x00001100 }, /* GL_DONT_CARE */
+   {  7891, 0x000086AE }, /* GL_DOT3_RGB */
+   {  7903, 0x000086AF }, /* GL_DOT3_RGBA */
+   {  7916, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
+   {  7933, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
+   {  7950, 0x000086AE }, /* GL_DOT3_RGB_ARB */
+   {  7966, 0x00008740 }, /* GL_DOT3_RGB_EXT */
+   {  7982, 0x0000140A }, /* GL_DOUBLE */
+   {  7992, 0x00000C32 }, /* GL_DOUBLEBUFFER */
+   {  8008, 0x00000C01 }, /* GL_DRAW_BUFFER */
+   {  8023, 0x00008825 }, /* GL_DRAW_BUFFER0 */
+   {  8039, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
+   {  8059, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
+   {  8079, 0x00008826 }, /* GL_DRAW_BUFFER1 */
+   {  8095, 0x0000882F }, /* GL_DRAW_BUFFER10 */
+   {  8112, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
+   {  8133, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
+   {  8154, 0x00008830 }, /* GL_DRAW_BUFFER11 */
+   {  8171, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
+   {  8192, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
+   {  8213, 0x00008831 }, /* GL_DRAW_BUFFER12 */
+   {  8230, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
+   {  8251, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
+   {  8272, 0x00008832 }, /* GL_DRAW_BUFFER13 */
+   {  8289, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
+   {  8310, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
+   {  8331, 0x00008833 }, /* GL_DRAW_BUFFER14 */
+   {  8348, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
+   {  8369, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
+   {  8390, 0x00008834 }, /* GL_DRAW_BUFFER15 */
+   {  8407, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
+   {  8428, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
+   {  8449, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
+   {  8469, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
+   {  8489, 0x00008827 }, /* GL_DRAW_BUFFER2 */
+   {  8505, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
+   {  8525, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
+   {  8545, 0x00008828 }, /* GL_DRAW_BUFFER3 */
+   {  8561, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
+   {  8581, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
+   {  8601, 0x00008829 }, /* GL_DRAW_BUFFER4 */
+   {  8617, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
+   {  8637, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
+   {  8657, 0x0000882A }, /* GL_DRAW_BUFFER5 */
+   {  8673, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
+   {  8693, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
+   {  8713, 0x0000882B }, /* GL_DRAW_BUFFER6 */
+   {  8729, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
+   {  8749, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
+   {  8769, 0x0000882C }, /* GL_DRAW_BUFFER7 */
+   {  8785, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
+   {  8805, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
+   {  8825, 0x0000882D }, /* GL_DRAW_BUFFER8 */
+   {  8841, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
+   {  8861, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
+   {  8881, 0x0000882E }, /* GL_DRAW_BUFFER9 */
+   {  8897, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
+   {  8917, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
+   {  8937, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
+   {  8957, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+   {  8989, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
+   {  9013, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
+   {  9033, 0x00000304 }, /* GL_DST_ALPHA */
+   {  9046, 0x00000306 }, /* GL_DST_COLOR */
+   {  9059, 0x0000877A }, /* GL_DU8DV8_ATI */
+   {  9073, 0x00008779 }, /* GL_DUDV_ATI */
+   {  9085, 0x000088EA }, /* GL_DYNAMIC_COPY */
+   {  9101, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
+   {  9121, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
+   {  9137, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
+   {  9157, 0x000088E9 }, /* GL_DYNAMIC_READ */
+   {  9173, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
+   {  9193, 0x00000B43 }, /* GL_EDGE_FLAG */
+   {  9206, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
+   {  9225, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+   {  9259, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
+   {  9297, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
+   {  9324, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+   {  9350, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
+   {  9374, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+   {  9406, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
+   {  9442, 0x00001600 }, /* GL_EMISSION */
+   {  9454, 0x00002000 }, /* GL_ENABLE_BIT */
+   {  9468, 0x00000202 }, /* GL_EQUAL */
+   {  9477, 0x00001509 }, /* GL_EQUIV */
+   {  9486, 0x00010000 }, /* GL_EVAL_BIT */
+   {  9498, 0x00000800 }, /* GL_EXP */
+   {  9505, 0x00000801 }, /* GL_EXP2 */
+   {  9513, 0x00001F03 }, /* GL_EXTENSIONS */
+   {  9527, 0x00002400 }, /* GL_EYE_LINEAR */
+   {  9541, 0x00002502 }, /* GL_EYE_PLANE */
+   {  9554, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
+   {  9579, 0x0000855B }, /* GL_EYE_RADIAL_NV */
+   {  9596, 0x00000000 }, /* GL_FALSE */
+   {  9605, 0x00001101 }, /* GL_FASTEST */
+   {  9616, 0x00001C01 }, /* GL_FEEDBACK */
+   {  9628, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
+   {  9655, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
+   {  9679, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
+   {  9703, 0x00001B02 }, /* GL_FILL */
+   {  9711, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
+   {  9742, 0x00001D00 }, /* GL_FLAT */
+   {  9750, 0x00001406 }, /* GL_FLOAT */
+   {  9759, 0x00008B5A }, /* GL_FLOAT_MAT2 */
+   {  9773, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
+   {  9791, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
+   {  9807, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
+   {  9823, 0x00008B5B }, /* GL_FLOAT_MAT3 */
+   {  9837, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
+   {  9855, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
+   {  9871, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
+   {  9887, 0x00008B5C }, /* GL_FLOAT_MAT4 */
+   {  9901, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
+   {  9919, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
+   {  9935, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
+   {  9951, 0x00008B50 }, /* GL_FLOAT_VEC2 */
+   {  9965, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
+   {  9983, 0x00008B51 }, /* GL_FLOAT_VEC3 */
+   {  9997, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
+   { 10015, 0x00008B52 }, /* GL_FLOAT_VEC4 */
+   { 10029, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
+   { 10047, 0x00000B60 }, /* GL_FOG */
+   { 10054, 0x00000080 }, /* GL_FOG_BIT */
+   { 10065, 0x00000B66 }, /* GL_FOG_COLOR */
+   { 10078, 0x00008451 }, /* GL_FOG_COORD */
+   { 10091, 0x00008451 }, /* GL_FOG_COORDINATE */
+   { 10109, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
+   { 10133, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+   { 10172, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
+   { 10215, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+   { 10247, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+   { 10278, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+   { 10307, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
+   { 10332, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
+   { 10351, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
+   { 10385, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
+   { 10412, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
+   { 10438, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
+   { 10462, 0x00008450 }, /* GL_FOG_COORD_SRC */
+   { 10479, 0x00000B62 }, /* GL_FOG_DENSITY */
+   { 10494, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
+   { 10518, 0x00000B64 }, /* GL_FOG_END */
+   { 10529, 0x00000C54 }, /* GL_FOG_HINT */
+   { 10541, 0x00000B61 }, /* GL_FOG_INDEX */
+   { 10554, 0x00000B65 }, /* GL_FOG_MODE */
+   { 10566, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
+   { 10585, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
+   { 10610, 0x00000B63 }, /* GL_FOG_START */
+   { 10623, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
+   { 10641, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
+   { 10665, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
+   { 10684, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
+   { 10707, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+   { 10742, 0x00008D40 }, /* GL_FRAMEBUFFER */
+   { 10757, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+   { 10794, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+   { 10830, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+   { 10871, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+   { 10912, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+   { 10949, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+   { 10986, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+   { 11024, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
+   { 11066, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+   { 11104, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
+   { 11146, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+   { 11181, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+   { 11220, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
+   { 11269, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+   { 11317, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
+   { 11369, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+   { 11409, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+   { 11453, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+   { 11493, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
+   { 11537, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
+   { 11564, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
+   { 11588, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
+   { 11616, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
+   { 11639, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
+   { 11658, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+   { 11695, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
+   { 11736, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+   { 11777, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+   { 11819, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+   { 11870, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+   { 11908, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+   { 11953, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
+   { 12002, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+   { 12040, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+   { 12082, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+   { 12114, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
+   { 12139, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
+   { 12166, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
+   { 12197, 0x00000404 }, /* GL_FRONT */
+   { 12206, 0x00000408 }, /* GL_FRONT_AND_BACK */
+   { 12224, 0x00000B46 }, /* GL_FRONT_FACE */
+   { 12238, 0x00000400 }, /* GL_FRONT_LEFT */
+   { 12252, 0x00000401 }, /* GL_FRONT_RIGHT */
+   { 12267, 0x00008006 }, /* GL_FUNC_ADD */
+   { 12279, 0x00008006 }, /* GL_FUNC_ADD_EXT */
+   { 12295, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
+   { 12320, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
+   { 12349, 0x0000800A }, /* GL_FUNC_SUBTRACT */
+   { 12366, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
+   { 12387, 0x00008191 }, /* GL_GENERATE_MIPMAP */
+   { 12406, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
+   { 12430, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
+   { 12459, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
+   { 12483, 0x00000206 }, /* GL_GEQUAL */
+   { 12493, 0x00000204 }, /* GL_GREATER */
+   { 12504, 0x00001904 }, /* GL_GREEN */
+   { 12513, 0x00000D19 }, /* GL_GREEN_BIAS */
+   { 12527, 0x00000D53 }, /* GL_GREEN_BITS */
+   { 12541, 0x00000D18 }, /* GL_GREEN_SCALE */
+   { 12556, 0x00008000 }, /* GL_HINT_BIT */
+   { 12568, 0x00008024 }, /* GL_HISTOGRAM */
+   { 12581, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
+   { 12605, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
+   { 12633, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
+   { 12656, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
+   { 12683, 0x00008024 }, /* GL_HISTOGRAM_EXT */
+   { 12700, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
+   { 12720, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
+   { 12744, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
+   { 12768, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
+   { 12796, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+   { 12824, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
+   { 12856, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
+   { 12878, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
+   { 12904, 0x0000802D }, /* GL_HISTOGRAM_SINK */
+   { 12922, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
+   { 12944, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
+   { 12963, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
+   { 12986, 0x0000862A }, /* GL_IDENTITY_NV */
+   { 13001, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
+   { 13021, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+   { 13061, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+   { 13099, 0x00001E02 }, /* GL_INCR */
+   { 13107, 0x00008507 }, /* GL_INCR_WRAP */
+   { 13120, 0x00008507 }, /* GL_INCR_WRAP_EXT */
+   { 13137, 0x00008222 }, /* GL_INDEX */
+   { 13146, 0x00008077 }, /* GL_INDEX_ARRAY */
+   { 13161, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+   { 13191, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
+   { 13225, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
+   { 13248, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
+   { 13270, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
+   { 13290, 0x00000D51 }, /* GL_INDEX_BITS */
+   { 13304, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
+   { 13325, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
+   { 13343, 0x00000C30 }, /* GL_INDEX_MODE */
+   { 13357, 0x00000D13 }, /* GL_INDEX_OFFSET */
+   { 13373, 0x00000D12 }, /* GL_INDEX_SHIFT */
+   { 13388, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
+   { 13407, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
+   { 13426, 0x00001404 }, /* GL_INT */
+   { 13433, 0x00008049 }, /* GL_INTENSITY */
+   { 13446, 0x0000804C }, /* GL_INTENSITY12 */
+   { 13461, 0x0000804C }, /* GL_INTENSITY12_EXT */
+   { 13480, 0x0000804D }, /* GL_INTENSITY16 */
+   { 13495, 0x0000804D }, /* GL_INTENSITY16_EXT */
+   { 13514, 0x0000804A }, /* GL_INTENSITY4 */
+   { 13528, 0x0000804A }, /* GL_INTENSITY4_EXT */
+   { 13546, 0x0000804B }, /* GL_INTENSITY8 */
+   { 13560, 0x0000804B }, /* GL_INTENSITY8_EXT */
+   { 13578, 0x00008049 }, /* GL_INTENSITY_EXT */
+   { 13595, 0x00008575 }, /* GL_INTERPOLATE */
+   { 13610, 0x00008575 }, /* GL_INTERPOLATE_ARB */
+   { 13629, 0x00008575 }, /* GL_INTERPOLATE_EXT */
+   { 13648, 0x00008B53 }, /* GL_INT_VEC2 */
+   { 13660, 0x00008B53 }, /* GL_INT_VEC2_ARB */
+   { 13676, 0x00008B54 }, /* GL_INT_VEC3 */
+   { 13688, 0x00008B54 }, /* GL_INT_VEC3_ARB */
+   { 13704, 0x00008B55 }, /* GL_INT_VEC4 */
+   { 13716, 0x00008B55 }, /* GL_INT_VEC4_ARB */
+   { 13732, 0x00000500 }, /* GL_INVALID_ENUM */
+   { 13748, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+   { 13781, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
+   { 13818, 0x00000502 }, /* GL_INVALID_OPERATION */
+   { 13839, 0x00000501 }, /* GL_INVALID_VALUE */
+   { 13856, 0x0000862B }, /* GL_INVERSE_NV */
+   { 13870, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
+   { 13894, 0x0000150A }, /* GL_INVERT */
+   { 13904, 0x00001E00 }, /* GL_KEEP */
+   { 13912, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
+   { 13942, 0x00000406 }, /* GL_LEFT */
+   { 13950, 0x00000203 }, /* GL_LEQUAL */
+   { 13960, 0x00000201 }, /* GL_LESS */
+   { 13968, 0x00004000 }, /* GL_LIGHT0 */
+   { 13978, 0x00004001 }, /* GL_LIGHT1 */
+   { 13988, 0x00004002 }, /* GL_LIGHT2 */
+   { 13998, 0x00004003 }, /* GL_LIGHT3 */
+   { 14008, 0x00004004 }, /* GL_LIGHT4 */
+   { 14018, 0x00004005 }, /* GL_LIGHT5 */
+   { 14028, 0x00004006 }, /* GL_LIGHT6 */
+   { 14038, 0x00004007 }, /* GL_LIGHT7 */
+   { 14048, 0x00000B50 }, /* GL_LIGHTING */
+   { 14060, 0x00000040 }, /* GL_LIGHTING_BIT */
+   { 14076, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
+   { 14099, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+   { 14128, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
+   { 14161, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+   { 14189, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
+   { 14213, 0x00001B01 }, /* GL_LINE */
+   { 14221, 0x00002601 }, /* GL_LINEAR */
+   { 14231, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
+   { 14253, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+   { 14283, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+   { 14314, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
+   { 14338, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
+   { 14363, 0x00000001 }, /* GL_LINES */
+   { 14372, 0x00000004 }, /* GL_LINE_BIT */
+   { 14384, 0x00000002 }, /* GL_LINE_LOOP */
+   { 14397, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
+   { 14417, 0x00000B20 }, /* GL_LINE_SMOOTH */
+   { 14432, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
+   { 14452, 0x00000B24 }, /* GL_LINE_STIPPLE */
+   { 14468, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
+   { 14492, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
+   { 14515, 0x00000003 }, /* GL_LINE_STRIP */
+   { 14529, 0x00000702 }, /* GL_LINE_TOKEN */
+   { 14543, 0x00000B21 }, /* GL_LINE_WIDTH */
+   { 14557, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
+   { 14583, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
+   { 14603, 0x00008B82 }, /* GL_LINK_STATUS */
+   { 14618, 0x00000B32 }, /* GL_LIST_BASE */
+   { 14631, 0x00020000 }, /* GL_LIST_BIT */
+   { 14643, 0x00000B33 }, /* GL_LIST_INDEX */
+   { 14657, 0x00000B30 }, /* GL_LIST_MODE */
+   { 14670, 0x00000101 }, /* GL_LOAD */
+   { 14678, 0x00000BF1 }, /* GL_LOGIC_OP */
+   { 14690, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
+   { 14707, 0x00008CA1 }, /* GL_LOWER_LEFT */
+   { 14721, 0x00001909 }, /* GL_LUMINANCE */
+   { 14734, 0x00008041 }, /* GL_LUMINANCE12 */
+   { 14749, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
+   { 14772, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
+   { 14799, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
+   { 14821, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
+   { 14847, 0x00008041 }, /* GL_LUMINANCE12_EXT */
+   { 14866, 0x00008042 }, /* GL_LUMINANCE16 */
+   { 14881, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
+   { 14904, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
+   { 14931, 0x00008042 }, /* GL_LUMINANCE16_EXT */
+   { 14950, 0x0000803F }, /* GL_LUMINANCE4 */
+   { 14964, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
+   { 14985, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
+   { 15010, 0x0000803F }, /* GL_LUMINANCE4_EXT */
+   { 15028, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
+   { 15049, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
+   { 15074, 0x00008040 }, /* GL_LUMINANCE8 */
+   { 15088, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
+   { 15109, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
+   { 15134, 0x00008040 }, /* GL_LUMINANCE8_EXT */
+   { 15152, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
+   { 15171, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
+   { 15187, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
+   { 15207, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
+   { 15229, 0x00000D91 }, /* GL_MAP1_INDEX */
+   { 15243, 0x00000D92 }, /* GL_MAP1_NORMAL */
+   { 15258, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
+   { 15282, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
+   { 15306, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
+   { 15330, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
+   { 15354, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
+   { 15371, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
+   { 15388, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+   { 15416, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+   { 15445, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+   { 15474, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+   { 15503, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+   { 15532, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+   { 15561, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+   { 15590, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+   { 15618, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+   { 15646, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+   { 15674, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+   { 15702, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+   { 15730, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+   { 15758, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+   { 15786, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+   { 15814, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+   { 15842, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
+   { 15858, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
+   { 15878, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
+   { 15900, 0x00000DB1 }, /* GL_MAP2_INDEX */
+   { 15914, 0x00000DB2 }, /* GL_MAP2_NORMAL */
+   { 15929, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
+   { 15953, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
+   { 15977, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
+   { 16001, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
+   { 16025, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
+   { 16042, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
+   { 16059, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+   { 16087, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+   { 16116, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+   { 16145, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+   { 16174, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+   { 16203, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+   { 16232, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+   { 16261, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+   { 16289, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+   { 16317, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+   { 16345, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+   { 16373, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+   { 16401, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+   { 16429, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
+   { 16457, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+   { 16485, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+   { 16513, 0x00000D10 }, /* GL_MAP_COLOR */
+   { 16526, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
+   { 16552, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
+   { 16581, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
+   { 16609, 0x00000001 }, /* GL_MAP_READ_BIT */
+   { 16625, 0x00000D11 }, /* GL_MAP_STENCIL */
+   { 16640, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
+   { 16666, 0x00000002 }, /* GL_MAP_WRITE_BIT */
+   { 16683, 0x000088C0 }, /* GL_MATRIX0_ARB */
+   { 16698, 0x00008630 }, /* GL_MATRIX0_NV */
+   { 16712, 0x000088CA }, /* GL_MATRIX10_ARB */
+   { 16728, 0x000088CB }, /* GL_MATRIX11_ARB */
+   { 16744, 0x000088CC }, /* GL_MATRIX12_ARB */
+   { 16760, 0x000088CD }, /* GL_MATRIX13_ARB */
+   { 16776, 0x000088CE }, /* GL_MATRIX14_ARB */
+   { 16792, 0x000088CF }, /* GL_MATRIX15_ARB */
+   { 16808, 0x000088D0 }, /* GL_MATRIX16_ARB */
+   { 16824, 0x000088D1 }, /* GL_MATRIX17_ARB */
+   { 16840, 0x000088D2 }, /* GL_MATRIX18_ARB */
+   { 16856, 0x000088D3 }, /* GL_MATRIX19_ARB */
+   { 16872, 0x000088C1 }, /* GL_MATRIX1_ARB */
+   { 16887, 0x00008631 }, /* GL_MATRIX1_NV */
+   { 16901, 0x000088D4 }, /* GL_MATRIX20_ARB */
+   { 16917, 0x000088D5 }, /* GL_MATRIX21_ARB */
+   { 16933, 0x000088D6 }, /* GL_MATRIX22_ARB */
+   { 16949, 0x000088D7 }, /* GL_MATRIX23_ARB */
+   { 16965, 0x000088D8 }, /* GL_MATRIX24_ARB */
+   { 16981, 0x000088D9 }, /* GL_MATRIX25_ARB */
+   { 16997, 0x000088DA }, /* GL_MATRIX26_ARB */
+   { 17013, 0x000088DB }, /* GL_MATRIX27_ARB */
+   { 17029, 0x000088DC }, /* GL_MATRIX28_ARB */
+   { 17045, 0x000088DD }, /* GL_MATRIX29_ARB */
+   { 17061, 0x000088C2 }, /* GL_MATRIX2_ARB */
+   { 17076, 0x00008632 }, /* GL_MATRIX2_NV */
+   { 17090, 0x000088DE }, /* GL_MATRIX30_ARB */
+   { 17106, 0x000088DF }, /* GL_MATRIX31_ARB */
+   { 17122, 0x000088C3 }, /* GL_MATRIX3_ARB */
+   { 17137, 0x00008633 }, /* GL_MATRIX3_NV */
+   { 17151, 0x000088C4 }, /* GL_MATRIX4_ARB */
+   { 17166, 0x00008634 }, /* GL_MATRIX4_NV */
+   { 17180, 0x000088C5 }, /* GL_MATRIX5_ARB */
+   { 17195, 0x00008635 }, /* GL_MATRIX5_NV */
+   { 17209, 0x000088C6 }, /* GL_MATRIX6_ARB */
+   { 17224, 0x00008636 }, /* GL_MATRIX6_NV */
+   { 17238, 0x000088C7 }, /* GL_MATRIX7_ARB */
+   { 17253, 0x00008637 }, /* GL_MATRIX7_NV */
+   { 17267, 0x000088C8 }, /* GL_MATRIX8_ARB */
+   { 17282, 0x000088C9 }, /* GL_MATRIX9_ARB */
+   { 17297, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
+   { 17323, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+   { 17357, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+   { 17388, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+   { 17421, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+   { 17452, 0x00000BA0 }, /* GL_MATRIX_MODE */
+   { 17467, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
+   { 17489, 0x00008008 }, /* GL_MAX */
+   { 17496, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
+   { 17519, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+   { 17551, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
+   { 17577, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+   { 17610, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+   { 17636, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 17670, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
+   { 17689, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+   { 17718, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+   { 17750, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
+   { 17786, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+   { 17822, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
+   { 17862, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
+   { 17888, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
+   { 17918, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
+   { 17943, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
+   { 17972, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+   { 18001, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
+   { 18034, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
+   { 18054, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
+   { 18078, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
+   { 18102, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
+   { 18126, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
+   { 18151, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
+   { 18169, 0x00008008 }, /* GL_MAX_EXT */
+   { 18180, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+   { 18215, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
+   { 18254, 0x00000D31 }, /* GL_MAX_LIGHTS */
+   { 18268, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
+   { 18288, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+   { 18326, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+   { 18355, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
+   { 18379, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
+   { 18407, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
+   { 18430, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 18467, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 18503, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+   { 18530, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+   { 18559, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+   { 18593, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+   { 18629, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+   { 18656, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+   { 18688, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+   { 18724, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+   { 18753, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+   { 18782, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
+   { 18810, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+   { 18848, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 18892, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 18935, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 18969, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 19008, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 19045, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 19083, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 19126, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 19169, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+   { 19199, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+   { 19230, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 19266, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 19302, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 19332, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 19366, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 19399, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 19428, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 19443, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+   { 19470, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 19490, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 19514, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 19536, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 19562, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 19589, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19620, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 19644, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 19678, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 19698, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 19725, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 19746, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 19771, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 19796, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 19831, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 19853, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 19879, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 19901, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 19927, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 19961, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 19999, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 20032, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 20069, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 20093, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 20114, 0x00008007 }, /* GL_MIN */
+   { 20121, 0x0000802E }, /* GL_MINMAX */
+   { 20131, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 20145, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 20162, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 20183, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 20198, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 20217, 0x00008007 }, /* GL_MIN_EXT */
+   { 20228, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 20247, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 20270, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 20293, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 20313, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 20333, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 20363, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 20391, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 20419, 0x00001700 }, /* GL_MODELVIEW */
+   { 20432, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 20450, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 20469, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 20488, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 20507, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 20526, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 20545, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 20564, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 20583, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 20602, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 20621, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 20640, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 20658, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 20677, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 20696, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 20715, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 20734, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 20753, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 20772, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 20791, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 20810, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 20829, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 20848, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 20866, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 20885, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 20904, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 20922, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 20940, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 20958, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 20976, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 20994, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 21012, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 21030, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 21050, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 21077, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 21102, 0x00002100 }, /* GL_MODULATE */
+   { 21114, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 21134, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 21161, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 21186, 0x00000103 }, /* GL_MULT */
+   { 21194, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 21209, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 21229, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 21248, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 21267, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 21291, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 21314, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 21344, 0x00002A25 }, /* GL_N3F_V3F */
+   { 21355, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 21375, 0x0000150E }, /* GL_NAND */
+   { 21383, 0x00002600 }, /* GL_NEAREST */
+   { 21394, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 21425, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 21457, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 21482, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 21508, 0x00000200 }, /* GL_NEVER */
+   { 21517, 0x00001102 }, /* GL_NICEST */
+   { 21527, 0x00000000 }, /* GL_NONE */
+   { 21535, 0x00001505 }, /* GL_NOOP */
+   { 21543, 0x00001508 }, /* GL_NOR */
+   { 21550, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 21563, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 21579, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 21610, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 21645, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 21669, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 21692, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 21713, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 21727, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 21745, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 21762, 0x00000205 }, /* GL_NOTEQUAL */
+   { 21774, 0x00000000 }, /* GL_NO_ERROR */
+   { 21786, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 21820, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 21858, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 21890, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 21932, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 21962, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 22002, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 22033, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 22062, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 22090, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 22120, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 22137, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 22163, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 22179, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 22214, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 22236, 0x00009112 }, /* GL_OBJECT_TYPE */
+   { 22251, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 22270, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 22300, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 22321, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 22349, 0x00000001 }, /* GL_ONE */
+   { 22356, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 22384, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 22416, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 22444, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 22476, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 22499, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 22522, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 22545, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 22568, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 22586, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 22608, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 22630, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 22646, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 22666, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 22686, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 22704, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 22726, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 22748, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 22764, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 22784, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 22804, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 22822, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 22844, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 22866, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 22882, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 22902, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 22922, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 22943, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 22962, 0x00001507 }, /* GL_OR */
+   { 22968, 0x00000A01 }, /* GL_ORDER */
+   { 22977, 0x0000150D }, /* GL_OR_INVERTED */
+   { 22992, 0x0000150B }, /* GL_OR_REVERSE */
+   { 23006, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 23023, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 23041, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 23062, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 23082, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 23100, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 23119, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 23139, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 23159, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 23177, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 23196, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 23221, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 23245, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 23266, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 23288, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 23310, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 23335, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 23359, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 23380, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 23402, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 23424, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 23446, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 23477, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 23497, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 23522, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 23542, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 23567, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 23587, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 23612, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 23632, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 23657, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 23677, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 23702, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 23722, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 23747, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 23767, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 23792, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 23812, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 23837, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 23857, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 23882, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 23902, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 23927, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 23945, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 23966, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 23995, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 24028, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 24053, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 24076, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 24107, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 24142, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 24169, 0x00001B00 }, /* GL_POINT */
+   { 24178, 0x00000000 }, /* GL_POINTS */
+   { 24188, 0x00000002 }, /* GL_POINT_BIT */
+   { 24201, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 24231, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 24265, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 24299, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 24334, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 24363, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 24396, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 24429, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 24463, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 24477, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 24503, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 24521, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 24543, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 24565, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 24588, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 24606, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 24628, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 24650, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 24673, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 24693, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 24709, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 24730, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 24746, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 24766, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 24795, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 24814, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 24840, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 24855, 0x00000009 }, /* GL_POLYGON */
+   { 24866, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 24881, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 24897, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 24920, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 24945, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 24968, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 24991, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 25015, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 25039, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 25057, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 25080, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 25099, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 25122, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 25139, 0x00001203 }, /* GL_POSITION */
+   { 25151, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 25183, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 25219, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 25252, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 25289, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 25320, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 25355, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 25387, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 25423, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 25456, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 25488, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 25524, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 25557, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 25594, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 25624, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 25658, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 25689, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 25724, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 25755, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 25790, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 25822, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 25858, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 25888, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 25922, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 25953, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 25988, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 26020, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 26051, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 26086, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 26118, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 26154, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 26183, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 26216, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 26246, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 26280, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 26319, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 26352, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 26392, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 26426, 0x00008578 }, /* GL_PREVIOUS */
+   { 26438, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 26454, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 26470, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 26487, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 26508, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 26529, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 26562, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 26594, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 26617, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 26640, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 26670, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 26699, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 26727, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 26749, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 26777, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 26805, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 26827, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 26848, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 26888, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 26927, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 26957, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 26992, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 27025, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 27059, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 27098, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 27137, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 27159, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 27185, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 27209, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 27232, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 27254, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 27275, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 27296, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 27323, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 27355, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 27387, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 27422, 0x00001701 }, /* GL_PROJECTION */
+   { 27436, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 27457, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 27483, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
+   { 27507, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 27528, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 27547, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 27570, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 27609, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 27647, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 27667, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 27697, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 27721, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 27741, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 27771, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 27795, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 27815, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 27848, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 27874, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 27904, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 27935, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 27965, 0x00002003 }, /* GL_Q */
+   { 27970, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 27995, 0x00000007 }, /* GL_QUADS */
+   { 28004, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+   { 28052, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 28069, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 28083, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 28105, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 28131, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 28147, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 28167, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 28193, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 28223, 0x00002002 }, /* GL_R */
+   { 28228, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 28240, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 28273, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 28288, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 28308, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 28340, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 28364, 0x000088B8 }, /* GL_READ_ONLY */
+   { 28377, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 28394, 0x000088BA }, /* GL_READ_WRITE */
+   { 28408, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 28426, 0x00001903 }, /* GL_RED */
+   { 28433, 0x00008016 }, /* GL_REDUCE */
+   { 28443, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 28457, 0x00000D15 }, /* GL_RED_BIAS */
+   { 28469, 0x00000D52 }, /* GL_RED_BITS */
+   { 28481, 0x00000D14 }, /* GL_RED_SCALE */
+   { 28494, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 28512, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 28534, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 28555, 0x00001C00 }, /* GL_RENDER */
+   { 28565, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 28581, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 28608, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 28636, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 28662, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 28689, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 28709, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 28736, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 28759, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 28786, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 28818, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 28854, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 28879, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 28903, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 28932, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 28954, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 28980, 0x00001F01 }, /* GL_RENDERER */
+   { 28992, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 29007, 0x00002901 }, /* GL_REPEAT */
+   { 29017, 0x00001E01 }, /* GL_REPLACE */
+   { 29028, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 29043, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 29066, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 29084, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 29106, 0x00000102 }, /* GL_RETURN */
+   { 29116, 0x00001907 }, /* GL_RGB */
+   { 29123, 0x00008052 }, /* GL_RGB10 */
+   { 29132, 0x00008059 }, /* GL_RGB10_A2 */
+   { 29144, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 29160, 0x00008052 }, /* GL_RGB10_EXT */
+   { 29173, 0x00008053 }, /* GL_RGB12 */
+   { 29182, 0x00008053 }, /* GL_RGB12_EXT */
+   { 29195, 0x00008054 }, /* GL_RGB16 */
+   { 29204, 0x00008054 }, /* GL_RGB16_EXT */
+   { 29217, 0x0000804E }, /* GL_RGB2_EXT */
+   { 29229, 0x0000804F }, /* GL_RGB4 */
+   { 29237, 0x0000804F }, /* GL_RGB4_EXT */
+   { 29249, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 29262, 0x00008050 }, /* GL_RGB5 */
+   { 29270, 0x00008057 }, /* GL_RGB5_A1 */
+   { 29281, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 29296, 0x00008050 }, /* GL_RGB5_EXT */
+   { 29308, 0x00008051 }, /* GL_RGB8 */
+   { 29316, 0x00008051 }, /* GL_RGB8_EXT */
+   { 29328, 0x00001908 }, /* GL_RGBA */
+   { 29336, 0x0000805A }, /* GL_RGBA12 */
+   { 29346, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 29360, 0x0000805B }, /* GL_RGBA16 */
+   { 29370, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 29384, 0x00008055 }, /* GL_RGBA2 */
+   { 29393, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 29406, 0x00008056 }, /* GL_RGBA4 */
+   { 29415, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 29434, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 29447, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 29461, 0x00008058 }, /* GL_RGBA8 */
+   { 29470, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 29483, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 29498, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 29516, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 29529, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 29542, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 29556, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 29568, 0x00008573 }, /* GL_RGB_SCALE */
+   { 29581, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 29598, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 29615, 0x00000407 }, /* GL_RIGHT */
+   { 29624, 0x00002000 }, /* GL_S */
+   { 29629, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 29643, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 29664, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 29678, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 29699, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 29713, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 29729, 0x000080A9 }, /* GL_SAMPLES */
+   { 29740, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 29756, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 29771, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 29789, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 29811, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 29839, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 29871, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 29894, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 29921, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 29939, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 29962, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 29984, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 30003, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 30026, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 30052, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 30082, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 30107, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 30136, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 30151, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 30166, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 30182, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 30207, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 30247, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 30291, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 30324, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 30354, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 30386, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 30416, 0x00001C02 }, /* GL_SELECT */
+   { 30426, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 30454, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 30479, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 30495, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 30522, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 30553, 0x0000150F }, /* GL_SET */
+   { 30560, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 30581, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 30605, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 30620, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 30635, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 30663, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 30686, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 30716, 0x00001601 }, /* GL_SHININESS */
+   { 30729, 0x00001402 }, /* GL_SHORT */
+   { 30738, 0x00009119 }, /* GL_SIGNALED */
+   { 30750, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 30771, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 30787, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 30807, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 30826, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 30840, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 30855, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 30877, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 30897, 0x00001D01 }, /* GL_SMOOTH */
+   { 30907, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 30940, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 30967, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 31000, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 31027, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 31044, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 31065, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 31086, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 31101, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 31120, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 31139, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 31156, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 31177, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 31198, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 31213, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 31232, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 31251, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 31268, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 31289, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 31310, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 31325, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 31344, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 31363, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 31383, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 31401, 0x00001202 }, /* GL_SPECULAR */
+   { 31413, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 31427, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 31442, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 31460, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 31477, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 31491, 0x00008580 }, /* GL_SRC0_RGB */
+   { 31503, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 31517, 0x00008581 }, /* GL_SRC1_RGB */
+   { 31529, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 31543, 0x00008582 }, /* GL_SRC2_RGB */
+   { 31555, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 31568, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 31590, 0x00000300 }, /* GL_SRC_COLOR */
+   { 31603, 0x00008C40 }, /* GL_SRGB */
+   { 31611, 0x00008C41 }, /* GL_SRGB8 */
+   { 31620, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 31636, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 31650, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 31668, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 31687, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 31702, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 31721, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 31736, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 31755, 0x000088E5 }, /* GL_STATIC_READ */
+   { 31770, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 31789, 0x00001802 }, /* GL_STENCIL */
+   { 31800, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 31822, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 31848, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 31869, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 31894, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 31915, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 31940, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 31972, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 32008, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 32040, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 32076, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 32096, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 32123, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 32149, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 32165, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 32187, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 32210, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 32226, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 32242, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 32259, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 32282, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 32304, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 32326, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 32348, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 32369, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 32396, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 32423, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 32438, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 32454, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 32483, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 32505, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 32526, 0x00000C33 }, /* GL_STEREO */
+   { 32536, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
+   { 32560, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
+   { 32585, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
+   { 32609, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 32624, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 32643, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 32658, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 32677, 0x000088E1 }, /* GL_STREAM_READ */
+   { 32692, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 32711, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 32728, 0x000084E7 }, /* GL_SUBTRACT */
+   { 32740, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 32756, 0x00009113 }, /* GL_SYNC_CONDITION */
+   { 32774, 0x00009116 }, /* GL_SYNC_FENCE */
+   { 32788, 0x00009115 }, /* GL_SYNC_FLAGS */
+   { 32802, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
+   { 32829, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+   { 32859, 0x00009114 }, /* GL_SYNC_STATUS */
+   { 32874, 0x00002001 }, /* GL_T */
+   { 32879, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 32894, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 32913, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 32929, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 32944, 0x00002A27 }, /* GL_T2F_V3F */
+   { 32955, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 32974, 0x00002A28 }, /* GL_T4F_V4F */
+   { 32985, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 33008, 0x00001702 }, /* GL_TEXTURE */
+   { 33019, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 33031, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 33047, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 33059, 0x000084CA }, /* GL_TEXTURE10 */
+   { 33072, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 33089, 0x000084CB }, /* GL_TEXTURE11 */
+   { 33102, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 33119, 0x000084CC }, /* GL_TEXTURE12 */
+   { 33132, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 33149, 0x000084CD }, /* GL_TEXTURE13 */
+   { 33162, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 33179, 0x000084CE }, /* GL_TEXTURE14 */
+   { 33192, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 33209, 0x000084CF }, /* GL_TEXTURE15 */
+   { 33222, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 33239, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 33252, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 33269, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 33282, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 33299, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 33312, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 33329, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 33342, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 33359, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 33375, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 33387, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 33400, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 33417, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 33430, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 33447, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 33460, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 33477, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 33490, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 33507, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 33520, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 33537, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 33550, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 33567, 0x000084DA }, /* GL_TEXTURE26 */
+   { 33580, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 33597, 0x000084DB }, /* GL_TEXTURE27 */
+   { 33610, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 33627, 0x000084DC }, /* GL_TEXTURE28 */
+   { 33640, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 33657, 0x000084DD }, /* GL_TEXTURE29 */
+   { 33670, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 33687, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 33703, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 33715, 0x000084DE }, /* GL_TEXTURE30 */
+   { 33728, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 33745, 0x000084DF }, /* GL_TEXTURE31 */
+   { 33758, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 33775, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 33791, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 33803, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 33819, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 33831, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 33847, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 33859, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 33875, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 33887, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 33903, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 33915, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 33931, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 33943, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 33959, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 33973, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 33997, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 34011, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 34035, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 34049, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 34071, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 34097, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 34119, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 34141, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 34173, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 34195, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 34227, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 34249, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 34277, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 34309, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 34342, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 34374, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 34389, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 34410, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 34435, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 34453, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 34477, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 34508, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 34538, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 34568, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 34603, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 34634, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 34672, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 34699, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 34731, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 34765, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 34789, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 34817, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 34841, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 34869, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 34902, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 34926, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 34948, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 34970, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 34996, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 35030, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 35063, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 35100, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 35128, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 35160, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 35183, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 35221, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 35263, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 35294, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 35322, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 35352, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 35380, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 35400, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 35424, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 35455, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 35490, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 35521, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 35556, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 35587, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 35622, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 35653, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 35688, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 35719, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 35754, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 35785, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 35820, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+   { 35849, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 35866, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 35888, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 35914, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 35929, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 35950, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 35970, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 35996, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 36016, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 36033, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 36050, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 36067, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 36084, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 36109, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 36131, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 36157, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 36175, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 36201, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 36227, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 36257, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 36284, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 36309, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 36329, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 36353, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 36380, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 36407, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 36434, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 36460, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 36490, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 36512, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 36530, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 36560, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 36588, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 36616, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 36644, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 36665, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 36684, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 36706, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 36725, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 36745, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+   { 36775, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+   { 36806, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 36831, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 36855, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 36875, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 36899, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 36919, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 36942, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 36966, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+   { 36996, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 37021, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 37055, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 37072, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 37090, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 37108, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 37126, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
+   { 37145, 0xFFFFFFFFFFFFFFFF }, /* GL_TIMEOUT_IGNORED */
+   { 37164, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 37184, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 37203, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 37232, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 37249, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 37275, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 37305, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 37337, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 37367, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 37401, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 37417, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 37448, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 37483, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 37511, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 37543, 0x00000004 }, /* GL_TRIANGLES */
+   { 37556, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 37572, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 37593, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 37611, 0x00000001 }, /* GL_TRUE */
+   { 37619, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 37639, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 37662, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 37682, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 37703, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 37725, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 37747, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 37767, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 37788, 0x00009118 }, /* GL_UNSIGNALED */
+   { 37802, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 37819, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 37846, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 37869, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 37885, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 37912, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 37933, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 37957, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 37988, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 38012, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 38040, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 38063, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 38081, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 38111, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 38137, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 38167, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 38193, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 38217, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 38245, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 38273, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 38300, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 38332, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 38363, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 38377, 0x00002A20 }, /* GL_V2F */
+   { 38384, 0x00002A21 }, /* GL_V3F */
+   { 38391, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 38410, 0x00001F00 }, /* GL_VENDOR */
+   { 38420, 0x00001F02 }, /* GL_VERSION */
+   { 38431, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 38447, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 38471, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 38501, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 38532, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 38567, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 38591, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 38612, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 38635, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 38656, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 38683, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 38711, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 38739, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 38767, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 38795, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 38823, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 38851, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 38878, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 38905, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 38932, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 38959, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 38986, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 39013, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 39040, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 39067, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 39094, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 39132, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 39174, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 39205, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 39240, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 39274, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 39312, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 39343, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 39378, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 39406, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 39438, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 39468, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 39502, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 39530, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 39562, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 39582, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 39604, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 39633, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 39654, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 39683, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 39716, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 39748, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 39775, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 39806, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 39836, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 39853, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 39874, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 39901, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 39913, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 39929, 0x0000911D }, /* GL_WAIT_FAILED */
+   { 39944, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 39964, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 39995, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 40030, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 40058, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 40083, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 40110, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 40135, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 40159, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 40178, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 40192, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 40210, 0x00001506 }, /* GL_XOR */
+   { 40217, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 40236, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 40250, 0x00000000 }, /* GL_ZERO */
+   { 40258, 0x00000D16 }, /* GL_ZOOM_X */
+   { 40268, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1333] =
+static const unsigned reduced_enums[1347] =
 {
-       473, /* GL_FALSE */
-       689, /* GL_LINES */
-       691, /* GL_LINE_LOOP */
-       698, /* GL_LINE_STRIP */
-      1730, /* GL_TRIANGLES */
-      1733, /* GL_TRIANGLE_STRIP */
-      1731, /* GL_TRIANGLE_FAN */
-      1267, /* GL_QUADS */
-      1270, /* GL_QUAD_STRIP */
-      1154, /* GL_POLYGON */
-      1166, /* GL_POLYGON_STIPPLE_BIT */
-      1115, /* GL_PIXEL_MODE_BIT */
-       676, /* GL_LIGHTING_BIT */
-       502, /* GL_FOG_BIT */
+       475, /* GL_FALSE */
+       691, /* GL_LINES */
+       693, /* GL_LINE_LOOP */
+       700, /* GL_LINE_STRIP */
+      1743, /* GL_TRIANGLES */
+      1746, /* GL_TRIANGLE_STRIP */
+      1744, /* GL_TRIANGLE_FAN */
+      1271, /* GL_QUADS */
+      1274, /* GL_QUAD_STRIP */
+      1158, /* GL_POLYGON */
+      1170, /* GL_POLYGON_STIPPLE_BIT */
+      1119, /* GL_PIXEL_MODE_BIT */
+       678, /* GL_LIGHTING_BIT */
+       504, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
-       708, /* GL_LOAD */
-      1322, /* GL_RETURN */
-       988, /* GL_MULT */
+       710, /* GL_LOAD */
+      1326, /* GL_RETURN */
+       991, /* GL_MULT */
         23, /* GL_ADD */
-      1004, /* GL_NEVER */
-       666, /* GL_LESS */
-       463, /* GL_EQUAL */
-       665, /* GL_LEQUAL */
-       588, /* GL_GREATER */
-      1019, /* GL_NOTEQUAL */
-       587, /* GL_GEQUAL */
-        46, /* GL_ALWAYS */
-      1462, /* GL_SRC_COLOR */
-      1048, /* GL_ONE_MINUS_SRC_COLOR */
-      1460, /* GL_SRC_ALPHA */
-      1047, /* GL_ONE_MINUS_SRC_ALPHA */
-       442, /* GL_DST_ALPHA */
-      1045, /* GL_ONE_MINUS_DST_ALPHA */
-       443, /* GL_DST_COLOR */
-      1046, /* GL_ONE_MINUS_DST_COLOR */
-      1461, /* GL_SRC_ALPHA_SATURATE */
-       575, /* GL_FRONT_LEFT */
-       576, /* GL_FRONT_RIGHT */
-        68, /* GL_BACK_LEFT */
-        69, /* GL_BACK_RIGHT */
-       572, /* GL_FRONT */
-        67, /* GL_BACK */
-       664, /* GL_LEFT */
-      1364, /* GL_RIGHT */
-       573, /* GL_FRONT_AND_BACK */
-        62, /* GL_AUX0 */
-        63, /* GL_AUX1 */
-        64, /* GL_AUX2 */
-        65, /* GL_AUX3 */
-       654, /* GL_INVALID_ENUM */
-       658, /* GL_INVALID_VALUE */
-       657, /* GL_INVALID_OPERATION */
-      1467, /* GL_STACK_OVERFLOW */
-      1468, /* GL_STACK_UNDERFLOW */
-      1073, /* GL_OUT_OF_MEMORY */
-       655, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+      1007, /* GL_NEVER */
+       668, /* GL_LESS */
+       465, /* GL_EQUAL */
+       667, /* GL_LEQUAL */
+       590, /* GL_GREATER */
+      1022, /* GL_NOTEQUAL */
+       589, /* GL_GEQUAL */
+        47, /* GL_ALWAYS */
+      1467, /* GL_SRC_COLOR */
+      1052, /* GL_ONE_MINUS_SRC_COLOR */
+      1465, /* GL_SRC_ALPHA */
+      1051, /* GL_ONE_MINUS_SRC_ALPHA */
+       444, /* GL_DST_ALPHA */
+      1049, /* GL_ONE_MINUS_DST_ALPHA */
+       445, /* GL_DST_COLOR */
+      1050, /* GL_ONE_MINUS_DST_COLOR */
+      1466, /* GL_SRC_ALPHA_SATURATE */
+       577, /* GL_FRONT_LEFT */
+       578, /* GL_FRONT_RIGHT */
+        69, /* GL_BACK_LEFT */
+        70, /* GL_BACK_RIGHT */
+       574, /* GL_FRONT */
+        68, /* GL_BACK */
+       666, /* GL_LEFT */
+      1368, /* GL_RIGHT */
+       575, /* GL_FRONT_AND_BACK */
+        63, /* GL_AUX0 */
+        64, /* GL_AUX1 */
+        65, /* GL_AUX2 */
+        66, /* GL_AUX3 */
+       656, /* GL_INVALID_ENUM */
+       660, /* GL_INVALID_VALUE */
+       659, /* GL_INVALID_OPERATION */
+      1472, /* GL_STACK_OVERFLOW */
+      1473, /* GL_STACK_UNDERFLOW */
+      1077, /* GL_OUT_OF_MEMORY */
+       657, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1093, /* GL_PASS_THROUGH_TOKEN */
-      1153, /* GL_POINT_TOKEN */
-       699, /* GL_LINE_TOKEN */
-      1167, /* GL_POLYGON_TOKEN */
-        73, /* GL_BITMAP_TOKEN */
-       441, /* GL_DRAW_PIXEL_TOKEN */
-       299, /* GL_COPY_PIXEL_TOKEN */
-       692, /* GL_LINE_RESET_TOKEN */
-       466, /* GL_EXP */
-       467, /* GL_EXP2 */
-       335, /* GL_CW */
-       124, /* GL_CCW */
-       145, /* GL_COEFF */
-      1070, /* GL_ORDER */
-       379, /* GL_DOMAIN */
-       309, /* GL_CURRENT_COLOR */
-       312, /* GL_CURRENT_INDEX */
-       318, /* GL_CURRENT_NORMAL */
-       331, /* GL_CURRENT_TEXTURE_COORDS */
-       323, /* GL_CURRENT_RASTER_COLOR */
-       325, /* GL_CURRENT_RASTER_INDEX */
-       329, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
-       326, /* GL_CURRENT_RASTER_POSITION */
-       327, /* GL_CURRENT_RASTER_POSITION_VALID */
-       324, /* GL_CURRENT_RASTER_DISTANCE */
-      1146, /* GL_POINT_SMOOTH */
-      1135, /* GL_POINT_SIZE */
-      1145, /* GL_POINT_SIZE_RANGE */
-      1136, /* GL_POINT_SIZE_GRANULARITY */
-       693, /* GL_LINE_SMOOTH */
-       700, /* GL_LINE_WIDTH */
-       702, /* GL_LINE_WIDTH_RANGE */
-       701, /* GL_LINE_WIDTH_GRANULARITY */
-       695, /* GL_LINE_STIPPLE */
-       696, /* GL_LINE_STIPPLE_PATTERN */
-       697, /* GL_LINE_STIPPLE_REPEAT */
-       707, /* GL_LIST_MODE */
-       872, /* GL_MAX_LIST_NESTING */
-       704, /* GL_LIST_BASE */
-       706, /* GL_LIST_INDEX */
-      1156, /* GL_POLYGON_MODE */
-      1163, /* GL_POLYGON_SMOOTH */
-      1165, /* GL_POLYGON_STIPPLE */
-       452, /* GL_EDGE_FLAG */
-       302, /* GL_CULL_FACE */
-       303, /* GL_CULL_FACE_MODE */
-       574, /* GL_FRONT_FACE */
-       675, /* GL_LIGHTING */
-       680, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-       681, /* GL_LIGHT_MODEL_TWO_SIDE */
-       677, /* GL_LIGHT_MODEL_AMBIENT */
-      1410, /* GL_SHADE_MODEL */
-       192, /* GL_COLOR_MATERIAL_FACE */
-       193, /* GL_COLOR_MATERIAL_PARAMETER */
-       191, /* GL_COLOR_MATERIAL */
-       501, /* GL_FOG */
-       523, /* GL_FOG_INDEX */
-       519, /* GL_FOG_DENSITY */
-       527, /* GL_FOG_START */
-       521, /* GL_FOG_END */
-       524, /* GL_FOG_MODE */
-       503, /* GL_FOG_COLOR */
-       366, /* GL_DEPTH_RANGE */
-       373, /* GL_DEPTH_TEST */
-       376, /* GL_DEPTH_WRITEMASK */
-       354, /* GL_DEPTH_CLEAR_VALUE */
-       365, /* GL_DEPTH_FUNC */
+      1097, /* GL_PASS_THROUGH_TOKEN */
+      1157, /* GL_POINT_TOKEN */
+       701, /* GL_LINE_TOKEN */
+      1171, /* GL_POLYGON_TOKEN */
+        74, /* GL_BITMAP_TOKEN */
+       443, /* GL_DRAW_PIXEL_TOKEN */
+       301, /* GL_COPY_PIXEL_TOKEN */
+       694, /* GL_LINE_RESET_TOKEN */
+       468, /* GL_EXP */
+       469, /* GL_EXP2 */
+       337, /* GL_CW */
+       125, /* GL_CCW */
+       146, /* GL_COEFF */
+      1074, /* GL_ORDER */
+       381, /* GL_DOMAIN */
+       311, /* GL_CURRENT_COLOR */
+       314, /* GL_CURRENT_INDEX */
+       320, /* GL_CURRENT_NORMAL */
+       333, /* GL_CURRENT_TEXTURE_COORDS */
+       325, /* GL_CURRENT_RASTER_COLOR */
+       327, /* GL_CURRENT_RASTER_INDEX */
+       331, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+       328, /* GL_CURRENT_RASTER_POSITION */
+       329, /* GL_CURRENT_RASTER_POSITION_VALID */
+       326, /* GL_CURRENT_RASTER_DISTANCE */
+      1150, /* GL_POINT_SMOOTH */
+      1139, /* GL_POINT_SIZE */
+      1149, /* GL_POINT_SIZE_RANGE */
+      1140, /* GL_POINT_SIZE_GRANULARITY */
+       695, /* GL_LINE_SMOOTH */
+       702, /* GL_LINE_WIDTH */
+       704, /* GL_LINE_WIDTH_RANGE */
+       703, /* GL_LINE_WIDTH_GRANULARITY */
+       697, /* GL_LINE_STIPPLE */
+       698, /* GL_LINE_STIPPLE_PATTERN */
+       699, /* GL_LINE_STIPPLE_REPEAT */
+       709, /* GL_LIST_MODE */
+       874, /* GL_MAX_LIST_NESTING */
+       706, /* GL_LIST_BASE */
+       708, /* GL_LIST_INDEX */
+      1160, /* GL_POLYGON_MODE */
+      1167, /* GL_POLYGON_SMOOTH */
+      1169, /* GL_POLYGON_STIPPLE */
+       454, /* GL_EDGE_FLAG */
+       304, /* GL_CULL_FACE */
+       305, /* GL_CULL_FACE_MODE */
+       576, /* GL_FRONT_FACE */
+       677, /* GL_LIGHTING */
+       682, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+       683, /* GL_LIGHT_MODEL_TWO_SIDE */
+       679, /* GL_LIGHT_MODEL_AMBIENT */
+      1414, /* GL_SHADE_MODEL */
+       193, /* GL_COLOR_MATERIAL_FACE */
+       194, /* GL_COLOR_MATERIAL_PARAMETER */
+       192, /* GL_COLOR_MATERIAL */
+       503, /* GL_FOG */
+       525, /* GL_FOG_INDEX */
+       521, /* GL_FOG_DENSITY */
+       529, /* GL_FOG_START */
+       523, /* GL_FOG_END */
+       526, /* GL_FOG_MODE */
+       505, /* GL_FOG_COLOR */
+       368, /* GL_DEPTH_RANGE */
+       375, /* GL_DEPTH_TEST */
+       378, /* GL_DEPTH_WRITEMASK */
+       356, /* GL_DEPTH_CLEAR_VALUE */
+       367, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1503, /* GL_STENCIL_TEST */
-      1491, /* GL_STENCIL_CLEAR_VALUE */
-      1493, /* GL_STENCIL_FUNC */
-      1505, /* GL_STENCIL_VALUE_MASK */
-      1492, /* GL_STENCIL_FAIL */
-      1500, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1501, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1502, /* GL_STENCIL_REF */
-      1506, /* GL_STENCIL_WRITEMASK */
-       841, /* GL_MATRIX_MODE */
-      1009, /* GL_NORMALIZE */
-      1823, /* GL_VIEWPORT */
-       983, /* GL_MODELVIEW_STACK_DEPTH */
-      1246, /* GL_PROJECTION_STACK_DEPTH */
-      1707, /* GL_TEXTURE_STACK_DEPTH */
-       981, /* GL_MODELVIEW_MATRIX */
-      1245, /* GL_PROJECTION_MATRIX */
-      1690, /* GL_TEXTURE_MATRIX */
-        60, /* GL_ATTRIB_STACK_DEPTH */
-       135, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+      1508, /* GL_STENCIL_TEST */
+      1496, /* GL_STENCIL_CLEAR_VALUE */
+      1498, /* GL_STENCIL_FUNC */
+      1510, /* GL_STENCIL_VALUE_MASK */
+      1497, /* GL_STENCIL_FAIL */
+      1505, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1506, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1507, /* GL_STENCIL_REF */
+      1511, /* GL_STENCIL_WRITEMASK */
+       843, /* GL_MATRIX_MODE */
+      1012, /* GL_NORMALIZE */
+      1837, /* GL_VIEWPORT */
+       986, /* GL_MODELVIEW_STACK_DEPTH */
+      1250, /* GL_PROJECTION_STACK_DEPTH */
+      1718, /* GL_TEXTURE_STACK_DEPTH */
+       984, /* GL_MODELVIEW_MATRIX */
+      1249, /* GL_PROJECTION_MATRIX */
+      1701, /* GL_TEXTURE_MATRIX */
+        61, /* GL_ATTRIB_STACK_DEPTH */
+       136, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         43, /* GL_ALPHA_TEST */
         44, /* GL_ALPHA_TEST_FUNC */
         45, /* GL_ALPHA_TEST_REF */
-       378, /* GL_DITHER */
-        77, /* GL_BLEND_DST */
-        86, /* GL_BLEND_SRC */
-        74, /* GL_BLEND */
-       710, /* GL_LOGIC_OP_MODE */
-       628, /* GL_INDEX_LOGIC_OP */
-       190, /* GL_COLOR_LOGIC_OP */
-        66, /* GL_AUX_BUFFERS */
-       389, /* GL_DRAW_BUFFER */
-      1280, /* GL_READ_BUFFER */
-      1391, /* GL_SCISSOR_BOX */
-      1392, /* GL_SCISSOR_TEST */
-       627, /* GL_INDEX_CLEAR_VALUE */
-       632, /* GL_INDEX_WRITEMASK */
-       187, /* GL_COLOR_CLEAR_VALUE */
-       229, /* GL_COLOR_WRITEMASK */
-       629, /* GL_INDEX_MODE */
-      1357, /* GL_RGBA_MODE */
-       388, /* GL_DOUBLEBUFFER */
-      1507, /* GL_STEREO */
-      1315, /* GL_RENDER_MODE */
-      1094, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1147, /* GL_POINT_SMOOTH_HINT */
-       694, /* GL_LINE_SMOOTH_HINT */
-      1164, /* GL_POLYGON_SMOOTH_HINT */
-       522, /* GL_FOG_HINT */
-      1671, /* GL_TEXTURE_GEN_S */
-      1672, /* GL_TEXTURE_GEN_T */
-      1670, /* GL_TEXTURE_GEN_R */
-      1669, /* GL_TEXTURE_GEN_Q */
-      1107, /* GL_PIXEL_MAP_I_TO_I */
-      1113, /* GL_PIXEL_MAP_S_TO_S */
-      1109, /* GL_PIXEL_MAP_I_TO_R */
-      1105, /* GL_PIXEL_MAP_I_TO_G */
-      1103, /* GL_PIXEL_MAP_I_TO_B */
-      1101, /* GL_PIXEL_MAP_I_TO_A */
-      1111, /* GL_PIXEL_MAP_R_TO_R */
-      1099, /* GL_PIXEL_MAP_G_TO_G */
-      1097, /* GL_PIXEL_MAP_B_TO_B */
-      1095, /* GL_PIXEL_MAP_A_TO_A */
-      1108, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1114, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1110, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1106, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1104, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1102, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1112, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1100, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1098, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1096, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1742, /* GL_UNPACK_SWAP_BYTES */
-      1737, /* GL_UNPACK_LSB_FIRST */
-      1738, /* GL_UNPACK_ROW_LENGTH */
-      1741, /* GL_UNPACK_SKIP_ROWS */
-      1740, /* GL_UNPACK_SKIP_PIXELS */
-      1735, /* GL_UNPACK_ALIGNMENT */
-      1082, /* GL_PACK_SWAP_BYTES */
-      1077, /* GL_PACK_LSB_FIRST */
-      1078, /* GL_PACK_ROW_LENGTH */
-      1081, /* GL_PACK_SKIP_ROWS */
-      1080, /* GL_PACK_SKIP_PIXELS */
-      1074, /* GL_PACK_ALIGNMENT */
-       788, /* GL_MAP_COLOR */
-       793, /* GL_MAP_STENCIL */
-       631, /* GL_INDEX_SHIFT */
-       630, /* GL_INDEX_OFFSET */
-      1293, /* GL_RED_SCALE */
-      1291, /* GL_RED_BIAS */
-      1840, /* GL_ZOOM_X */
-      1841, /* GL_ZOOM_Y */
-       592, /* GL_GREEN_SCALE */
-       590, /* GL_GREEN_BIAS */
-        92, /* GL_BLUE_SCALE */
-        90, /* GL_BLUE_BIAS */
+       380, /* GL_DITHER */
+        78, /* GL_BLEND_DST */
+        87, /* GL_BLEND_SRC */
+        75, /* GL_BLEND */
+       712, /* GL_LOGIC_OP_MODE */
+       630, /* GL_INDEX_LOGIC_OP */
+       191, /* GL_COLOR_LOGIC_OP */
+        67, /* GL_AUX_BUFFERS */
+       391, /* GL_DRAW_BUFFER */
+      1284, /* GL_READ_BUFFER */
+      1395, /* GL_SCISSOR_BOX */
+      1396, /* GL_SCISSOR_TEST */
+       629, /* GL_INDEX_CLEAR_VALUE */
+       634, /* GL_INDEX_WRITEMASK */
+       188, /* GL_COLOR_CLEAR_VALUE */
+       230, /* GL_COLOR_WRITEMASK */
+       631, /* GL_INDEX_MODE */
+      1361, /* GL_RGBA_MODE */
+       390, /* GL_DOUBLEBUFFER */
+      1512, /* GL_STEREO */
+      1319, /* GL_RENDER_MODE */
+      1098, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1151, /* GL_POINT_SMOOTH_HINT */
+       696, /* GL_LINE_SMOOTH_HINT */
+      1168, /* GL_POLYGON_SMOOTH_HINT */
+       524, /* GL_FOG_HINT */
+      1682, /* GL_TEXTURE_GEN_S */
+      1683, /* GL_TEXTURE_GEN_T */
+      1681, /* GL_TEXTURE_GEN_R */
+      1680, /* GL_TEXTURE_GEN_Q */
+      1111, /* GL_PIXEL_MAP_I_TO_I */
+      1117, /* GL_PIXEL_MAP_S_TO_S */
+      1113, /* GL_PIXEL_MAP_I_TO_R */
+      1109, /* GL_PIXEL_MAP_I_TO_G */
+      1107, /* GL_PIXEL_MAP_I_TO_B */
+      1105, /* GL_PIXEL_MAP_I_TO_A */
+      1115, /* GL_PIXEL_MAP_R_TO_R */
+      1103, /* GL_PIXEL_MAP_G_TO_G */
+      1101, /* GL_PIXEL_MAP_B_TO_B */
+      1099, /* GL_PIXEL_MAP_A_TO_A */
+      1112, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1118, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1114, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1110, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1108, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1106, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1116, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1104, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1102, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1100, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      1755, /* GL_UNPACK_SWAP_BYTES */
+      1750, /* GL_UNPACK_LSB_FIRST */
+      1751, /* GL_UNPACK_ROW_LENGTH */
+      1754, /* GL_UNPACK_SKIP_ROWS */
+      1753, /* GL_UNPACK_SKIP_PIXELS */
+      1748, /* GL_UNPACK_ALIGNMENT */
+      1086, /* GL_PACK_SWAP_BYTES */
+      1081, /* GL_PACK_LSB_FIRST */
+      1082, /* GL_PACK_ROW_LENGTH */
+      1085, /* GL_PACK_SKIP_ROWS */
+      1084, /* GL_PACK_SKIP_PIXELS */
+      1078, /* GL_PACK_ALIGNMENT */
+       790, /* GL_MAP_COLOR */
+       795, /* GL_MAP_STENCIL */
+       633, /* GL_INDEX_SHIFT */
+       632, /* GL_INDEX_OFFSET */
+      1297, /* GL_RED_SCALE */
+      1295, /* GL_RED_BIAS */
+      1855, /* GL_ZOOM_X */
+      1856, /* GL_ZOOM_Y */
+       594, /* GL_GREEN_SCALE */
+       592, /* GL_GREEN_BIAS */
+        93, /* GL_BLUE_SCALE */
+        91, /* GL_BLUE_BIAS */
         42, /* GL_ALPHA_SCALE */
         40, /* GL_ALPHA_BIAS */
-       367, /* GL_DEPTH_SCALE */
-       348, /* GL_DEPTH_BIAS */
-       867, /* GL_MAX_EVAL_ORDER */
-       871, /* GL_MAX_LIGHTS */
-       850, /* GL_MAX_CLIP_PLANES */
-       916, /* GL_MAX_TEXTURE_SIZE */
-       877, /* GL_MAX_PIXEL_MAP_TABLE */
-       846, /* GL_MAX_ATTRIB_STACK_DEPTH */
-       874, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-       875, /* GL_MAX_NAME_STACK_DEPTH */
-       903, /* GL_MAX_PROJECTION_STACK_DEPTH */
-       917, /* GL_MAX_TEXTURE_STACK_DEPTH */
-       931, /* GL_MAX_VIEWPORT_DIMS */
-       847, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1517, /* GL_SUBPIXEL_BITS */
-       626, /* GL_INDEX_BITS */
-      1292, /* GL_RED_BITS */
-       591, /* GL_GREEN_BITS */
-        91, /* GL_BLUE_BITS */
+       369, /* GL_DEPTH_SCALE */
+       350, /* GL_DEPTH_BIAS */
+       869, /* GL_MAX_EVAL_ORDER */
+       873, /* GL_MAX_LIGHTS */
+       852, /* GL_MAX_CLIP_PLANES */
+       919, /* GL_MAX_TEXTURE_SIZE */
+       879, /* GL_MAX_PIXEL_MAP_TABLE */
+       848, /* GL_MAX_ATTRIB_STACK_DEPTH */
+       876, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+       877, /* GL_MAX_NAME_STACK_DEPTH */
+       905, /* GL_MAX_PROJECTION_STACK_DEPTH */
+       920, /* GL_MAX_TEXTURE_STACK_DEPTH */
+       934, /* GL_MAX_VIEWPORT_DIMS */
+       849, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+      1522, /* GL_SUBPIXEL_BITS */
+       628, /* GL_INDEX_BITS */
+      1296, /* GL_RED_BITS */
+       593, /* GL_GREEN_BITS */
+        92, /* GL_BLUE_BITS */
         41, /* GL_ALPHA_BITS */
-       349, /* GL_DEPTH_BITS */
-      1489, /* GL_STENCIL_BITS */
+       351, /* GL_DEPTH_BITS */
+      1494, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-       997, /* GL_NAME_STACK_DEPTH */
-        61, /* GL_AUTO_NORMAL */
-       734, /* GL_MAP1_COLOR_4 */
-       737, /* GL_MAP1_INDEX */
-       738, /* GL_MAP1_NORMAL */
-       739, /* GL_MAP1_TEXTURE_COORD_1 */
-       740, /* GL_MAP1_TEXTURE_COORD_2 */
-       741, /* GL_MAP1_TEXTURE_COORD_3 */
-       742, /* GL_MAP1_TEXTURE_COORD_4 */
-       743, /* GL_MAP1_VERTEX_3 */
-       744, /* GL_MAP1_VERTEX_4 */
-       761, /* GL_MAP2_COLOR_4 */
-       764, /* GL_MAP2_INDEX */
-       765, /* GL_MAP2_NORMAL */
-       766, /* GL_MAP2_TEXTURE_COORD_1 */
-       767, /* GL_MAP2_TEXTURE_COORD_2 */
-       768, /* GL_MAP2_TEXTURE_COORD_3 */
-       769, /* GL_MAP2_TEXTURE_COORD_4 */
-       770, /* GL_MAP2_VERTEX_3 */
-       771, /* GL_MAP2_VERTEX_4 */
-       735, /* GL_MAP1_GRID_DOMAIN */
-       736, /* GL_MAP1_GRID_SEGMENTS */
-       762, /* GL_MAP2_GRID_DOMAIN */
-       763, /* GL_MAP2_GRID_SEGMENTS */
-      1594, /* GL_TEXTURE_1D */
-      1596, /* GL_TEXTURE_2D */
-       476, /* GL_FEEDBACK_BUFFER_POINTER */
-       477, /* GL_FEEDBACK_BUFFER_SIZE */
-       478, /* GL_FEEDBACK_BUFFER_TYPE */
-      1401, /* GL_SELECTION_BUFFER_POINTER */
-      1402, /* GL_SELECTION_BUFFER_SIZE */
-      1712, /* GL_TEXTURE_WIDTH */
-      1676, /* GL_TEXTURE_HEIGHT */
-      1631, /* GL_TEXTURE_COMPONENTS */
-      1615, /* GL_TEXTURE_BORDER_COLOR */
-      1614, /* GL_TEXTURE_BORDER */
-       380, /* GL_DONT_CARE */
-       474, /* GL_FASTEST */
-      1005, /* GL_NICEST */
-        47, /* GL_AMBIENT */
-       377, /* GL_DIFFUSE */
-      1449, /* GL_SPECULAR */
-      1168, /* GL_POSITION */
-      1452, /* GL_SPOT_DIRECTION */
-      1453, /* GL_SPOT_EXPONENT */
-      1451, /* GL_SPOT_CUTOFF */
-       273, /* GL_CONSTANT_ATTENUATION */
-       684, /* GL_LINEAR_ATTENUATION */
-      1266, /* GL_QUADRATIC_ATTENUATION */
-       243, /* GL_COMPILE */
-       244, /* GL_COMPILE_AND_EXECUTE */
-       119, /* GL_BYTE */
-      1743, /* GL_UNSIGNED_BYTE */
-      1415, /* GL_SHORT */
-      1754, /* GL_UNSIGNED_SHORT */
-       634, /* GL_INT */
-      1746, /* GL_UNSIGNED_INT */
-       482, /* GL_FLOAT */
+      1000, /* GL_NAME_STACK_DEPTH */
+        62, /* GL_AUTO_NORMAL */
+       736, /* GL_MAP1_COLOR_4 */
+       739, /* GL_MAP1_INDEX */
+       740, /* GL_MAP1_NORMAL */
+       741, /* GL_MAP1_TEXTURE_COORD_1 */
+       742, /* GL_MAP1_TEXTURE_COORD_2 */
+       743, /* GL_MAP1_TEXTURE_COORD_3 */
+       744, /* GL_MAP1_TEXTURE_COORD_4 */
+       745, /* GL_MAP1_VERTEX_3 */
+       746, /* GL_MAP1_VERTEX_4 */
+       763, /* GL_MAP2_COLOR_4 */
+       766, /* GL_MAP2_INDEX */
+       767, /* GL_MAP2_NORMAL */
+       768, /* GL_MAP2_TEXTURE_COORD_1 */
+       769, /* GL_MAP2_TEXTURE_COORD_2 */
+       770, /* GL_MAP2_TEXTURE_COORD_3 */
+       771, /* GL_MAP2_TEXTURE_COORD_4 */
+       772, /* GL_MAP2_VERTEX_3 */
+       773, /* GL_MAP2_VERTEX_4 */
+       737, /* GL_MAP1_GRID_DOMAIN */
+       738, /* GL_MAP1_GRID_SEGMENTS */
+       764, /* GL_MAP2_GRID_DOMAIN */
+       765, /* GL_MAP2_GRID_SEGMENTS */
+      1605, /* GL_TEXTURE_1D */
+      1607, /* GL_TEXTURE_2D */
+       478, /* GL_FEEDBACK_BUFFER_POINTER */
+       479, /* GL_FEEDBACK_BUFFER_SIZE */
+       480, /* GL_FEEDBACK_BUFFER_TYPE */
+      1405, /* GL_SELECTION_BUFFER_POINTER */
+      1406, /* GL_SELECTION_BUFFER_SIZE */
+      1723, /* GL_TEXTURE_WIDTH */
+      1687, /* GL_TEXTURE_HEIGHT */
+      1642, /* GL_TEXTURE_COMPONENTS */
+      1626, /* GL_TEXTURE_BORDER_COLOR */
+      1625, /* GL_TEXTURE_BORDER */
+       382, /* GL_DONT_CARE */
+       476, /* GL_FASTEST */
+      1008, /* GL_NICEST */
+        48, /* GL_AMBIENT */
+       379, /* GL_DIFFUSE */
+      1454, /* GL_SPECULAR */
+      1172, /* GL_POSITION */
+      1457, /* GL_SPOT_DIRECTION */
+      1458, /* GL_SPOT_EXPONENT */
+      1456, /* GL_SPOT_CUTOFF */
+       275, /* GL_CONSTANT_ATTENUATION */
+       686, /* GL_LINEAR_ATTENUATION */
+      1270, /* GL_QUADRATIC_ATTENUATION */
+       244, /* GL_COMPILE */
+       245, /* GL_COMPILE_AND_EXECUTE */
+       120, /* GL_BYTE */
+      1757, /* GL_UNSIGNED_BYTE */
+      1419, /* GL_SHORT */
+      1768, /* GL_UNSIGNED_SHORT */
+       636, /* GL_INT */
+      1760, /* GL_UNSIGNED_INT */
+       484, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
          7, /* GL_4_BYTES */
-       387, /* GL_DOUBLE */
-       131, /* GL_CLEAR */
-        49, /* GL_AND */
-        51, /* GL_AND_REVERSE */
-       297, /* GL_COPY */
-        50, /* GL_AND_INVERTED */
-      1007, /* GL_NOOP */
-      1836, /* GL_XOR */
-      1069, /* GL_OR */
-      1008, /* GL_NOR */
-       464, /* GL_EQUIV */
-       661, /* GL_INVERT */
-      1072, /* GL_OR_REVERSE */
-       298, /* GL_COPY_INVERTED */
-      1071, /* GL_OR_INVERTED */
-       998, /* GL_NAND */
-      1406, /* GL_SET */
-       461, /* GL_EMISSION */
-      1414, /* GL_SHININESS */
-        48, /* GL_AMBIENT_AND_DIFFUSE */
-       189, /* GL_COLOR_INDEXES */
-       948, /* GL_MODELVIEW */
-      1244, /* GL_PROJECTION */
-      1529, /* GL_TEXTURE */
-       146, /* GL_COLOR */
-       344, /* GL_DEPTH */
-      1475, /* GL_STENCIL */
-       188, /* GL_COLOR_INDEX */
-      1494, /* GL_STENCIL_INDEX */
-       355, /* GL_DEPTH_COMPONENT */
-      1288, /* GL_RED */
-       589, /* GL_GREEN */
-        89, /* GL_BLUE */
+       389, /* GL_DOUBLE */
+       132, /* GL_CLEAR */
+        50, /* GL_AND */
+        52, /* GL_AND_REVERSE */
+       299, /* GL_COPY */
+        51, /* GL_AND_INVERTED */
+      1010, /* GL_NOOP */
+      1851, /* GL_XOR */
+      1073, /* GL_OR */
+      1011, /* GL_NOR */
+       466, /* GL_EQUIV */
+       663, /* GL_INVERT */
+      1076, /* GL_OR_REVERSE */
+       300, /* GL_COPY_INVERTED */
+      1075, /* GL_OR_INVERTED */
+      1001, /* GL_NAND */
+      1410, /* GL_SET */
+       463, /* GL_EMISSION */
+      1418, /* GL_SHININESS */
+        49, /* GL_AMBIENT_AND_DIFFUSE */
+       190, /* GL_COLOR_INDEXES */
+       951, /* GL_MODELVIEW */
+      1248, /* GL_PROJECTION */
+      1540, /* GL_TEXTURE */
+       147, /* GL_COLOR */
+       346, /* GL_DEPTH */
+      1480, /* GL_STENCIL */
+       189, /* GL_COLOR_INDEX */
+      1499, /* GL_STENCIL_INDEX */
+       357, /* GL_DEPTH_COMPONENT */
+      1292, /* GL_RED */
+       591, /* GL_GREEN */
+        90, /* GL_BLUE */
         31, /* GL_ALPHA */
-      1323, /* GL_RGB */
-      1342, /* GL_RGBA */
-       712, /* GL_LUMINANCE */
-       733, /* GL_LUMINANCE_ALPHA */
-        72, /* GL_BITMAP */
-      1124, /* GL_POINT */
-       682, /* GL_LINE */
-       479, /* GL_FILL */
-      1297, /* GL_RENDER */
-       475, /* GL_FEEDBACK */
-      1400, /* GL_SELECT */
-       481, /* GL_FLAT */
-      1424, /* GL_SMOOTH */
-       662, /* GL_KEEP */
-      1317, /* GL_REPLACE */
-       616, /* GL_INCR */
-       340, /* GL_DECR */
-      1769, /* GL_VENDOR */
-      1314, /* GL_RENDERER */
-      1770, /* GL_VERSION */
-       468, /* GL_EXTENSIONS */
-      1365, /* GL_S */
-      1520, /* GL_T */
-      1277, /* GL_R */
-      1265, /* GL_Q */
-       984, /* GL_MODULATE */
-       339, /* GL_DECAL */
-      1666, /* GL_TEXTURE_ENV_MODE */
-      1665, /* GL_TEXTURE_ENV_COLOR */
-      1664, /* GL_TEXTURE_ENV */
-       469, /* GL_EYE_LINEAR */
-      1031, /* GL_OBJECT_LINEAR */
-      1450, /* GL_SPHERE_MAP */
-      1668, /* GL_TEXTURE_GEN_MODE */
-      1033, /* GL_OBJECT_PLANE */
-       470, /* GL_EYE_PLANE */
-       999, /* GL_NEAREST */
-       683, /* GL_LINEAR */
-      1003, /* GL_NEAREST_MIPMAP_NEAREST */
-       688, /* GL_LINEAR_MIPMAP_NEAREST */
-      1002, /* GL_NEAREST_MIPMAP_LINEAR */
-       687, /* GL_LINEAR_MIPMAP_LINEAR */
-      1689, /* GL_TEXTURE_MAG_FILTER */
-      1697, /* GL_TEXTURE_MIN_FILTER */
-      1714, /* GL_TEXTURE_WRAP_S */
-      1715, /* GL_TEXTURE_WRAP_T */
-       125, /* GL_CLAMP */
-      1316, /* GL_REPEAT */
-      1162, /* GL_POLYGON_OFFSET_UNITS */
-      1161, /* GL_POLYGON_OFFSET_POINT */
-      1160, /* GL_POLYGON_OFFSET_LINE */
-      1278, /* GL_R3_G3_B2 */
-      1766, /* GL_V2F */
-      1767, /* GL_V3F */
-       122, /* GL_C4UB_V2F */
-       123, /* GL_C4UB_V3F */
-       120, /* GL_C3F_V3F */
-       996, /* GL_N3F_V3F */
-       121, /* GL_C4F_N3F_V3F */
-      1525, /* GL_T2F_V3F */
-      1527, /* GL_T4F_V4F */
-      1523, /* GL_T2F_C4UB_V3F */
-      1521, /* GL_T2F_C3F_V3F */
-      1524, /* GL_T2F_N3F_V3F */
-      1522, /* GL_T2F_C4F_N3F_V3F */
-      1526, /* GL_T4F_C4F_N3F_V4F */
-       138, /* GL_CLIP_PLANE0 */
-       139, /* GL_CLIP_PLANE1 */
-       140, /* GL_CLIP_PLANE2 */
-       141, /* GL_CLIP_PLANE3 */
-       142, /* GL_CLIP_PLANE4 */
-       143, /* GL_CLIP_PLANE5 */
-       667, /* GL_LIGHT0 */
-       668, /* GL_LIGHT1 */
-       669, /* GL_LIGHT2 */
-       670, /* GL_LIGHT3 */
-       671, /* GL_LIGHT4 */
-       672, /* GL_LIGHT5 */
-       673, /* GL_LIGHT6 */
-       674, /* GL_LIGHT7 */
-       593, /* GL_HINT_BIT */
-       275, /* GL_CONSTANT_COLOR */
-      1043, /* GL_ONE_MINUS_CONSTANT_COLOR */
-       270, /* GL_CONSTANT_ALPHA */
-      1041, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-        75, /* GL_BLEND_COLOR */
-       577, /* GL_FUNC_ADD */
-       932, /* GL_MIN */
-       843, /* GL_MAX */
-        80, /* GL_BLEND_EQUATION */
-       581, /* GL_FUNC_SUBTRACT */
-       579, /* GL_FUNC_REVERSE_SUBTRACT */
-       278, /* GL_CONVOLUTION_1D */
-       279, /* GL_CONVOLUTION_2D */
-      1403, /* GL_SEPARABLE_2D */
-       282, /* GL_CONVOLUTION_BORDER_MODE */
-       286, /* GL_CONVOLUTION_FILTER_SCALE */
-       284, /* GL_CONVOLUTION_FILTER_BIAS */
-      1289, /* GL_REDUCE */
-       288, /* GL_CONVOLUTION_FORMAT */
-       292, /* GL_CONVOLUTION_WIDTH */
-       290, /* GL_CONVOLUTION_HEIGHT */
-       858, /* GL_MAX_CONVOLUTION_WIDTH */
-       856, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1201, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1197, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1192, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1188, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1199, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1195, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1190, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1186, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-       594, /* GL_HISTOGRAM */
-      1249, /* GL_PROXY_HISTOGRAM */
-       610, /* GL_HISTOGRAM_WIDTH */
-       600, /* GL_HISTOGRAM_FORMAT */
-       606, /* GL_HISTOGRAM_RED_SIZE */
-       602, /* GL_HISTOGRAM_GREEN_SIZE */
-       597, /* GL_HISTOGRAM_BLUE_SIZE */
-       595, /* GL_HISTOGRAM_ALPHA_SIZE */
-       604, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-       608, /* GL_HISTOGRAM_SINK */
-       933, /* GL_MINMAX */
-       935, /* GL_MINMAX_FORMAT */
-       937, /* GL_MINMAX_SINK */
-      1528, /* GL_TABLE_TOO_LARGE_EXT */
-      1745, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1756, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1758, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1751, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1747, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1159, /* GL_POLYGON_OFFSET_FILL */
-      1158, /* GL_POLYGON_OFFSET_FACTOR */
-      1157, /* GL_POLYGON_OFFSET_BIAS */
-      1320, /* GL_RESCALE_NORMAL */
+      1327, /* GL_RGB */
+      1346, /* GL_RGBA */
+       714, /* GL_LUMINANCE */
+       735, /* GL_LUMINANCE_ALPHA */
+        73, /* GL_BITMAP */
+      1128, /* GL_POINT */
+       684, /* GL_LINE */
+       481, /* GL_FILL */
+      1301, /* GL_RENDER */
+       477, /* GL_FEEDBACK */
+      1404, /* GL_SELECT */
+       483, /* GL_FLAT */
+      1429, /* GL_SMOOTH */
+       664, /* GL_KEEP */
+      1321, /* GL_REPLACE */
+       618, /* GL_INCR */
+       342, /* GL_DECR */
+      1783, /* GL_VENDOR */
+      1318, /* GL_RENDERER */
+      1784, /* GL_VERSION */
+       470, /* GL_EXTENSIONS */
+      1369, /* GL_S */
+      1531, /* GL_T */
+      1281, /* GL_R */
+      1269, /* GL_Q */
+       987, /* GL_MODULATE */
+       341, /* GL_DECAL */
+      1677, /* GL_TEXTURE_ENV_MODE */
+      1676, /* GL_TEXTURE_ENV_COLOR */
+      1675, /* GL_TEXTURE_ENV */
+       471, /* GL_EYE_LINEAR */
+      1034, /* GL_OBJECT_LINEAR */
+      1455, /* GL_SPHERE_MAP */
+      1679, /* GL_TEXTURE_GEN_MODE */
+      1036, /* GL_OBJECT_PLANE */
+       472, /* GL_EYE_PLANE */
+      1002, /* GL_NEAREST */
+       685, /* GL_LINEAR */
+      1006, /* GL_NEAREST_MIPMAP_NEAREST */
+       690, /* GL_LINEAR_MIPMAP_NEAREST */
+      1005, /* GL_NEAREST_MIPMAP_LINEAR */
+       689, /* GL_LINEAR_MIPMAP_LINEAR */
+      1700, /* GL_TEXTURE_MAG_FILTER */
+      1708, /* GL_TEXTURE_MIN_FILTER */
+      1725, /* GL_TEXTURE_WRAP_S */
+      1726, /* GL_TEXTURE_WRAP_T */
+       126, /* GL_CLAMP */
+      1320, /* GL_REPEAT */
+      1166, /* GL_POLYGON_OFFSET_UNITS */
+      1165, /* GL_POLYGON_OFFSET_POINT */
+      1164, /* GL_POLYGON_OFFSET_LINE */
+      1282, /* GL_R3_G3_B2 */
+      1780, /* GL_V2F */
+      1781, /* GL_V3F */
+       123, /* GL_C4UB_V2F */
+       124, /* GL_C4UB_V3F */
+       121, /* GL_C3F_V3F */
+       999, /* GL_N3F_V3F */
+       122, /* GL_C4F_N3F_V3F */
+      1536, /* GL_T2F_V3F */
+      1538, /* GL_T4F_V4F */
+      1534, /* GL_T2F_C4UB_V3F */
+      1532, /* GL_T2F_C3F_V3F */
+      1535, /* GL_T2F_N3F_V3F */
+      1533, /* GL_T2F_C4F_N3F_V3F */
+      1537, /* GL_T4F_C4F_N3F_V4F */
+       139, /* GL_CLIP_PLANE0 */
+       140, /* GL_CLIP_PLANE1 */
+       141, /* GL_CLIP_PLANE2 */
+       142, /* GL_CLIP_PLANE3 */
+       143, /* GL_CLIP_PLANE4 */
+       144, /* GL_CLIP_PLANE5 */
+       669, /* GL_LIGHT0 */
+       670, /* GL_LIGHT1 */
+       671, /* GL_LIGHT2 */
+       672, /* GL_LIGHT3 */
+       673, /* GL_LIGHT4 */
+       674, /* GL_LIGHT5 */
+       675, /* GL_LIGHT6 */
+       676, /* GL_LIGHT7 */
+       595, /* GL_HINT_BIT */
+       277, /* GL_CONSTANT_COLOR */
+      1047, /* GL_ONE_MINUS_CONSTANT_COLOR */
+       272, /* GL_CONSTANT_ALPHA */
+      1045, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+        76, /* GL_BLEND_COLOR */
+       579, /* GL_FUNC_ADD */
+       935, /* GL_MIN */
+       845, /* GL_MAX */
+        81, /* GL_BLEND_EQUATION */
+       583, /* GL_FUNC_SUBTRACT */
+       581, /* GL_FUNC_REVERSE_SUBTRACT */
+       280, /* GL_CONVOLUTION_1D */
+       281, /* GL_CONVOLUTION_2D */
+      1407, /* GL_SEPARABLE_2D */
+       284, /* GL_CONVOLUTION_BORDER_MODE */
+       288, /* GL_CONVOLUTION_FILTER_SCALE */
+       286, /* GL_CONVOLUTION_FILTER_BIAS */
+      1293, /* GL_REDUCE */
+       290, /* GL_CONVOLUTION_FORMAT */
+       294, /* GL_CONVOLUTION_WIDTH */
+       292, /* GL_CONVOLUTION_HEIGHT */
+       860, /* GL_MAX_CONVOLUTION_WIDTH */
+       858, /* GL_MAX_CONVOLUTION_HEIGHT */
+      1205, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1201, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1196, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1192, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1203, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1199, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1194, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1190, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+       596, /* GL_HISTOGRAM */
+      1253, /* GL_PROXY_HISTOGRAM */
+       612, /* GL_HISTOGRAM_WIDTH */
+       602, /* GL_HISTOGRAM_FORMAT */
+       608, /* GL_HISTOGRAM_RED_SIZE */
+       604, /* GL_HISTOGRAM_GREEN_SIZE */
+       599, /* GL_HISTOGRAM_BLUE_SIZE */
+       597, /* GL_HISTOGRAM_ALPHA_SIZE */
+       606, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+       610, /* GL_HISTOGRAM_SINK */
+       936, /* GL_MINMAX */
+       938, /* GL_MINMAX_FORMAT */
+       940, /* GL_MINMAX_SINK */
+      1539, /* GL_TABLE_TOO_LARGE_EXT */
+      1759, /* GL_UNSIGNED_BYTE_3_3_2 */
+      1770, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      1772, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      1765, /* GL_UNSIGNED_INT_8_8_8_8 */
+      1761, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1163, /* GL_POLYGON_OFFSET_FILL */
+      1162, /* GL_POLYGON_OFFSET_FACTOR */
+      1161, /* GL_POLYGON_OFFSET_BIAS */
+      1324, /* GL_RESCALE_NORMAL */
         36, /* GL_ALPHA4 */
         38, /* GL_ALPHA8 */
         32, /* GL_ALPHA12 */
         34, /* GL_ALPHA16 */
-       723, /* GL_LUMINANCE4 */
-       729, /* GL_LUMINANCE8 */
-       713, /* GL_LUMINANCE12 */
-       719, /* GL_LUMINANCE16 */
-       724, /* GL_LUMINANCE4_ALPHA4 */
-       727, /* GL_LUMINANCE6_ALPHA2 */
-       730, /* GL_LUMINANCE8_ALPHA8 */
-       716, /* GL_LUMINANCE12_ALPHA4 */
-       714, /* GL_LUMINANCE12_ALPHA12 */
-       720, /* GL_LUMINANCE16_ALPHA16 */
-       635, /* GL_INTENSITY */
-       640, /* GL_INTENSITY4 */
-       642, /* GL_INTENSITY8 */
-       636, /* GL_INTENSITY12 */
-       638, /* GL_INTENSITY16 */
-      1332, /* GL_RGB2_EXT */
-      1333, /* GL_RGB4 */
-      1336, /* GL_RGB5 */
-      1340, /* GL_RGB8 */
-      1324, /* GL_RGB10 */
-      1328, /* GL_RGB12 */
-      1330, /* GL_RGB16 */
-      1347, /* GL_RGBA2 */
-      1349, /* GL_RGBA4 */
-      1337, /* GL_RGB5_A1 */
-      1353, /* GL_RGBA8 */
-      1325, /* GL_RGB10_A2 */
-      1343, /* GL_RGBA12 */
-      1345, /* GL_RGBA16 */
-      1704, /* GL_TEXTURE_RED_SIZE */
-      1674, /* GL_TEXTURE_GREEN_SIZE */
-      1612, /* GL_TEXTURE_BLUE_SIZE */
-      1599, /* GL_TEXTURE_ALPHA_SIZE */
-      1687, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1678, /* GL_TEXTURE_INTENSITY_SIZE */
-      1318, /* GL_REPLACE_EXT */
-      1253, /* GL_PROXY_TEXTURE_1D */
-      1256, /* GL_PROXY_TEXTURE_2D */
-      1710, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1699, /* GL_TEXTURE_PRIORITY */
-      1706, /* GL_TEXTURE_RESIDENT */
-      1602, /* GL_TEXTURE_BINDING_1D */
-      1604, /* GL_TEXTURE_BINDING_2D */
-      1606, /* GL_TEXTURE_BINDING_3D */
-      1079, /* GL_PACK_SKIP_IMAGES */
-      1075, /* GL_PACK_IMAGE_HEIGHT */
-      1739, /* GL_UNPACK_SKIP_IMAGES */
-      1736, /* GL_UNPACK_IMAGE_HEIGHT */
-      1598, /* GL_TEXTURE_3D */
-      1259, /* GL_PROXY_TEXTURE_3D */
-      1661, /* GL_TEXTURE_DEPTH */
-      1713, /* GL_TEXTURE_WRAP_R */
-       844, /* GL_MAX_3D_TEXTURE_SIZE */
-      1771, /* GL_VERTEX_ARRAY */
-      1010, /* GL_NORMAL_ARRAY */
-       147, /* GL_COLOR_ARRAY */
-       620, /* GL_INDEX_ARRAY */
-      1639, /* GL_TEXTURE_COORD_ARRAY */
-       453, /* GL_EDGE_FLAG_ARRAY */
-      1777, /* GL_VERTEX_ARRAY_SIZE */
-      1779, /* GL_VERTEX_ARRAY_TYPE */
-      1778, /* GL_VERTEX_ARRAY_STRIDE */
-      1015, /* GL_NORMAL_ARRAY_TYPE */
-      1014, /* GL_NORMAL_ARRAY_STRIDE */
-       151, /* GL_COLOR_ARRAY_SIZE */
-       153, /* GL_COLOR_ARRAY_TYPE */
-       152, /* GL_COLOR_ARRAY_STRIDE */
-       625, /* GL_INDEX_ARRAY_TYPE */
-       624, /* GL_INDEX_ARRAY_STRIDE */
-      1643, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      1645, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      1644, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-       457, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1776, /* GL_VERTEX_ARRAY_POINTER */
-      1013, /* GL_NORMAL_ARRAY_POINTER */
-       150, /* GL_COLOR_ARRAY_POINTER */
-       623, /* GL_INDEX_ARRAY_POINTER */
-      1642, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-       456, /* GL_EDGE_FLAG_ARRAY_POINTER */
-       989, /* GL_MULTISAMPLE */
-      1377, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1379, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1384, /* GL_SAMPLE_COVERAGE */
-      1381, /* GL_SAMPLE_BUFFERS */
-      1372, /* GL_SAMPLES */
-      1388, /* GL_SAMPLE_COVERAGE_VALUE */
-      1386, /* GL_SAMPLE_COVERAGE_INVERT */
-       194, /* GL_COLOR_MATRIX */
-       196, /* GL_COLOR_MATRIX_STACK_DEPTH */
-       852, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1184, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1180, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1175, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1171, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1182, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1178, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1173, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1169, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1622, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1260, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1624, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-        79, /* GL_BLEND_DST_RGB */
-        88, /* GL_BLEND_SRC_RGB */
-        78, /* GL_BLEND_DST_ALPHA */
-        87, /* GL_BLEND_SRC_ALPHA */
-       200, /* GL_COLOR_TABLE */
-      1194, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1177, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1248, /* GL_PROXY_COLOR_TABLE */
-      1252, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1251, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-       224, /* GL_COLOR_TABLE_SCALE */
-       204, /* GL_COLOR_TABLE_BIAS */
-       209, /* GL_COLOR_TABLE_FORMAT */
-       226, /* GL_COLOR_TABLE_WIDTH */
-       221, /* GL_COLOR_TABLE_RED_SIZE */
-       212, /* GL_COLOR_TABLE_GREEN_SIZE */
-       206, /* GL_COLOR_TABLE_BLUE_SIZE */
-       201, /* GL_COLOR_TABLE_ALPHA_SIZE */
-       218, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
-       215, /* GL_COLOR_TABLE_INTENSITY_SIZE */
-        70, /* GL_BGR */
-        71, /* GL_BGRA */
-       866, /* GL_MAX_ELEMENTS_VERTICES */
-       865, /* GL_MAX_ELEMENTS_INDICES */
-      1677, /* GL_TEXTURE_INDEX_SIZE_EXT */
-       144, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1141, /* GL_POINT_SIZE_MIN */
-      1137, /* GL_POINT_SIZE_MAX */
-      1131, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1127, /* GL_POINT_DISTANCE_ATTENUATION */
-       126, /* GL_CLAMP_TO_BORDER */
-       129, /* GL_CLAMP_TO_EDGE */
-      1698, /* GL_TEXTURE_MIN_LOD */
-      1696, /* GL_TEXTURE_MAX_LOD */
-      1601, /* GL_TEXTURE_BASE_LEVEL */
-      1695, /* GL_TEXTURE_MAX_LEVEL */
-       613, /* GL_IGNORE_BORDER_HP */
-       274, /* GL_CONSTANT_BORDER_HP */
-      1319, /* GL_REPLICATE_BORDER_HP */
-       280, /* GL_CONVOLUTION_BORDER_COLOR */
-      1038, /* GL_OCCLUSION_TEST_HP */
-      1039, /* GL_OCCLUSION_TEST_RESULT_HP */
-       685, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1616, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1618, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1620, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1621, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1619, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1617, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-       848, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-       849, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1204, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1206, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1203, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1205, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1685, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1686, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1684, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-       583, /* GL_GENERATE_MIPMAP */
-       584, /* GL_GENERATE_MIPMAP_HINT */
-       525, /* GL_FOG_OFFSET_SGIX */
-       526, /* GL_FOG_OFFSET_VALUE_SGIX */
-      1630, /* GL_TEXTURE_COMPARE_SGIX */
-      1629, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1681, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1673, /* GL_TEXTURE_GEQUAL_R_SGIX */
-       356, /* GL_DEPTH_COMPONENT16 */
-       359, /* GL_DEPTH_COMPONENT24 */
-       362, /* GL_DEPTH_COMPONENT32 */
-       304, /* GL_CULL_VERTEX_EXT */
-       306, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-       305, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1833, /* GL_WRAP_BORDER_SUN */
-      1623, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-       678, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1417, /* GL_SINGLE_COLOR */
-      1404, /* GL_SEPARATE_SPECULAR_COLOR */
-      1413, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-       536, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-       537, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-       544, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-       539, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-       535, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-       534, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-       538, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-       545, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-       556, /* GL_FRAMEBUFFER_DEFAULT */
-       569, /* GL_FRAMEBUFFER_UNDEFINED */
-       369, /* GL_DEPTH_STENCIL_ATTACHMENT */
-       619, /* GL_INDEX */
-      1744, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1759, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1760, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1757, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1755, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1752, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1750, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1693, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1694, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1692, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-       940, /* GL_MIRRORED_REPEAT */
-      1360, /* GL_RGB_S3TC */
-      1335, /* GL_RGB4_S3TC */
-      1358, /* GL_RGBA_S3TC */
-      1352, /* GL_RGBA4_S3TC */
-      1356, /* GL_RGBA_DXT5_S3TC */
-      1350, /* GL_RGBA4_DXT5_S3TC */
-       263, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
-       258, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
-       259, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
-       260, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-      1001, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-      1000, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-       686, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-       512, /* GL_FOG_COORDINATE_SOURCE */
-       504, /* GL_FOG_COORD */
-       528, /* GL_FRAGMENT_DEPTH */
-       310, /* GL_CURRENT_FOG_COORD */
-       511, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-       510, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-       509, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-       506, /* GL_FOG_COORDINATE_ARRAY */
-       198, /* GL_COLOR_SUM */
-       330, /* GL_CURRENT_SECONDARY_COLOR */
-      1397, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1399, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1398, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1396, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1393, /* GL_SECONDARY_COLOR_ARRAY */
-       328, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
+       725, /* GL_LUMINANCE4 */
+       731, /* GL_LUMINANCE8 */
+       715, /* GL_LUMINANCE12 */
+       721, /* GL_LUMINANCE16 */
+       726, /* GL_LUMINANCE4_ALPHA4 */
+       729, /* GL_LUMINANCE6_ALPHA2 */
+       732, /* GL_LUMINANCE8_ALPHA8 */
+       718, /* GL_LUMINANCE12_ALPHA4 */
+       716, /* GL_LUMINANCE12_ALPHA12 */
+       722, /* GL_LUMINANCE16_ALPHA16 */
+       637, /* GL_INTENSITY */
+       642, /* GL_INTENSITY4 */
+       644, /* GL_INTENSITY8 */
+       638, /* GL_INTENSITY12 */
+       640, /* GL_INTENSITY16 */
+      1336, /* GL_RGB2_EXT */
+      1337, /* GL_RGB4 */
+      1340, /* GL_RGB5 */
+      1344, /* GL_RGB8 */
+      1328, /* GL_RGB10 */
+      1332, /* GL_RGB12 */
+      1334, /* GL_RGB16 */
+      1351, /* GL_RGBA2 */
+      1353, /* GL_RGBA4 */
+      1341, /* GL_RGB5_A1 */
+      1357, /* GL_RGBA8 */
+      1329, /* GL_RGB10_A2 */
+      1347, /* GL_RGBA12 */
+      1349, /* GL_RGBA16 */
+      1715, /* GL_TEXTURE_RED_SIZE */
+      1685, /* GL_TEXTURE_GREEN_SIZE */
+      1623, /* GL_TEXTURE_BLUE_SIZE */
+      1610, /* GL_TEXTURE_ALPHA_SIZE */
+      1698, /* GL_TEXTURE_LUMINANCE_SIZE */
+      1689, /* GL_TEXTURE_INTENSITY_SIZE */
+      1322, /* GL_REPLACE_EXT */
+      1257, /* GL_PROXY_TEXTURE_1D */
+      1260, /* GL_PROXY_TEXTURE_2D */
+      1721, /* GL_TEXTURE_TOO_LARGE_EXT */
+      1710, /* GL_TEXTURE_PRIORITY */
+      1717, /* GL_TEXTURE_RESIDENT */
+      1613, /* GL_TEXTURE_BINDING_1D */
+      1615, /* GL_TEXTURE_BINDING_2D */
+      1617, /* GL_TEXTURE_BINDING_3D */
+      1083, /* GL_PACK_SKIP_IMAGES */
+      1079, /* GL_PACK_IMAGE_HEIGHT */
+      1752, /* GL_UNPACK_SKIP_IMAGES */
+      1749, /* GL_UNPACK_IMAGE_HEIGHT */
+      1609, /* GL_TEXTURE_3D */
+      1263, /* GL_PROXY_TEXTURE_3D */
+      1672, /* GL_TEXTURE_DEPTH */
+      1724, /* GL_TEXTURE_WRAP_R */
+       846, /* GL_MAX_3D_TEXTURE_SIZE */
+      1785, /* GL_VERTEX_ARRAY */
+      1013, /* GL_NORMAL_ARRAY */
+       148, /* GL_COLOR_ARRAY */
+       622, /* GL_INDEX_ARRAY */
+      1650, /* GL_TEXTURE_COORD_ARRAY */
+       455, /* GL_EDGE_FLAG_ARRAY */
+      1791, /* GL_VERTEX_ARRAY_SIZE */
+      1793, /* GL_VERTEX_ARRAY_TYPE */
+      1792, /* GL_VERTEX_ARRAY_STRIDE */
+      1018, /* GL_NORMAL_ARRAY_TYPE */
+      1017, /* GL_NORMAL_ARRAY_STRIDE */
+       152, /* GL_COLOR_ARRAY_SIZE */
+       154, /* GL_COLOR_ARRAY_TYPE */
+       153, /* GL_COLOR_ARRAY_STRIDE */
+       627, /* GL_INDEX_ARRAY_TYPE */
+       626, /* GL_INDEX_ARRAY_STRIDE */
+      1654, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      1656, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      1655, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+       459, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+      1790, /* GL_VERTEX_ARRAY_POINTER */
+      1016, /* GL_NORMAL_ARRAY_POINTER */
+       151, /* GL_COLOR_ARRAY_POINTER */
+       625, /* GL_INDEX_ARRAY_POINTER */
+      1653, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+       458, /* GL_EDGE_FLAG_ARRAY_POINTER */
+       992, /* GL_MULTISAMPLE */
+      1381, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1383, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1388, /* GL_SAMPLE_COVERAGE */
+      1385, /* GL_SAMPLE_BUFFERS */
+      1376, /* GL_SAMPLES */
+      1392, /* GL_SAMPLE_COVERAGE_VALUE */
+      1390, /* GL_SAMPLE_COVERAGE_INVERT */
+       195, /* GL_COLOR_MATRIX */
+       197, /* GL_COLOR_MATRIX_STACK_DEPTH */
+       854, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+      1188, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1184, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1179, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1175, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1186, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1182, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1177, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1173, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      1633, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1264, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      1635, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+        80, /* GL_BLEND_DST_RGB */
+        89, /* GL_BLEND_SRC_RGB */
+        79, /* GL_BLEND_DST_ALPHA */
+        88, /* GL_BLEND_SRC_ALPHA */
+       201, /* GL_COLOR_TABLE */
+      1198, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1181, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1252, /* GL_PROXY_COLOR_TABLE */
+      1256, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1255, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+       225, /* GL_COLOR_TABLE_SCALE */
+       205, /* GL_COLOR_TABLE_BIAS */
+       210, /* GL_COLOR_TABLE_FORMAT */
+       227, /* GL_COLOR_TABLE_WIDTH */
+       222, /* GL_COLOR_TABLE_RED_SIZE */
+       213, /* GL_COLOR_TABLE_GREEN_SIZE */
+       207, /* GL_COLOR_TABLE_BLUE_SIZE */
+       202, /* GL_COLOR_TABLE_ALPHA_SIZE */
+       219, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+       216, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+        71, /* GL_BGR */
+        72, /* GL_BGRA */
+       868, /* GL_MAX_ELEMENTS_VERTICES */
+       867, /* GL_MAX_ELEMENTS_INDICES */
+      1688, /* GL_TEXTURE_INDEX_SIZE_EXT */
+       145, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+      1145, /* GL_POINT_SIZE_MIN */
+      1141, /* GL_POINT_SIZE_MAX */
+      1135, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1131, /* GL_POINT_DISTANCE_ATTENUATION */
+       127, /* GL_CLAMP_TO_BORDER */
+       130, /* GL_CLAMP_TO_EDGE */
+      1709, /* GL_TEXTURE_MIN_LOD */
+      1707, /* GL_TEXTURE_MAX_LOD */
+      1612, /* GL_TEXTURE_BASE_LEVEL */
+      1706, /* GL_TEXTURE_MAX_LEVEL */
+       615, /* GL_IGNORE_BORDER_HP */
+       276, /* GL_CONSTANT_BORDER_HP */
+      1323, /* GL_REPLICATE_BORDER_HP */
+       282, /* GL_CONVOLUTION_BORDER_COLOR */
+      1042, /* GL_OCCLUSION_TEST_HP */
+      1043, /* GL_OCCLUSION_TEST_RESULT_HP */
+       687, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+      1627, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1629, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1631, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      1632, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1630, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1628, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+       850, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+       851, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1208, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1210, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1207, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1209, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      1696, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      1697, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      1695, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+       585, /* GL_GENERATE_MIPMAP */
+       586, /* GL_GENERATE_MIPMAP_HINT */
+       527, /* GL_FOG_OFFSET_SGIX */
+       528, /* GL_FOG_OFFSET_VALUE_SGIX */
+      1641, /* GL_TEXTURE_COMPARE_SGIX */
+      1640, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      1692, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      1684, /* GL_TEXTURE_GEQUAL_R_SGIX */
+       358, /* GL_DEPTH_COMPONENT16 */
+       361, /* GL_DEPTH_COMPONENT24 */
+       364, /* GL_DEPTH_COMPONENT32 */
+       306, /* GL_CULL_VERTEX_EXT */
+       308, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+       307, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+      1848, /* GL_WRAP_BORDER_SUN */
+      1634, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+       680, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+      1422, /* GL_SINGLE_COLOR */
+      1408, /* GL_SEPARATE_SPECULAR_COLOR */
+      1417, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+       538, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+       539, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+       546, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+       541, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+       537, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+       536, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+       540, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+       547, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+       558, /* GL_FRAMEBUFFER_DEFAULT */
+       571, /* GL_FRAMEBUFFER_UNDEFINED */
+       371, /* GL_DEPTH_STENCIL_ATTACHMENT */
+       621, /* GL_INDEX */
+      1758, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      1773, /* GL_UNSIGNED_SHORT_5_6_5 */
+      1774, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      1771, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      1769, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      1766, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      1764, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      1704, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      1705, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      1703, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+       943, /* GL_MIRRORED_REPEAT */
+      1364, /* GL_RGB_S3TC */
+      1339, /* GL_RGB4_S3TC */
+      1362, /* GL_RGBA_S3TC */
+      1356, /* GL_RGBA4_S3TC */
+      1360, /* GL_RGBA_DXT5_S3TC */
+      1354, /* GL_RGBA4_DXT5_S3TC */
+       264, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+       259, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+       260, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+       261, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+      1004, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+      1003, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+       688, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+       514, /* GL_FOG_COORDINATE_SOURCE */
+       506, /* GL_FOG_COORD */
+       530, /* GL_FRAGMENT_DEPTH */
+       312, /* GL_CURRENT_FOG_COORD */
+       513, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+       512, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+       511, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+       508, /* GL_FOG_COORDINATE_ARRAY */
+       199, /* GL_COLOR_SUM */
+       332, /* GL_CURRENT_SECONDARY_COLOR */
+      1401, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1403, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1402, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1400, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1397, /* GL_SECONDARY_COLOR_ARRAY */
+       330, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         28, /* GL_ALIASED_POINT_SIZE_RANGE */
         27, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1530, /* GL_TEXTURE0 */
-      1532, /* GL_TEXTURE1 */
-      1554, /* GL_TEXTURE2 */
-      1576, /* GL_TEXTURE3 */
-      1582, /* GL_TEXTURE4 */
-      1584, /* GL_TEXTURE5 */
-      1586, /* GL_TEXTURE6 */
-      1588, /* GL_TEXTURE7 */
-      1590, /* GL_TEXTURE8 */
-      1592, /* GL_TEXTURE9 */
-      1533, /* GL_TEXTURE10 */
-      1535, /* GL_TEXTURE11 */
-      1537, /* GL_TEXTURE12 */
-      1539, /* GL_TEXTURE13 */
-      1541, /* GL_TEXTURE14 */
-      1543, /* GL_TEXTURE15 */
-      1545, /* GL_TEXTURE16 */
-      1547, /* GL_TEXTURE17 */
-      1549, /* GL_TEXTURE18 */
-      1551, /* GL_TEXTURE19 */
-      1555, /* GL_TEXTURE20 */
-      1557, /* GL_TEXTURE21 */
-      1559, /* GL_TEXTURE22 */
-      1561, /* GL_TEXTURE23 */
-      1563, /* GL_TEXTURE24 */
-      1565, /* GL_TEXTURE25 */
-      1567, /* GL_TEXTURE26 */
-      1569, /* GL_TEXTURE27 */
-      1571, /* GL_TEXTURE28 */
-      1573, /* GL_TEXTURE29 */
-      1577, /* GL_TEXTURE30 */
-      1579, /* GL_TEXTURE31 */
+      1541, /* GL_TEXTURE0 */
+      1543, /* GL_TEXTURE1 */
+      1565, /* GL_TEXTURE2 */
+      1587, /* GL_TEXTURE3 */
+      1593, /* GL_TEXTURE4 */
+      1595, /* GL_TEXTURE5 */
+      1597, /* GL_TEXTURE6 */
+      1599, /* GL_TEXTURE7 */
+      1601, /* GL_TEXTURE8 */
+      1603, /* GL_TEXTURE9 */
+      1544, /* GL_TEXTURE10 */
+      1546, /* GL_TEXTURE11 */
+      1548, /* GL_TEXTURE12 */
+      1550, /* GL_TEXTURE13 */
+      1552, /* GL_TEXTURE14 */
+      1554, /* GL_TEXTURE15 */
+      1556, /* GL_TEXTURE16 */
+      1558, /* GL_TEXTURE17 */
+      1560, /* GL_TEXTURE18 */
+      1562, /* GL_TEXTURE19 */
+      1566, /* GL_TEXTURE20 */
+      1568, /* GL_TEXTURE21 */
+      1570, /* GL_TEXTURE22 */
+      1572, /* GL_TEXTURE23 */
+      1574, /* GL_TEXTURE24 */
+      1576, /* GL_TEXTURE25 */
+      1578, /* GL_TEXTURE26 */
+      1580, /* GL_TEXTURE27 */
+      1582, /* GL_TEXTURE28 */
+      1584, /* GL_TEXTURE29 */
+      1588, /* GL_TEXTURE30 */
+      1590, /* GL_TEXTURE31 */
         18, /* GL_ACTIVE_TEXTURE */
-       132, /* GL_CLIENT_ACTIVE_TEXTURE */
-       918, /* GL_MAX_TEXTURE_UNITS */
-      1723, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1726, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1728, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1720, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1518, /* GL_SUBTRACT */
-       906, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-       246, /* GL_COMPRESSED_ALPHA */
-       250, /* GL_COMPRESSED_LUMINANCE */
-       251, /* GL_COMPRESSED_LUMINANCE_ALPHA */
-       248, /* GL_COMPRESSED_INTENSITY */
-       254, /* GL_COMPRESSED_RGB */
-       255, /* GL_COMPRESSED_RGBA */
-      1637, /* GL_TEXTURE_COMPRESSION_HINT */
-      1702, /* GL_TEXTURE_RECTANGLE_ARB */
-      1609, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-      1263, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-       904, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-       368, /* GL_DEPTH_STENCIL */
-      1748, /* GL_UNSIGNED_INT_24_8 */
-       914, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1691, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-       915, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1667, /* GL_TEXTURE_FILTER_CONTROL */
-      1682, /* GL_TEXTURE_LOD_BIAS */
-       231, /* GL_COMBINE4 */
-       908, /* GL_MAX_SHININESS_NV */
-       909, /* GL_MAX_SPOT_EXPONENT_NV */
-       617, /* GL_INCR_WRAP */
-       341, /* GL_DECR_WRAP */
-       960, /* GL_MODELVIEW1_ARB */
-      1016, /* GL_NORMAL_MAP */
-      1294, /* GL_REFLECTION_MAP */
-      1646, /* GL_TEXTURE_CUBE_MAP */
-      1607, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      1654, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      1648, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      1656, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      1650, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      1658, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      1652, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1261, /* GL_PROXY_TEXTURE_CUBE_MAP */
-       860, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-       995, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-       520, /* GL_FOG_DISTANCE_MODE_NV */
-       472, /* GL_EYE_RADIAL_NV */
-       471, /* GL_EYE_PLANE_ABSOLUTE_NV */
-       230, /* GL_COMBINE */
-       237, /* GL_COMBINE_RGB */
-       232, /* GL_COMBINE_ALPHA */
-      1361, /* GL_RGB_SCALE */
+       133, /* GL_CLIENT_ACTIVE_TEXTURE */
+       921, /* GL_MAX_TEXTURE_UNITS */
+      1736, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      1739, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      1741, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      1733, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1523, /* GL_SUBTRACT */
+       908, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+       247, /* GL_COMPRESSED_ALPHA */
+       251, /* GL_COMPRESSED_LUMINANCE */
+       252, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+       249, /* GL_COMPRESSED_INTENSITY */
+       255, /* GL_COMPRESSED_RGB */
+       256, /* GL_COMPRESSED_RGBA */
+      1648, /* GL_TEXTURE_COMPRESSION_HINT */
+      1713, /* GL_TEXTURE_RECTANGLE_ARB */
+      1620, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+      1267, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+       906, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+       370, /* GL_DEPTH_STENCIL */
+      1762, /* GL_UNSIGNED_INT_24_8 */
+       917, /* GL_MAX_TEXTURE_LOD_BIAS */
+      1702, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+       918, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      1678, /* GL_TEXTURE_FILTER_CONTROL */
+      1693, /* GL_TEXTURE_LOD_BIAS */
+       232, /* GL_COMBINE4 */
+       911, /* GL_MAX_SHININESS_NV */
+       912, /* GL_MAX_SPOT_EXPONENT_NV */
+       619, /* GL_INCR_WRAP */
+       343, /* GL_DECR_WRAP */
+       963, /* GL_MODELVIEW1_ARB */
+      1019, /* GL_NORMAL_MAP */
+      1298, /* GL_REFLECTION_MAP */
+      1657, /* GL_TEXTURE_CUBE_MAP */
+      1618, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      1665, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      1659, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      1667, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      1661, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      1669, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      1663, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1265, /* GL_PROXY_TEXTURE_CUBE_MAP */
+       862, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+       998, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+       522, /* GL_FOG_DISTANCE_MODE_NV */
+       474, /* GL_EYE_RADIAL_NV */
+       473, /* GL_EYE_PLANE_ABSOLUTE_NV */
+       231, /* GL_COMBINE */
+       238, /* GL_COMBINE_RGB */
+       233, /* GL_COMBINE_ALPHA */
+      1365, /* GL_RGB_SCALE */
         24, /* GL_ADD_SIGNED */
-       645, /* GL_INTERPOLATE */
-       269, /* GL_CONSTANT */
-      1210, /* GL_PRIMARY_COLOR */
-      1207, /* GL_PREVIOUS */
-      1432, /* GL_SOURCE0_RGB */
-      1438, /* GL_SOURCE1_RGB */
-      1444, /* GL_SOURCE2_RGB */
-      1448, /* GL_SOURCE3_RGB_NV */
-      1429, /* GL_SOURCE0_ALPHA */
-      1435, /* GL_SOURCE1_ALPHA */
-      1441, /* GL_SOURCE2_ALPHA */
-      1447, /* GL_SOURCE3_ALPHA_NV */
-      1052, /* GL_OPERAND0_RGB */
-      1058, /* GL_OPERAND1_RGB */
-      1064, /* GL_OPERAND2_RGB */
-      1068, /* GL_OPERAND3_RGB_NV */
-      1049, /* GL_OPERAND0_ALPHA */
-      1055, /* GL_OPERAND1_ALPHA */
-      1061, /* GL_OPERAND2_ALPHA */
-      1067, /* GL_OPERAND3_ALPHA_NV */
-      1772, /* GL_VERTEX_ARRAY_BINDING */
-      1700, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-      1701, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-      1837, /* GL_YCBCR_422_APPLE */
-      1761, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1763, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      1709, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-      1509, /* GL_STORAGE_PRIVATE_APPLE */
-      1508, /* GL_STORAGE_CACHED_APPLE */
-      1510, /* GL_STORAGE_SHARED_APPLE */
-      1419, /* GL_SLICE_ACCUM_SUN */
-      1269, /* GL_QUAD_MESH_SUN */
-      1732, /* GL_TRIANGLE_MESH_SUN */
-      1811, /* GL_VERTEX_PROGRAM_ARB */
-      1822, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1798, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1804, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1806, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1808, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-       332, /* GL_CURRENT_VERTEX_ATTRIB */
-      1223, /* GL_PROGRAM_LENGTH_ARB */
-      1237, /* GL_PROGRAM_STRING_ARB */
-       982, /* GL_MODELVIEW_PROJECTION_NV */
-       612, /* GL_IDENTITY_NV */
-       659, /* GL_INVERSE_NV */
-      1725, /* GL_TRANSPOSE_NV */
-       660, /* GL_INVERSE_TRANSPOSE_NV */
-       890, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-       889, /* GL_MAX_PROGRAM_MATRICES_ARB */
-       797, /* GL_MATRIX0_NV */
-       809, /* GL_MATRIX1_NV */
-       821, /* GL_MATRIX2_NV */
-       825, /* GL_MATRIX3_NV */
-       827, /* GL_MATRIX4_NV */
-       829, /* GL_MATRIX5_NV */
-       831, /* GL_MATRIX6_NV */
-       833, /* GL_MATRIX7_NV */
-       316, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-       313, /* GL_CURRENT_MATRIX_ARB */
-      1814, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1817, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1235, /* GL_PROGRAM_PARAMETER_NV */
-      1802, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1239, /* GL_PROGRAM_TARGET_NV */
-      1236, /* GL_PROGRAM_RESIDENT_NV */
-      1717, /* GL_TRACK_MATRIX_NV */
-      1718, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1812, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1217, /* GL_PROGRAM_ERROR_POSITION_ARB */
-       353, /* GL_DEPTH_CLAMP_NV */
-      1780, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1787, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1788, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1789, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1790, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1791, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1792, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1793, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1794, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1795, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1781, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1782, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1783, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1784, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1785, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1786, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-       745, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-       752, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-       753, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-       754, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-       755, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-       756, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-       757, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-       758, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-       759, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-       760, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-       746, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-       747, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-       748, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-       749, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-       750, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-       751, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-       772, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-       779, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-       780, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-       781, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-       782, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-       783, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-       784, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1216, /* GL_PROGRAM_BINDING_ARB */
-       786, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-       787, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-       773, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-       774, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-       775, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-       776, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-       777, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-       778, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      1635, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      1632, /* GL_TEXTURE_COMPRESSED */
-      1021, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-       268, /* GL_COMPRESSED_TEXTURE_FORMATS */
-       930, /* GL_MAX_VERTEX_UNITS_ARB */
+       647, /* GL_INTERPOLATE */
+       271, /* GL_CONSTANT */
+      1214, /* GL_PRIMARY_COLOR */
+      1211, /* GL_PREVIOUS */
+      1437, /* GL_SOURCE0_RGB */
+      1443, /* GL_SOURCE1_RGB */
+      1449, /* GL_SOURCE2_RGB */
+      1453, /* GL_SOURCE3_RGB_NV */
+      1434, /* GL_SOURCE0_ALPHA */
+      1440, /* GL_SOURCE1_ALPHA */
+      1446, /* GL_SOURCE2_ALPHA */
+      1452, /* GL_SOURCE3_ALPHA_NV */
+      1056, /* GL_OPERAND0_RGB */
+      1062, /* GL_OPERAND1_RGB */
+      1068, /* GL_OPERAND2_RGB */
+      1072, /* GL_OPERAND3_RGB_NV */
+      1053, /* GL_OPERAND0_ALPHA */
+      1059, /* GL_OPERAND1_ALPHA */
+      1065, /* GL_OPERAND2_ALPHA */
+      1071, /* GL_OPERAND3_ALPHA_NV */
+      1786, /* GL_VERTEX_ARRAY_BINDING */
+      1711, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+      1712, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+      1852, /* GL_YCBCR_422_APPLE */
+      1775, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      1777, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      1720, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+      1514, /* GL_STORAGE_PRIVATE_APPLE */
+      1513, /* GL_STORAGE_CACHED_APPLE */
+      1515, /* GL_STORAGE_SHARED_APPLE */
+      1424, /* GL_SLICE_ACCUM_SUN */
+      1273, /* GL_QUAD_MESH_SUN */
+      1745, /* GL_TRIANGLE_MESH_SUN */
+      1825, /* GL_VERTEX_PROGRAM_ARB */
+      1836, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1812, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      1818, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      1820, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      1822, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+       334, /* GL_CURRENT_VERTEX_ATTRIB */
+      1227, /* GL_PROGRAM_LENGTH_ARB */
+      1241, /* GL_PROGRAM_STRING_ARB */
+       985, /* GL_MODELVIEW_PROJECTION_NV */
+       614, /* GL_IDENTITY_NV */
+       661, /* GL_INVERSE_NV */
+      1738, /* GL_TRANSPOSE_NV */
+       662, /* GL_INVERSE_TRANSPOSE_NV */
+       892, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+       891, /* GL_MAX_PROGRAM_MATRICES_ARB */
+       799, /* GL_MATRIX0_NV */
+       811, /* GL_MATRIX1_NV */
+       823, /* GL_MATRIX2_NV */
+       827, /* GL_MATRIX3_NV */
+       829, /* GL_MATRIX4_NV */
+       831, /* GL_MATRIX5_NV */
+       833, /* GL_MATRIX6_NV */
+       835, /* GL_MATRIX7_NV */
+       318, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+       315, /* GL_CURRENT_MATRIX_ARB */
+      1828, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      1831, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1239, /* GL_PROGRAM_PARAMETER_NV */
+      1816, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1243, /* GL_PROGRAM_TARGET_NV */
+      1240, /* GL_PROGRAM_RESIDENT_NV */
+      1730, /* GL_TRACK_MATRIX_NV */
+      1731, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      1826, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1221, /* GL_PROGRAM_ERROR_POSITION_ARB */
+       355, /* GL_DEPTH_CLAMP_NV */
+      1794, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1801, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1802, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1803, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1804, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1805, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1806, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1807, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1808, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1809, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1795, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1796, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1797, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1798, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1799, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1800, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+       747, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+       754, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+       755, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+       756, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+       757, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+       758, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+       759, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+       760, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+       761, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+       762, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+       748, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+       749, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+       750, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+       751, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+       752, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+       753, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+       774, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+       781, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+       782, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+       783, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+       784, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+       785, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+       786, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+      1220, /* GL_PROGRAM_BINDING_ARB */
+       788, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+       789, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+       775, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+       776, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+       777, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+       778, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+       779, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+       780, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+      1646, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      1643, /* GL_TEXTURE_COMPRESSED */
+      1024, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+       269, /* GL_COMPRESSED_TEXTURE_FORMATS */
+       933, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1832, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1810, /* GL_VERTEX_BLEND_ARB */
-       334, /* GL_CURRENT_WEIGHT_ARB */
-      1831, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1830, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1829, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1828, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1825, /* GL_WEIGHT_ARRAY_ARB */
-       381, /* GL_DOT3_RGB */
-       382, /* GL_DOT3_RGBA */
-       262, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-       257, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-       990, /* GL_MULTISAMPLE_3DFX */
-      1382, /* GL_SAMPLE_BUFFERS_3DFX */
-      1373, /* GL_SAMPLES_3DFX */
-       971, /* GL_MODELVIEW2_ARB */
-       974, /* GL_MODELVIEW3_ARB */
-       975, /* GL_MODELVIEW4_ARB */
-       976, /* GL_MODELVIEW5_ARB */
-       977, /* GL_MODELVIEW6_ARB */
-       978, /* GL_MODELVIEW7_ARB */
-       979, /* GL_MODELVIEW8_ARB */
-       980, /* GL_MODELVIEW9_ARB */
-       950, /* GL_MODELVIEW10_ARB */
-       951, /* GL_MODELVIEW11_ARB */
-       952, /* GL_MODELVIEW12_ARB */
-       953, /* GL_MODELVIEW13_ARB */
-       954, /* GL_MODELVIEW14_ARB */
-       955, /* GL_MODELVIEW15_ARB */
-       956, /* GL_MODELVIEW16_ARB */
-       957, /* GL_MODELVIEW17_ARB */
-       958, /* GL_MODELVIEW18_ARB */
-       959, /* GL_MODELVIEW19_ARB */
-       961, /* GL_MODELVIEW20_ARB */
-       962, /* GL_MODELVIEW21_ARB */
-       963, /* GL_MODELVIEW22_ARB */
-       964, /* GL_MODELVIEW23_ARB */
-       965, /* GL_MODELVIEW24_ARB */
-       966, /* GL_MODELVIEW25_ARB */
-       967, /* GL_MODELVIEW26_ARB */
-       968, /* GL_MODELVIEW27_ARB */
-       969, /* GL_MODELVIEW28_ARB */
-       970, /* GL_MODELVIEW29_ARB */
-       972, /* GL_MODELVIEW30_ARB */
-       973, /* GL_MODELVIEW31_ARB */
-       386, /* GL_DOT3_RGB_EXT */
-       384, /* GL_DOT3_RGBA_EXT */
-       944, /* GL_MIRROR_CLAMP_EXT */
-       947, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-       985, /* GL_MODULATE_ADD_ATI */
-       986, /* GL_MODULATE_SIGNED_ADD_ATI */
-       987, /* GL_MODULATE_SUBTRACT_ATI */
-      1838, /* GL_YCBCR_MESA */
-      1076, /* GL_PACK_INVERT_MESA */
-       337, /* GL_DEBUG_OBJECT_MESA */
-       338, /* GL_DEBUG_PRINT_MESA */
-       336, /* GL_DEBUG_ASSERT_MESA */
-       109, /* GL_BUFFER_SIZE */
-       111, /* GL_BUFFER_USAGE */
-       115, /* GL_BUMP_ROT_MATRIX_ATI */
-       116, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
-       114, /* GL_BUMP_NUM_TEX_UNITS_ATI */
-       118, /* GL_BUMP_TEX_UNITS_ATI */
-       445, /* GL_DUDV_ATI */
-       444, /* GL_DU8DV8_ATI */
-       113, /* GL_BUMP_ENVMAP_ATI */
-       117, /* GL_BUMP_TARGET_ATI */
-      1480, /* GL_STENCIL_BACK_FUNC */
-      1478, /* GL_STENCIL_BACK_FAIL */
-      1482, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1484, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-       529, /* GL_FRAGMENT_PROGRAM_ARB */
-      1214, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1242, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1241, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1226, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1232, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1231, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       879, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-       902, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-       901, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-       892, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-       898, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-       897, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       862, /* GL_MAX_DRAW_BUFFERS */
-       390, /* GL_DRAW_BUFFER0 */
-       393, /* GL_DRAW_BUFFER1 */
-       414, /* GL_DRAW_BUFFER2 */
-       417, /* GL_DRAW_BUFFER3 */
-       420, /* GL_DRAW_BUFFER4 */
-       423, /* GL_DRAW_BUFFER5 */
-       426, /* GL_DRAW_BUFFER6 */
-       429, /* GL_DRAW_BUFFER7 */
-       432, /* GL_DRAW_BUFFER8 */
-       435, /* GL_DRAW_BUFFER9 */
-       394, /* GL_DRAW_BUFFER10 */
-       397, /* GL_DRAW_BUFFER11 */
-       400, /* GL_DRAW_BUFFER12 */
-       403, /* GL_DRAW_BUFFER13 */
-       406, /* GL_DRAW_BUFFER14 */
-       409, /* GL_DRAW_BUFFER15 */
-        81, /* GL_BLEND_EQUATION_ALPHA */
-       842, /* GL_MATRIX_PALETTE_ARB */
-       873, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-       876, /* GL_MAX_PALETTE_MATRICES_ARB */
-       319, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-       836, /* GL_MATRIX_INDEX_ARRAY_ARB */
-       314, /* GL_CURRENT_MATRIX_INDEX_ARB */
-       838, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-       840, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-       839, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-       837, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1662, /* GL_TEXTURE_DEPTH_SIZE */
-       374, /* GL_DEPTH_TEXTURE_MODE */
-      1627, /* GL_TEXTURE_COMPARE_MODE */
-      1625, /* GL_TEXTURE_COMPARE_FUNC */
-       241, /* GL_COMPARE_R_TO_TEXTURE */
-      1148, /* GL_POINT_SPRITE */
-       294, /* GL_COORD_REPLACE */
-      1152, /* GL_POINT_SPRITE_R_MODE_NV */
-      1271, /* GL_QUERY_COUNTER_BITS */
-       321, /* GL_CURRENT_QUERY */
-      1273, /* GL_QUERY_RESULT */
-      1275, /* GL_QUERY_RESULT_AVAILABLE */
-       924, /* GL_MAX_VERTEX_ATTRIBS */
-      1800, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-       372, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-       371, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-       910, /* GL_MAX_TEXTURE_COORDS */
-       912, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1219, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1221, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1220, /* GL_PROGRAM_FORMAT_ARB */
-      1711, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-       351, /* GL_DEPTH_BOUNDS_TEST_EXT */
-       350, /* GL_DEPTH_BOUNDS_EXT */
-        52, /* GL_ARRAY_BUFFER */
-       458, /* GL_ELEMENT_ARRAY_BUFFER */
-        53, /* GL_ARRAY_BUFFER_BINDING */
-       459, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1774, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-      1011, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-       148, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-       621, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      1640, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-       454, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1394, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-       507, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1826, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1796, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1222, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-       885, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1228, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-       894, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1240, /* GL_PROGRAM_TEMPORARIES_ARB */
-       900, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1230, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-       896, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1234, /* GL_PROGRAM_PARAMETERS_ARB */
-       899, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1229, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-       895, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1215, /* GL_PROGRAM_ATTRIBS_ARB */
-       880, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1227, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-       893, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1213, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-       878, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1225, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       891, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       886, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-       882, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1243, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1722, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1284, /* GL_READ_ONLY */
-      1834, /* GL_WRITE_ONLY */
-      1286, /* GL_READ_WRITE */
-       101, /* GL_BUFFER_ACCESS */
-       104, /* GL_BUFFER_MAPPED */
-       106, /* GL_BUFFER_MAP_POINTER */
-      1716, /* GL_TIME_ELAPSED_EXT */
-       796, /* GL_MATRIX0_ARB */
-       808, /* GL_MATRIX1_ARB */
-       820, /* GL_MATRIX2_ARB */
-       824, /* GL_MATRIX3_ARB */
-       826, /* GL_MATRIX4_ARB */
-       828, /* GL_MATRIX5_ARB */
-       830, /* GL_MATRIX6_ARB */
-       832, /* GL_MATRIX7_ARB */
-       834, /* GL_MATRIX8_ARB */
-       835, /* GL_MATRIX9_ARB */
-       798, /* GL_MATRIX10_ARB */
-       799, /* GL_MATRIX11_ARB */
-       800, /* GL_MATRIX12_ARB */
-       801, /* GL_MATRIX13_ARB */
-       802, /* GL_MATRIX14_ARB */
-       803, /* GL_MATRIX15_ARB */
-       804, /* GL_MATRIX16_ARB */
-       805, /* GL_MATRIX17_ARB */
-       806, /* GL_MATRIX18_ARB */
-       807, /* GL_MATRIX19_ARB */
-       810, /* GL_MATRIX20_ARB */
-       811, /* GL_MATRIX21_ARB */
-       812, /* GL_MATRIX22_ARB */
-       813, /* GL_MATRIX23_ARB */
-       814, /* GL_MATRIX24_ARB */
-       815, /* GL_MATRIX25_ARB */
-       816, /* GL_MATRIX26_ARB */
-       817, /* GL_MATRIX27_ARB */
-       818, /* GL_MATRIX28_ARB */
-       819, /* GL_MATRIX29_ARB */
-       822, /* GL_MATRIX30_ARB */
-       823, /* GL_MATRIX31_ARB */
-      1513, /* GL_STREAM_DRAW */
-      1515, /* GL_STREAM_READ */
-      1511, /* GL_STREAM_COPY */
-      1471, /* GL_STATIC_DRAW */
-      1473, /* GL_STATIC_READ */
-      1469, /* GL_STATIC_COPY */
-       448, /* GL_DYNAMIC_DRAW */
-       450, /* GL_DYNAMIC_READ */
-       446, /* GL_DYNAMIC_COPY */
-      1116, /* GL_PIXEL_PACK_BUFFER */
-      1120, /* GL_PIXEL_UNPACK_BUFFER */
-      1117, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1121, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-       345, /* GL_DEPTH24_STENCIL8 */
-      1708, /* GL_TEXTURE_STENCIL_SIZE */
-      1660, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-       881, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-       884, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-       888, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-       887, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-       845, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-      1504, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      1847, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1824, /* GL_VERTEX_BLEND_ARB */
+       336, /* GL_CURRENT_WEIGHT_ARB */
+      1846, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1845, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1844, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1843, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1840, /* GL_WEIGHT_ARRAY_ARB */
+       383, /* GL_DOT3_RGB */
+       384, /* GL_DOT3_RGBA */
+       263, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+       258, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+       993, /* GL_MULTISAMPLE_3DFX */
+      1386, /* GL_SAMPLE_BUFFERS_3DFX */
+      1377, /* GL_SAMPLES_3DFX */
+       974, /* GL_MODELVIEW2_ARB */
+       977, /* GL_MODELVIEW3_ARB */
+       978, /* GL_MODELVIEW4_ARB */
+       979, /* GL_MODELVIEW5_ARB */
+       980, /* GL_MODELVIEW6_ARB */
+       981, /* GL_MODELVIEW7_ARB */
+       982, /* GL_MODELVIEW8_ARB */
+       983, /* GL_MODELVIEW9_ARB */
+       953, /* GL_MODELVIEW10_ARB */
+       954, /* GL_MODELVIEW11_ARB */
+       955, /* GL_MODELVIEW12_ARB */
+       956, /* GL_MODELVIEW13_ARB */
+       957, /* GL_MODELVIEW14_ARB */
+       958, /* GL_MODELVIEW15_ARB */
+       959, /* GL_MODELVIEW16_ARB */
+       960, /* GL_MODELVIEW17_ARB */
+       961, /* GL_MODELVIEW18_ARB */
+       962, /* GL_MODELVIEW19_ARB */
+       964, /* GL_MODELVIEW20_ARB */
+       965, /* GL_MODELVIEW21_ARB */
+       966, /* GL_MODELVIEW22_ARB */
+       967, /* GL_MODELVIEW23_ARB */
+       968, /* GL_MODELVIEW24_ARB */
+       969, /* GL_MODELVIEW25_ARB */
+       970, /* GL_MODELVIEW26_ARB */
+       971, /* GL_MODELVIEW27_ARB */
+       972, /* GL_MODELVIEW28_ARB */
+       973, /* GL_MODELVIEW29_ARB */
+       975, /* GL_MODELVIEW30_ARB */
+       976, /* GL_MODELVIEW31_ARB */
+       388, /* GL_DOT3_RGB_EXT */
+       386, /* GL_DOT3_RGBA_EXT */
+       947, /* GL_MIRROR_CLAMP_EXT */
+       950, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+       988, /* GL_MODULATE_ADD_ATI */
+       989, /* GL_MODULATE_SIGNED_ADD_ATI */
+       990, /* GL_MODULATE_SUBTRACT_ATI */
+      1853, /* GL_YCBCR_MESA */
+      1080, /* GL_PACK_INVERT_MESA */
+       339, /* GL_DEBUG_OBJECT_MESA */
+       340, /* GL_DEBUG_PRINT_MESA */
+       338, /* GL_DEBUG_ASSERT_MESA */
+       110, /* GL_BUFFER_SIZE */
+       112, /* GL_BUFFER_USAGE */
+       116, /* GL_BUMP_ROT_MATRIX_ATI */
+       117, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+       115, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+       119, /* GL_BUMP_TEX_UNITS_ATI */
+       447, /* GL_DUDV_ATI */
+       446, /* GL_DU8DV8_ATI */
+       114, /* GL_BUMP_ENVMAP_ATI */
+       118, /* GL_BUMP_TARGET_ATI */
+      1485, /* GL_STENCIL_BACK_FUNC */
+      1483, /* GL_STENCIL_BACK_FAIL */
+      1487, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1489, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+       531, /* GL_FRAGMENT_PROGRAM_ARB */
+      1218, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1246, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1245, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1230, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1236, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1235, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       881, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+       904, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+       903, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+       894, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+       900, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+       899, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       864, /* GL_MAX_DRAW_BUFFERS */
+       392, /* GL_DRAW_BUFFER0 */
+       395, /* GL_DRAW_BUFFER1 */
+       416, /* GL_DRAW_BUFFER2 */
+       419, /* GL_DRAW_BUFFER3 */
+       422, /* GL_DRAW_BUFFER4 */
+       425, /* GL_DRAW_BUFFER5 */
+       428, /* GL_DRAW_BUFFER6 */
+       431, /* GL_DRAW_BUFFER7 */
+       434, /* GL_DRAW_BUFFER8 */
+       437, /* GL_DRAW_BUFFER9 */
+       396, /* GL_DRAW_BUFFER10 */
+       399, /* GL_DRAW_BUFFER11 */
+       402, /* GL_DRAW_BUFFER12 */
+       405, /* GL_DRAW_BUFFER13 */
+       408, /* GL_DRAW_BUFFER14 */
+       411, /* GL_DRAW_BUFFER15 */
+        82, /* GL_BLEND_EQUATION_ALPHA */
+       844, /* GL_MATRIX_PALETTE_ARB */
+       875, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+       878, /* GL_MAX_PALETTE_MATRICES_ARB */
+       321, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+       838, /* GL_MATRIX_INDEX_ARRAY_ARB */
+       316, /* GL_CURRENT_MATRIX_INDEX_ARB */
+       840, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+       842, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+       841, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+       839, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+      1673, /* GL_TEXTURE_DEPTH_SIZE */
+       376, /* GL_DEPTH_TEXTURE_MODE */
+      1638, /* GL_TEXTURE_COMPARE_MODE */
+      1636, /* GL_TEXTURE_COMPARE_FUNC */
+       242, /* GL_COMPARE_R_TO_TEXTURE */
+      1152, /* GL_POINT_SPRITE */
+       296, /* GL_COORD_REPLACE */
+      1156, /* GL_POINT_SPRITE_R_MODE_NV */
+      1275, /* GL_QUERY_COUNTER_BITS */
+       323, /* GL_CURRENT_QUERY */
+      1277, /* GL_QUERY_RESULT */
+      1279, /* GL_QUERY_RESULT_AVAILABLE */
+       927, /* GL_MAX_VERTEX_ATTRIBS */
+      1814, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+       374, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+       373, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+       913, /* GL_MAX_TEXTURE_COORDS */
+       915, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1223, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1225, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1224, /* GL_PROGRAM_FORMAT_ARB */
+      1722, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+       353, /* GL_DEPTH_BOUNDS_TEST_EXT */
+       352, /* GL_DEPTH_BOUNDS_EXT */
+        53, /* GL_ARRAY_BUFFER */
+       460, /* GL_ELEMENT_ARRAY_BUFFER */
+        54, /* GL_ARRAY_BUFFER_BINDING */
+       461, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+      1788, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1014, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+       149, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+       623, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+      1651, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+       456, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+      1398, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+       509, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+      1841, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1810, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1226, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+       887, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+      1232, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+       896, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1244, /* GL_PROGRAM_TEMPORARIES_ARB */
+       902, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+      1234, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+       898, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1238, /* GL_PROGRAM_PARAMETERS_ARB */
+       901, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+      1233, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+       897, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1219, /* GL_PROGRAM_ATTRIBS_ARB */
+       882, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+      1231, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+       895, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1217, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+       880, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1229, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       893, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       888, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+       884, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+      1247, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      1735, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1288, /* GL_READ_ONLY */
+      1849, /* GL_WRITE_ONLY */
+      1290, /* GL_READ_WRITE */
+       102, /* GL_BUFFER_ACCESS */
+       105, /* GL_BUFFER_MAPPED */
+       107, /* GL_BUFFER_MAP_POINTER */
+      1729, /* GL_TIME_ELAPSED_EXT */
+       798, /* GL_MATRIX0_ARB */
+       810, /* GL_MATRIX1_ARB */
+       822, /* GL_MATRIX2_ARB */
+       826, /* GL_MATRIX3_ARB */
+       828, /* GL_MATRIX4_ARB */
+       830, /* GL_MATRIX5_ARB */
+       832, /* GL_MATRIX6_ARB */
+       834, /* GL_MATRIX7_ARB */
+       836, /* GL_MATRIX8_ARB */
+       837, /* GL_MATRIX9_ARB */
+       800, /* GL_MATRIX10_ARB */
+       801, /* GL_MATRIX11_ARB */
+       802, /* GL_MATRIX12_ARB */
+       803, /* GL_MATRIX13_ARB */
+       804, /* GL_MATRIX14_ARB */
+       805, /* GL_MATRIX15_ARB */
+       806, /* GL_MATRIX16_ARB */
+       807, /* GL_MATRIX17_ARB */
+       808, /* GL_MATRIX18_ARB */
+       809, /* GL_MATRIX19_ARB */
+       812, /* GL_MATRIX20_ARB */
+       813, /* GL_MATRIX21_ARB */
+       814, /* GL_MATRIX22_ARB */
+       815, /* GL_MATRIX23_ARB */
+       816, /* GL_MATRIX24_ARB */
+       817, /* GL_MATRIX25_ARB */
+       818, /* GL_MATRIX26_ARB */
+       819, /* GL_MATRIX27_ARB */
+       820, /* GL_MATRIX28_ARB */
+       821, /* GL_MATRIX29_ARB */
+       824, /* GL_MATRIX30_ARB */
+       825, /* GL_MATRIX31_ARB */
+      1518, /* GL_STREAM_DRAW */
+      1520, /* GL_STREAM_READ */
+      1516, /* GL_STREAM_COPY */
+      1476, /* GL_STATIC_DRAW */
+      1478, /* GL_STATIC_READ */
+      1474, /* GL_STATIC_COPY */
+       450, /* GL_DYNAMIC_DRAW */
+       452, /* GL_DYNAMIC_READ */
+       448, /* GL_DYNAMIC_COPY */
+      1120, /* GL_PIXEL_PACK_BUFFER */
+      1124, /* GL_PIXEL_UNPACK_BUFFER */
+      1121, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1125, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+       347, /* GL_DEPTH24_STENCIL8 */
+      1719, /* GL_TEXTURE_STENCIL_SIZE */
+      1671, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+       883, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+       886, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+       890, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+       889, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+       847, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+      1509, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         17, /* GL_ACTIVE_STENCIL_FACE_EXT */
-       945, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1375, /* GL_SAMPLES_PASSED */
-       108, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
-       103, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-       530, /* GL_FRAGMENT_SHADER */
-      1820, /* GL_VERTEX_SHADER */
-      1233, /* GL_PROGRAM_OBJECT_ARB */
-      1407, /* GL_SHADER_OBJECT_ARB */
-       869, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-       928, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-       922, /* GL_MAX_VARYING_FLOATS */
-       926, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-       854, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1036, /* GL_OBJECT_TYPE_ARB */
-      1409, /* GL_SHADER_TYPE */
-       495, /* GL_FLOAT_VEC2 */
-       497, /* GL_FLOAT_VEC3 */
-       499, /* GL_FLOAT_VEC4 */
-       648, /* GL_INT_VEC2 */
-       650, /* GL_INT_VEC3 */
-       652, /* GL_INT_VEC4 */
-        93, /* GL_BOOL */
-        95, /* GL_BOOL_VEC2 */
-        97, /* GL_BOOL_VEC3 */
-        99, /* GL_BOOL_VEC4 */
-       483, /* GL_FLOAT_MAT2 */
-       487, /* GL_FLOAT_MAT3 */
-       491, /* GL_FLOAT_MAT4 */
-      1366, /* GL_SAMPLER_1D */
-      1368, /* GL_SAMPLER_2D */
-      1370, /* GL_SAMPLER_3D */
-      1371, /* GL_SAMPLER_CUBE */
-      1367, /* GL_SAMPLER_1D_SHADOW */
-      1369, /* GL_SAMPLER_2D_SHADOW */
-       485, /* GL_FLOAT_MAT2x3 */
-       486, /* GL_FLOAT_MAT2x4 */
-       489, /* GL_FLOAT_MAT3x2 */
-       490, /* GL_FLOAT_MAT3x4 */
-       493, /* GL_FLOAT_MAT4x2 */
-       494, /* GL_FLOAT_MAT4x3 */
-       343, /* GL_DELETE_STATUS */
-       245, /* GL_COMPILE_STATUS */
-       703, /* GL_LINK_STATUS */
-      1768, /* GL_VALIDATE_STATUS */
-       633, /* GL_INFO_LOG_LENGTH */
-        55, /* GL_ATTACHED_SHADERS */
+       948, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1379, /* GL_SAMPLES_PASSED */
+       109, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
+       104, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
+       532, /* GL_FRAGMENT_SHADER */
+      1834, /* GL_VERTEX_SHADER */
+      1237, /* GL_PROGRAM_OBJECT_ARB */
+      1411, /* GL_SHADER_OBJECT_ARB */
+       871, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+       931, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+       925, /* GL_MAX_VARYING_FLOATS */
+       929, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+       856, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+      1040, /* GL_OBJECT_TYPE_ARB */
+      1413, /* GL_SHADER_TYPE */
+       497, /* GL_FLOAT_VEC2 */
+       499, /* GL_FLOAT_VEC3 */
+       501, /* GL_FLOAT_VEC4 */
+       650, /* GL_INT_VEC2 */
+       652, /* GL_INT_VEC3 */
+       654, /* GL_INT_VEC4 */
+        94, /* GL_BOOL */
+        96, /* GL_BOOL_VEC2 */
+        98, /* GL_BOOL_VEC3 */
+       100, /* GL_BOOL_VEC4 */
+       485, /* GL_FLOAT_MAT2 */
+       489, /* GL_FLOAT_MAT3 */
+       493, /* GL_FLOAT_MAT4 */
+      1370, /* GL_SAMPLER_1D */
+      1372, /* GL_SAMPLER_2D */
+      1374, /* GL_SAMPLER_3D */
+      1375, /* GL_SAMPLER_CUBE */
+      1371, /* GL_SAMPLER_1D_SHADOW */
+      1373, /* GL_SAMPLER_2D_SHADOW */
+       487, /* GL_FLOAT_MAT2x3 */
+       488, /* GL_FLOAT_MAT2x4 */
+       491, /* GL_FLOAT_MAT3x2 */
+       492, /* GL_FLOAT_MAT3x4 */
+       495, /* GL_FLOAT_MAT4x2 */
+       496, /* GL_FLOAT_MAT4x3 */
+       345, /* GL_DELETE_STATUS */
+       246, /* GL_COMPILE_STATUS */
+       705, /* GL_LINK_STATUS */
+      1782, /* GL_VALIDATE_STATUS */
+       635, /* GL_INFO_LOG_LENGTH */
+        56, /* GL_ATTACHED_SHADERS */
         20, /* GL_ACTIVE_UNIFORMS */
         21, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1408, /* GL_SHADER_SOURCE_LENGTH */
+      1412, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-       532, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1411, /* GL_SHADING_LANGUAGE_VERSION */
-       320, /* GL_CURRENT_PROGRAM */
-      1085, /* GL_PALETTE4_RGB8_OES */
-      1087, /* GL_PALETTE4_RGBA8_OES */
-      1083, /* GL_PALETTE4_R5_G6_B5_OES */
-      1086, /* GL_PALETTE4_RGBA4_OES */
-      1084, /* GL_PALETTE4_RGB5_A1_OES */
-      1090, /* GL_PALETTE8_RGB8_OES */
-      1092, /* GL_PALETTE8_RGBA8_OES */
-      1088, /* GL_PALETTE8_R5_G6_B5_OES */
-      1091, /* GL_PALETTE8_RGBA4_OES */
-      1089, /* GL_PALETTE8_RGB5_A1_OES */
-       615, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-       614, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-      1753, /* GL_UNSIGNED_NORMALIZED */
-      1595, /* GL_TEXTURE_1D_ARRAY_EXT */
-      1254, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-      1597, /* GL_TEXTURE_2D_ARRAY_EXT */
-      1257, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-      1603, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-      1605, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-      1463, /* GL_SRGB */
-      1464, /* GL_SRGB8 */
-      1466, /* GL_SRGB_ALPHA */
-      1465, /* GL_SRGB8_ALPHA8 */
-      1423, /* GL_SLUMINANCE_ALPHA */
-      1422, /* GL_SLUMINANCE8_ALPHA8 */
-      1420, /* GL_SLUMINANCE */
-      1421, /* GL_SLUMINANCE8 */
-       266, /* GL_COMPRESSED_SRGB */
-       267, /* GL_COMPRESSED_SRGB_ALPHA */
-       264, /* GL_COMPRESSED_SLUMINANCE */
-       265, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      1150, /* GL_POINT_SPRITE_COORD_ORIGIN */
-       711, /* GL_LOWER_LEFT */
-      1765, /* GL_UPPER_LEFT */
-      1486, /* GL_STENCIL_BACK_REF */
-      1487, /* GL_STENCIL_BACK_VALUE_MASK */
-      1488, /* GL_STENCIL_BACK_WRITEMASK */
-       439, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-      1300, /* GL_RENDERBUFFER_BINDING_EXT */
-      1281, /* GL_READ_FRAMEBUFFER */
-       438, /* GL_DRAW_FRAMEBUFFER */
-      1282, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-      1310, /* GL_RENDERBUFFER_SAMPLES */
-       542, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-       540, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-       551, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-       547, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-       549, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-       554, /* GL_FRAMEBUFFER_COMPLETE */
-       558, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-       564, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-       562, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-       560, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-       563, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-       561, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-       567, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-       570, /* GL_FRAMEBUFFER_UNSUPPORTED */
-       568, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-       851, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-       154, /* GL_COLOR_ATTACHMENT0 */
-       156, /* GL_COLOR_ATTACHMENT1 */
-       170, /* GL_COLOR_ATTACHMENT2 */
-       172, /* GL_COLOR_ATTACHMENT3 */
-       174, /* GL_COLOR_ATTACHMENT4 */
-       176, /* GL_COLOR_ATTACHMENT5 */
-       178, /* GL_COLOR_ATTACHMENT6 */
-       180, /* GL_COLOR_ATTACHMENT7 */
-       182, /* GL_COLOR_ATTACHMENT8 */
-       184, /* GL_COLOR_ATTACHMENT9 */
-       157, /* GL_COLOR_ATTACHMENT10 */
-       159, /* GL_COLOR_ATTACHMENT11 */
-       161, /* GL_COLOR_ATTACHMENT12 */
-       163, /* GL_COLOR_ATTACHMENT13 */
-       165, /* GL_COLOR_ATTACHMENT14 */
-       167, /* GL_COLOR_ATTACHMENT15 */
-       346, /* GL_DEPTH_ATTACHMENT */
-      1476, /* GL_STENCIL_ATTACHMENT */
-       533, /* GL_FRAMEBUFFER */
-      1298, /* GL_RENDERBUFFER */
-      1312, /* GL_RENDERBUFFER_WIDTH */
-      1305, /* GL_RENDERBUFFER_HEIGHT */
-      1307, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1499, /* GL_STENCIL_INDEX_EXT */
-      1496, /* GL_STENCIL_INDEX1_EXT */
-      1497, /* GL_STENCIL_INDEX4_EXT */
-      1498, /* GL_STENCIL_INDEX8_EXT */
-      1495, /* GL_STENCIL_INDEX16_EXT */
-      1309, /* GL_RENDERBUFFER_RED_SIZE */
-      1304, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1301, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1299, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1302, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1311, /* GL_RENDERBUFFER_STENCIL_SIZE */
-       566, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-       907, /* GL_MAX_SAMPLES */
-      1268, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-       480, /* GL_FIRST_VERTEX_CONVENTION_EXT */
-       663, /* GL_LAST_VERTEX_CONVENTION_EXT */
-      1247, /* GL_PROVOKING_VERTEX_EXT */
-       300, /* GL_COPY_READ_BUFFER */
-       301, /* GL_COPY_WRITE_BUFFER */
-      1359, /* GL_RGBA_SNORM */
-      1355, /* GL_RGBA8_SNORM */
-      1416, /* GL_SIGNED_NORMALIZED */
-       465, /* GL_EVAL_BIT */
-      1279, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-       705, /* GL_LIST_BIT */
-      1611, /* GL_TEXTURE_BIT */
-      1390, /* GL_SCISSOR_BIT */
+       534, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+      1415, /* GL_SHADING_LANGUAGE_VERSION */
+       322, /* GL_CURRENT_PROGRAM */
+      1089, /* GL_PALETTE4_RGB8_OES */
+      1091, /* GL_PALETTE4_RGBA8_OES */
+      1087, /* GL_PALETTE4_R5_G6_B5_OES */
+      1090, /* GL_PALETTE4_RGBA4_OES */
+      1088, /* GL_PALETTE4_RGB5_A1_OES */
+      1094, /* GL_PALETTE8_RGB8_OES */
+      1096, /* GL_PALETTE8_RGBA8_OES */
+      1092, /* GL_PALETTE8_R5_G6_B5_OES */
+      1095, /* GL_PALETTE8_RGBA4_OES */
+      1093, /* GL_PALETTE8_RGB5_A1_OES */
+       617, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+       616, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+      1767, /* GL_UNSIGNED_NORMALIZED */
+      1606, /* GL_TEXTURE_1D_ARRAY_EXT */
+      1258, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+      1608, /* GL_TEXTURE_2D_ARRAY_EXT */
+      1261, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+      1614, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+      1616, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+      1468, /* GL_SRGB */
+      1469, /* GL_SRGB8 */
+      1471, /* GL_SRGB_ALPHA */
+      1470, /* GL_SRGB8_ALPHA8 */
+      1428, /* GL_SLUMINANCE_ALPHA */
+      1427, /* GL_SLUMINANCE8_ALPHA8 */
+      1425, /* GL_SLUMINANCE */
+      1426, /* GL_SLUMINANCE8 */
+       267, /* GL_COMPRESSED_SRGB */
+       268, /* GL_COMPRESSED_SRGB_ALPHA */
+       265, /* GL_COMPRESSED_SLUMINANCE */
+       266, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
+      1154, /* GL_POINT_SPRITE_COORD_ORIGIN */
+       713, /* GL_LOWER_LEFT */
+      1779, /* GL_UPPER_LEFT */
+      1491, /* GL_STENCIL_BACK_REF */
+      1492, /* GL_STENCIL_BACK_VALUE_MASK */
+      1493, /* GL_STENCIL_BACK_WRITEMASK */
+       441, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+      1304, /* GL_RENDERBUFFER_BINDING_EXT */
+      1285, /* GL_READ_FRAMEBUFFER */
+       440, /* GL_DRAW_FRAMEBUFFER */
+      1286, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+      1314, /* GL_RENDERBUFFER_SAMPLES */
+       544, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+       542, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+       553, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+       549, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+       551, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+       556, /* GL_FRAMEBUFFER_COMPLETE */
+       560, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+       566, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+       564, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+       562, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+       565, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+       563, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+       569, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+       572, /* GL_FRAMEBUFFER_UNSUPPORTED */
+       570, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+       853, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+       155, /* GL_COLOR_ATTACHMENT0 */
+       157, /* GL_COLOR_ATTACHMENT1 */
+       171, /* GL_COLOR_ATTACHMENT2 */
+       173, /* GL_COLOR_ATTACHMENT3 */
+       175, /* GL_COLOR_ATTACHMENT4 */
+       177, /* GL_COLOR_ATTACHMENT5 */
+       179, /* GL_COLOR_ATTACHMENT6 */
+       181, /* GL_COLOR_ATTACHMENT7 */
+       183, /* GL_COLOR_ATTACHMENT8 */
+       185, /* GL_COLOR_ATTACHMENT9 */
+       158, /* GL_COLOR_ATTACHMENT10 */
+       160, /* GL_COLOR_ATTACHMENT11 */
+       162, /* GL_COLOR_ATTACHMENT12 */
+       164, /* GL_COLOR_ATTACHMENT13 */
+       166, /* GL_COLOR_ATTACHMENT14 */
+       168, /* GL_COLOR_ATTACHMENT15 */
+       348, /* GL_DEPTH_ATTACHMENT */
+      1481, /* GL_STENCIL_ATTACHMENT */
+       535, /* GL_FRAMEBUFFER */
+      1302, /* GL_RENDERBUFFER */
+      1316, /* GL_RENDERBUFFER_WIDTH */
+      1309, /* GL_RENDERBUFFER_HEIGHT */
+      1311, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1504, /* GL_STENCIL_INDEX_EXT */
+      1501, /* GL_STENCIL_INDEX1_EXT */
+      1502, /* GL_STENCIL_INDEX4_EXT */
+      1503, /* GL_STENCIL_INDEX8_EXT */
+      1500, /* GL_STENCIL_INDEX16_EXT */
+      1313, /* GL_RENDERBUFFER_RED_SIZE */
+      1308, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1305, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1303, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1306, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1315, /* GL_RENDERBUFFER_STENCIL_SIZE */
+       568, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+       909, /* GL_MAX_SAMPLES */
+      1272, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+       482, /* GL_FIRST_VERTEX_CONVENTION_EXT */
+       665, /* GL_LAST_VERTEX_CONVENTION_EXT */
+      1251, /* GL_PROVOKING_VERTEX_EXT */
+       302, /* GL_COPY_READ_BUFFER */
+       303, /* GL_COPY_WRITE_BUFFER */
+      1363, /* GL_RGBA_SNORM */
+      1359, /* GL_RGBA8_SNORM */
+      1421, /* GL_SIGNED_NORMALIZED */
+       910, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+      1039, /* GL_OBJECT_TYPE */
+      1525, /* GL_SYNC_CONDITION */
+      1530, /* GL_SYNC_STATUS */
+      1527, /* GL_SYNC_FLAGS */
+      1526, /* GL_SYNC_FENCE */
+      1529, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+      1756, /* GL_UNSIGNALED */
+      1420, /* GL_SIGNALED */
+        46, /* GL_ALREADY_SIGNALED */
+      1727, /* GL_TIMEOUT_EXPIRED */
+       270, /* GL_CONDITION_SATISFIED */
+      1839, /* GL_WAIT_FAILED */
+       467, /* GL_EVAL_BIT */
+      1283, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+       707, /* GL_LIST_BIT */
+      1622, /* GL_TEXTURE_BIT */
+      1394, /* GL_SCISSOR_BIT */
         29, /* GL_ALL_ATTRIB_BITS */
-       992, /* GL_MULTISAMPLE_BIT */
+       995, /* GL_MULTISAMPLE_BIT */
         30, /* GL_ALL_CLIENT_ATTRIB_BITS */
+      1728, /* GL_TIMEOUT_IGNORED */
 };
 
 typedef int (*cfunc)(const void *, const void *);
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 34c1e09ad8..5b2c9e4a9a 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -764,23 +764,30 @@ gl_dispatch_functions_start:
 	GL_STUB(glBindVertexArray, _gloffset_BindVertexArray)
 	GL_STUB(glGenVertexArrays, _gloffset_GenVertexArrays)
 	GL_STUB(glCopyBufferSubData, _gloffset_CopyBufferSubData)
+	GL_STUB(glClientWaitSync, _gloffset_ClientWaitSync)
+	GL_STUB(glDeleteSync, _gloffset_DeleteSync)
+	GL_STUB(glFenceSync, _gloffset_FenceSync)
+	GL_STUB(glGetInteger64v, _gloffset_GetInteger64v)
+	GL_STUB(glGetSynciv, _gloffset_GetSynciv)
+	GL_STUB(glIsSync, _gloffset_IsSync)
+	GL_STUB(glWaitSync, _gloffset_WaitSync)
 	GL_STUB(glPolygonOffsetEXT, _gloffset_PolygonOffsetEXT)
-	GL_STUB(gl_dispatch_stub_568, _gloffset_GetPixelTexGenParameterfvSGIS)
-	HIDDEN(gl_dispatch_stub_568)
-	GL_STUB(gl_dispatch_stub_569, _gloffset_GetPixelTexGenParameterivSGIS)
-	HIDDEN(gl_dispatch_stub_569)
-	GL_STUB(gl_dispatch_stub_570, _gloffset_PixelTexGenParameterfSGIS)
-	HIDDEN(gl_dispatch_stub_570)
-	GL_STUB(gl_dispatch_stub_571, _gloffset_PixelTexGenParameterfvSGIS)
-	HIDDEN(gl_dispatch_stub_571)
-	GL_STUB(gl_dispatch_stub_572, _gloffset_PixelTexGenParameteriSGIS)
-	HIDDEN(gl_dispatch_stub_572)
-	GL_STUB(gl_dispatch_stub_573, _gloffset_PixelTexGenParameterivSGIS)
-	HIDDEN(gl_dispatch_stub_573)
-	GL_STUB(gl_dispatch_stub_574, _gloffset_SampleMaskSGIS)
-	HIDDEN(gl_dispatch_stub_574)
-	GL_STUB(gl_dispatch_stub_575, _gloffset_SamplePatternSGIS)
+	GL_STUB(gl_dispatch_stub_575, _gloffset_GetPixelTexGenParameterfvSGIS)
 	HIDDEN(gl_dispatch_stub_575)
+	GL_STUB(gl_dispatch_stub_576, _gloffset_GetPixelTexGenParameterivSGIS)
+	HIDDEN(gl_dispatch_stub_576)
+	GL_STUB(gl_dispatch_stub_577, _gloffset_PixelTexGenParameterfSGIS)
+	HIDDEN(gl_dispatch_stub_577)
+	GL_STUB(gl_dispatch_stub_578, _gloffset_PixelTexGenParameterfvSGIS)
+	HIDDEN(gl_dispatch_stub_578)
+	GL_STUB(gl_dispatch_stub_579, _gloffset_PixelTexGenParameteriSGIS)
+	HIDDEN(gl_dispatch_stub_579)
+	GL_STUB(gl_dispatch_stub_580, _gloffset_PixelTexGenParameterivSGIS)
+	HIDDEN(gl_dispatch_stub_580)
+	GL_STUB(gl_dispatch_stub_581, _gloffset_SampleMaskSGIS)
+	HIDDEN(gl_dispatch_stub_581)
+	GL_STUB(gl_dispatch_stub_582, _gloffset_SamplePatternSGIS)
+	HIDDEN(gl_dispatch_stub_582)
 	GL_STUB(glColorPointerEXT, _gloffset_ColorPointerEXT)
 	GL_STUB(glEdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT)
 	GL_STUB(glIndexPointerEXT, _gloffset_IndexPointerEXT)
@@ -791,10 +798,10 @@ gl_dispatch_functions_start:
 	GL_STUB(glPointParameterfvEXT, _gloffset_PointParameterfvEXT)
 	GL_STUB(glLockArraysEXT, _gloffset_LockArraysEXT)
 	GL_STUB(glUnlockArraysEXT, _gloffset_UnlockArraysEXT)
-	GL_STUB(gl_dispatch_stub_586, _gloffset_CullParameterdvEXT)
-	HIDDEN(gl_dispatch_stub_586)
-	GL_STUB(gl_dispatch_stub_587, _gloffset_CullParameterfvEXT)
-	HIDDEN(gl_dispatch_stub_587)
+	GL_STUB(gl_dispatch_stub_593, _gloffset_CullParameterdvEXT)
+	HIDDEN(gl_dispatch_stub_593)
+	GL_STUB(gl_dispatch_stub_594, _gloffset_CullParameterfvEXT)
+	HIDDEN(gl_dispatch_stub_594)
 	GL_STUB(glSecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT)
 	GL_STUB(glSecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT)
 	GL_STUB(glSecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT)
@@ -819,8 +826,8 @@ gl_dispatch_functions_start:
 	GL_STUB(glFogCoorddvEXT, _gloffset_FogCoorddvEXT)
 	GL_STUB(glFogCoordfEXT, _gloffset_FogCoordfEXT)
 	GL_STUB(glFogCoordfvEXT, _gloffset_FogCoordfvEXT)
-	GL_STUB(gl_dispatch_stub_612, _gloffset_PixelTexGenSGIX)
-	HIDDEN(gl_dispatch_stub_612)
+	GL_STUB(gl_dispatch_stub_619, _gloffset_PixelTexGenSGIX)
+	HIDDEN(gl_dispatch_stub_619)
 	GL_STUB(glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT)
 	GL_STUB(glFlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV)
 	GL_STUB(glVertexArrayRangeNV, _gloffset_VertexArrayRangeNV)
@@ -862,24 +869,24 @@ gl_dispatch_functions_start:
 	GL_STUB(glWindowPos4ivMESA, _gloffset_WindowPos4ivMESA)
 	GL_STUB(glWindowPos4sMESA, _gloffset_WindowPos4sMESA)
 	GL_STUB(glWindowPos4svMESA, _gloffset_WindowPos4svMESA)
-	GL_STUB(gl_dispatch_stub_654, _gloffset_MultiModeDrawArraysIBM)
-	HIDDEN(gl_dispatch_stub_654)
-	GL_STUB(gl_dispatch_stub_655, _gloffset_MultiModeDrawElementsIBM)
-	HIDDEN(gl_dispatch_stub_655)
-	GL_STUB(gl_dispatch_stub_656, _gloffset_DeleteFencesNV)
-	HIDDEN(gl_dispatch_stub_656)
-	GL_STUB(gl_dispatch_stub_657, _gloffset_FinishFenceNV)
-	HIDDEN(gl_dispatch_stub_657)
-	GL_STUB(gl_dispatch_stub_658, _gloffset_GenFencesNV)
-	HIDDEN(gl_dispatch_stub_658)
-	GL_STUB(gl_dispatch_stub_659, _gloffset_GetFenceivNV)
-	HIDDEN(gl_dispatch_stub_659)
-	GL_STUB(gl_dispatch_stub_660, _gloffset_IsFenceNV)
-	HIDDEN(gl_dispatch_stub_660)
-	GL_STUB(gl_dispatch_stub_661, _gloffset_SetFenceNV)
+	GL_STUB(gl_dispatch_stub_661, _gloffset_MultiModeDrawArraysIBM)
 	HIDDEN(gl_dispatch_stub_661)
-	GL_STUB(gl_dispatch_stub_662, _gloffset_TestFenceNV)
+	GL_STUB(gl_dispatch_stub_662, _gloffset_MultiModeDrawElementsIBM)
 	HIDDEN(gl_dispatch_stub_662)
+	GL_STUB(gl_dispatch_stub_663, _gloffset_DeleteFencesNV)
+	HIDDEN(gl_dispatch_stub_663)
+	GL_STUB(gl_dispatch_stub_664, _gloffset_FinishFenceNV)
+	HIDDEN(gl_dispatch_stub_664)
+	GL_STUB(gl_dispatch_stub_665, _gloffset_GenFencesNV)
+	HIDDEN(gl_dispatch_stub_665)
+	GL_STUB(gl_dispatch_stub_666, _gloffset_GetFenceivNV)
+	HIDDEN(gl_dispatch_stub_666)
+	GL_STUB(gl_dispatch_stub_667, _gloffset_IsFenceNV)
+	HIDDEN(gl_dispatch_stub_667)
+	GL_STUB(gl_dispatch_stub_668, _gloffset_SetFenceNV)
+	HIDDEN(gl_dispatch_stub_668)
+	GL_STUB(gl_dispatch_stub_669, _gloffset_TestFenceNV)
+	HIDDEN(gl_dispatch_stub_669)
 	GL_STUB(glAreProgramsResidentNV, _gloffset_AreProgramsResidentNV)
 	GL_STUB(glBindProgramNV, _gloffset_BindProgramNV)
 	GL_STUB(glDeleteProgramsNV, _gloffset_DeleteProgramsNV)
@@ -960,26 +967,26 @@ gl_dispatch_functions_start:
 	GL_STUB(glSetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI)
 	GL_STUB(glPointParameteriNV, _gloffset_PointParameteriNV)
 	GL_STUB(glPointParameterivNV, _gloffset_PointParameterivNV)
-	GL_STUB(gl_dispatch_stub_743, _gloffset_ActiveStencilFaceEXT)
-	HIDDEN(gl_dispatch_stub_743)
-	GL_STUB(gl_dispatch_stub_744, _gloffset_BindVertexArrayAPPLE)
-	HIDDEN(gl_dispatch_stub_744)
-	GL_STUB(gl_dispatch_stub_745, _gloffset_DeleteVertexArraysAPPLE)
-	HIDDEN(gl_dispatch_stub_745)
-	GL_STUB(gl_dispatch_stub_746, _gloffset_GenVertexArraysAPPLE)
-	HIDDEN(gl_dispatch_stub_746)
-	GL_STUB(gl_dispatch_stub_747, _gloffset_IsVertexArrayAPPLE)
-	HIDDEN(gl_dispatch_stub_747)
+	GL_STUB(gl_dispatch_stub_750, _gloffset_ActiveStencilFaceEXT)
+	HIDDEN(gl_dispatch_stub_750)
+	GL_STUB(gl_dispatch_stub_751, _gloffset_BindVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_751)
+	GL_STUB(gl_dispatch_stub_752, _gloffset_DeleteVertexArraysAPPLE)
+	HIDDEN(gl_dispatch_stub_752)
+	GL_STUB(gl_dispatch_stub_753, _gloffset_GenVertexArraysAPPLE)
+	HIDDEN(gl_dispatch_stub_753)
+	GL_STUB(gl_dispatch_stub_754, _gloffset_IsVertexArrayAPPLE)
+	HIDDEN(gl_dispatch_stub_754)
 	GL_STUB(glGetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV)
 	GL_STUB(glGetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV)
 	GL_STUB(glProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV)
 	GL_STUB(glProgramNamedParameter4dvNV, _gloffset_ProgramNamedParameter4dvNV)
 	GL_STUB(glProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV)
 	GL_STUB(glProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV)
-	GL_STUB(gl_dispatch_stub_754, _gloffset_DepthBoundsEXT)
-	HIDDEN(gl_dispatch_stub_754)
-	GL_STUB(gl_dispatch_stub_755, _gloffset_BlendEquationSeparateEXT)
-	HIDDEN(gl_dispatch_stub_755)
+	GL_STUB(gl_dispatch_stub_761, _gloffset_DepthBoundsEXT)
+	HIDDEN(gl_dispatch_stub_761)
+	GL_STUB(gl_dispatch_stub_762, _gloffset_BlendEquationSeparateEXT)
+	HIDDEN(gl_dispatch_stub_762)
 	GL_STUB(glBindFramebufferEXT, _gloffset_BindFramebufferEXT)
 	GL_STUB(glBindRenderbufferEXT, _gloffset_BindRenderbufferEXT)
 	GL_STUB(glCheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT)
@@ -997,28 +1004,28 @@ gl_dispatch_functions_start:
 	GL_STUB(glIsFramebufferEXT, _gloffset_IsFramebufferEXT)
 	GL_STUB(glIsRenderbufferEXT, _gloffset_IsRenderbufferEXT)
 	GL_STUB(glRenderbufferStorageEXT, _gloffset_RenderbufferStorageEXT)
-	GL_STUB(gl_dispatch_stub_773, _gloffset_BlitFramebufferEXT)
-	HIDDEN(gl_dispatch_stub_773)
-	GL_STUB(gl_dispatch_stub_774, _gloffset_BufferParameteriAPPLE)
-	HIDDEN(gl_dispatch_stub_774)
-	GL_STUB(gl_dispatch_stub_775, _gloffset_FlushMappedBufferRangeAPPLE)
-	HIDDEN(gl_dispatch_stub_775)
-	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
-	GL_STUB(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT)
-	GL_STUB(gl_dispatch_stub_778, _gloffset_GetTexParameterPointervAPPLE)
-	HIDDEN(gl_dispatch_stub_778)
-	GL_STUB(gl_dispatch_stub_779, _gloffset_TextureRangeAPPLE)
-	HIDDEN(gl_dispatch_stub_779)
-	GL_STUB(gl_dispatch_stub_780, _gloffset_StencilFuncSeparateATI)
+	GL_STUB(gl_dispatch_stub_780, _gloffset_BlitFramebufferEXT)
 	HIDDEN(gl_dispatch_stub_780)
-	GL_STUB(gl_dispatch_stub_781, _gloffset_ProgramEnvParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_781, _gloffset_BufferParameteriAPPLE)
 	HIDDEN(gl_dispatch_stub_781)
-	GL_STUB(gl_dispatch_stub_782, _gloffset_ProgramLocalParameters4fvEXT)
+	GL_STUB(gl_dispatch_stub_782, _gloffset_FlushMappedBufferRangeAPPLE)
 	HIDDEN(gl_dispatch_stub_782)
-	GL_STUB(gl_dispatch_stub_783, _gloffset_GetQueryObjecti64vEXT)
-	HIDDEN(gl_dispatch_stub_783)
-	GL_STUB(gl_dispatch_stub_784, _gloffset_GetQueryObjectui64vEXT)
-	HIDDEN(gl_dispatch_stub_784)
+	GL_STUB(glFramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT)
+	GL_STUB(glProvokingVertexEXT, _gloffset_ProvokingVertexEXT)
+	GL_STUB(gl_dispatch_stub_785, _gloffset_GetTexParameterPointervAPPLE)
+	HIDDEN(gl_dispatch_stub_785)
+	GL_STUB(gl_dispatch_stub_786, _gloffset_TextureRangeAPPLE)
+	HIDDEN(gl_dispatch_stub_786)
+	GL_STUB(gl_dispatch_stub_787, _gloffset_StencilFuncSeparateATI)
+	HIDDEN(gl_dispatch_stub_787)
+	GL_STUB(gl_dispatch_stub_788, _gloffset_ProgramEnvParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_788)
+	GL_STUB(gl_dispatch_stub_789, _gloffset_ProgramLocalParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_789)
+	GL_STUB(gl_dispatch_stub_790, _gloffset_GetQueryObjecti64vEXT)
+	HIDDEN(gl_dispatch_stub_790)
+	GL_STUB(gl_dispatch_stub_791, _gloffset_GetQueryObjectui64vEXT)
+	HIDDEN(gl_dispatch_stub_791)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S
index 10525d4c65..db917f3982 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -21349,13 +21349,264 @@ GL_PREFIX(CopyBufferSubData):
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CopyBufferSubData), .-GL_PREFIX(CopyBufferSubData)
 
+	.p2align	4,,15
+	.globl	GL_PREFIX(ClientWaitSync)
+	.type	GL_PREFIX(ClientWaitSync), @function
+GL_PREFIX(ClientWaitSync):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4536(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4536(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4536(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4536(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(ClientWaitSync), .-GL_PREFIX(ClientWaitSync)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(DeleteSync)
+	.type	GL_PREFIX(DeleteSync), @function
+GL_PREFIX(DeleteSync):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4544(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	4544(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4544(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	4544(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(DeleteSync), .-GL_PREFIX(DeleteSync)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(FenceSync)
+	.type	GL_PREFIX(FenceSync), @function
+GL_PREFIX(FenceSync):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4552(%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	4552(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4552(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4552(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(FenceSync), .-GL_PREFIX(FenceSync)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GetInteger64v)
+	.type	GL_PREFIX(GetInteger64v), @function
+GL_PREFIX(GetInteger64v):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4560(%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	4560(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4560(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	4560(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetInteger64v), .-GL_PREFIX(GetInteger64v)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GetSynciv)
+	.type	GL_PREFIX(GetSynciv), @function
+GL_PREFIX(GetSynciv):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4568(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
+	call	_x86_64_get_dispatch@PLT
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4568(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4568(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
+	call	_glapi_get_dispatch
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4568(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetSynciv), .-GL_PREFIX(GetSynciv)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(IsSync)
+	.type	GL_PREFIX(IsSync), @function
+GL_PREFIX(IsSync):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4576(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	4576(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4576(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	4576(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(IsSync), .-GL_PREFIX(IsSync)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(WaitSync)
+	.type	GL_PREFIX(WaitSync), @function
+GL_PREFIX(WaitSync):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	4584(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4584(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	4584(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	4584(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(WaitSync), .-GL_PREFIX(WaitSync)
+
 	.p2align	4,,15
 	.globl	GL_PREFIX(PolygonOffsetEXT)
 	.type	GL_PREFIX(PolygonOffsetEXT), @function
 GL_PREFIX(PolygonOffsetEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4536(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -21365,13 +21616,13 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4536(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4536(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -21381,19 +21632,19 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4536(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PolygonOffsetEXT), .-GL_PREFIX(PolygonOffsetEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_568)
-	.type	GL_PREFIX(_dispatch_stub_568), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_568))
-GL_PREFIX(_dispatch_stub_568):
+	.globl	GL_PREFIX(_dispatch_stub_575)
+	.type	GL_PREFIX(_dispatch_stub_575), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_575))
+GL_PREFIX(_dispatch_stub_575):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4544(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21403,13 +21654,13 @@ GL_PREFIX(_dispatch_stub_568):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4544(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4544(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21419,19 +21670,19 @@ GL_PREFIX(_dispatch_stub_568):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4544(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_568), .-GL_PREFIX(_dispatch_stub_568)
+	.size	GL_PREFIX(_dispatch_stub_575), .-GL_PREFIX(_dispatch_stub_575)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_569)
-	.type	GL_PREFIX(_dispatch_stub_569), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_569))
-GL_PREFIX(_dispatch_stub_569):
+	.globl	GL_PREFIX(_dispatch_stub_576)
+	.type	GL_PREFIX(_dispatch_stub_576), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_576))
+GL_PREFIX(_dispatch_stub_576):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4552(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21441,13 +21692,13 @@ GL_PREFIX(_dispatch_stub_569):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4552(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4552(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21457,19 +21708,19 @@ GL_PREFIX(_dispatch_stub_569):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4552(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_569), .-GL_PREFIX(_dispatch_stub_569)
+	.size	GL_PREFIX(_dispatch_stub_576), .-GL_PREFIX(_dispatch_stub_576)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_570)
-	.type	GL_PREFIX(_dispatch_stub_570), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_570))
-GL_PREFIX(_dispatch_stub_570):
+	.globl	GL_PREFIX(_dispatch_stub_577)
+	.type	GL_PREFIX(_dispatch_stub_577), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_577))
+GL_PREFIX(_dispatch_stub_577):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4560(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -21479,13 +21730,13 @@ GL_PREFIX(_dispatch_stub_570):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4560(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4560(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -21495,19 +21746,19 @@ GL_PREFIX(_dispatch_stub_570):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4560(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_570), .-GL_PREFIX(_dispatch_stub_570)
+	.size	GL_PREFIX(_dispatch_stub_577), .-GL_PREFIX(_dispatch_stub_577)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_571)
-	.type	GL_PREFIX(_dispatch_stub_571), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_571))
-GL_PREFIX(_dispatch_stub_571):
+	.globl	GL_PREFIX(_dispatch_stub_578)
+	.type	GL_PREFIX(_dispatch_stub_578), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_578))
+GL_PREFIX(_dispatch_stub_578):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4568(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21517,13 +21768,13 @@ GL_PREFIX(_dispatch_stub_571):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4568(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4568(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21533,19 +21784,19 @@ GL_PREFIX(_dispatch_stub_571):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4568(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_571), .-GL_PREFIX(_dispatch_stub_571)
+	.size	GL_PREFIX(_dispatch_stub_578), .-GL_PREFIX(_dispatch_stub_578)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_572)
-	.type	GL_PREFIX(_dispatch_stub_572), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_572))
-GL_PREFIX(_dispatch_stub_572):
+	.globl	GL_PREFIX(_dispatch_stub_579)
+	.type	GL_PREFIX(_dispatch_stub_579), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_579))
+GL_PREFIX(_dispatch_stub_579):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4576(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21555,13 +21806,13 @@ GL_PREFIX(_dispatch_stub_572):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4576(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4576(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21571,19 +21822,19 @@ GL_PREFIX(_dispatch_stub_572):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4576(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_572), .-GL_PREFIX(_dispatch_stub_572)
+	.size	GL_PREFIX(_dispatch_stub_579), .-GL_PREFIX(_dispatch_stub_579)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_573)
-	.type	GL_PREFIX(_dispatch_stub_573), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_573))
-GL_PREFIX(_dispatch_stub_573):
+	.globl	GL_PREFIX(_dispatch_stub_580)
+	.type	GL_PREFIX(_dispatch_stub_580), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_580))
+GL_PREFIX(_dispatch_stub_580):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4584(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21593,13 +21844,13 @@ GL_PREFIX(_dispatch_stub_573):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4584(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4584(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21609,19 +21860,19 @@ GL_PREFIX(_dispatch_stub_573):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4584(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_573), .-GL_PREFIX(_dispatch_stub_573)
+	.size	GL_PREFIX(_dispatch_stub_580), .-GL_PREFIX(_dispatch_stub_580)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_574)
-	.type	GL_PREFIX(_dispatch_stub_574), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_574))
-GL_PREFIX(_dispatch_stub_574):
+	.globl	GL_PREFIX(_dispatch_stub_581)
+	.type	GL_PREFIX(_dispatch_stub_581), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_581))
+GL_PREFIX(_dispatch_stub_581):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4592(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21631,13 +21882,13 @@ GL_PREFIX(_dispatch_stub_574):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4592(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4592(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21647,40 +21898,40 @@ GL_PREFIX(_dispatch_stub_574):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4592(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_574), .-GL_PREFIX(_dispatch_stub_574)
+	.size	GL_PREFIX(_dispatch_stub_581), .-GL_PREFIX(_dispatch_stub_581)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_575)
-	.type	GL_PREFIX(_dispatch_stub_575), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_575))
-GL_PREFIX(_dispatch_stub_575):
+	.globl	GL_PREFIX(_dispatch_stub_582)
+	.type	GL_PREFIX(_dispatch_stub_582), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_582))
+GL_PREFIX(_dispatch_stub_582):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4600(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4600(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4600(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4600(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_575), .-GL_PREFIX(_dispatch_stub_575)
+	.size	GL_PREFIX(_dispatch_stub_582), .-GL_PREFIX(_dispatch_stub_582)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(ColorPointerEXT)
@@ -21688,7 +21939,7 @@ GL_PREFIX(_dispatch_stub_575):
 GL_PREFIX(ColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4608(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21702,13 +21953,13 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4608(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4608(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21722,7 +21973,7 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4608(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorPointerEXT), .-GL_PREFIX(ColorPointerEXT)
@@ -21733,7 +21984,7 @@ GL_PREFIX(ColorPointerEXT):
 GL_PREFIX(EdgeFlagPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4616(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21743,13 +21994,13 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4616(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4616(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21759,7 +22010,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4616(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EdgeFlagPointerEXT), .-GL_PREFIX(EdgeFlagPointerEXT)
@@ -21770,7 +22021,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 GL_PREFIX(IndexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4624(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21784,13 +22035,13 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4624(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4624(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21804,7 +22055,7 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4624(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IndexPointerEXT), .-GL_PREFIX(IndexPointerEXT)
@@ -21815,7 +22066,7 @@ GL_PREFIX(IndexPointerEXT):
 GL_PREFIX(NormalPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4632(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21829,13 +22080,13 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4632(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4632(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21849,7 +22100,7 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4632(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(NormalPointerEXT), .-GL_PREFIX(NormalPointerEXT)
@@ -21860,7 +22111,7 @@ GL_PREFIX(NormalPointerEXT):
 GL_PREFIX(TexCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4640(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21874,13 +22125,13 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4640(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4640(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21894,7 +22145,7 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4640(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordPointerEXT), .-GL_PREFIX(TexCoordPointerEXT)
@@ -21905,7 +22156,7 @@ GL_PREFIX(TexCoordPointerEXT):
 GL_PREFIX(VertexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4648(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21919,13 +22170,13 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4648(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4648(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21939,7 +22190,7 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4648(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexPointerEXT), .-GL_PREFIX(VertexPointerEXT)
@@ -21950,7 +22201,7 @@ GL_PREFIX(VertexPointerEXT):
 GL_PREFIX(PointParameterfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4656(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -21960,13 +22211,13 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4656(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4656(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -21976,7 +22227,7 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4656(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfEXT), .-GL_PREFIX(PointParameterfEXT)
@@ -21987,7 +22238,7 @@ GL_PREFIX(PointParameterfEXT):
 GL_PREFIX(PointParameterfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4664(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21997,13 +22248,13 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4664(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4664(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22013,7 +22264,7 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4664(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfvEXT), .-GL_PREFIX(PointParameterfvEXT)
@@ -22024,7 +22275,7 @@ GL_PREFIX(PointParameterfvEXT):
 GL_PREFIX(LockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4672(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22034,13 +22285,13 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4672(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4672(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22050,7 +22301,7 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4672(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LockArraysEXT), .-GL_PREFIX(LockArraysEXT)
@@ -22061,37 +22312,37 @@ GL_PREFIX(LockArraysEXT):
 GL_PREFIX(UnlockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4680(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4680(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4680(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4680(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UnlockArraysEXT), .-GL_PREFIX(UnlockArraysEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_586)
-	.type	GL_PREFIX(_dispatch_stub_586), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_586))
-GL_PREFIX(_dispatch_stub_586):
+	.globl	GL_PREFIX(_dispatch_stub_593)
+	.type	GL_PREFIX(_dispatch_stub_593), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_593))
+GL_PREFIX(_dispatch_stub_593):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4688(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22101,13 +22352,13 @@ GL_PREFIX(_dispatch_stub_586):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4688(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4688(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22117,19 +22368,19 @@ GL_PREFIX(_dispatch_stub_586):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4688(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_586), .-GL_PREFIX(_dispatch_stub_586)
+	.size	GL_PREFIX(_dispatch_stub_593), .-GL_PREFIX(_dispatch_stub_593)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_587)
-	.type	GL_PREFIX(_dispatch_stub_587), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_587))
-GL_PREFIX(_dispatch_stub_587):
+	.globl	GL_PREFIX(_dispatch_stub_594)
+	.type	GL_PREFIX(_dispatch_stub_594), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_594))
+GL_PREFIX(_dispatch_stub_594):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4696(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22139,13 +22390,13 @@ GL_PREFIX(_dispatch_stub_587):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4696(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4696(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22155,10 +22406,10 @@ GL_PREFIX(_dispatch_stub_587):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4696(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_587), .-GL_PREFIX(_dispatch_stub_587)
+	.size	GL_PREFIX(_dispatch_stub_594), .-GL_PREFIX(_dispatch_stub_594)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(SecondaryColor3bEXT)
@@ -22166,7 +22417,7 @@ GL_PREFIX(_dispatch_stub_587):
 GL_PREFIX(SecondaryColor3bEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4704(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22176,13 +22427,13 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4704(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4704(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22192,7 +22443,7 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4704(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bEXT), .-GL_PREFIX(SecondaryColor3bEXT)
@@ -22203,25 +22454,25 @@ GL_PREFIX(SecondaryColor3bEXT):
 GL_PREFIX(SecondaryColor3bvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4712(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4712(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4712(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4712(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bvEXT), .-GL_PREFIX(SecondaryColor3bvEXT)
@@ -22232,7 +22483,7 @@ GL_PREFIX(SecondaryColor3bvEXT):
 GL_PREFIX(SecondaryColor3dEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4720(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -22244,13 +22495,13 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4720(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4720(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -22262,7 +22513,7 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4720(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dEXT), .-GL_PREFIX(SecondaryColor3dEXT)
@@ -22273,25 +22524,25 @@ GL_PREFIX(SecondaryColor3dEXT):
 GL_PREFIX(SecondaryColor3dvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4728(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4728(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4728(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4728(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dvEXT), .-GL_PREFIX(SecondaryColor3dvEXT)
@@ -22302,7 +22553,7 @@ GL_PREFIX(SecondaryColor3dvEXT):
 GL_PREFIX(SecondaryColor3fEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4736(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -22314,13 +22565,13 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4736(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4736(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -22332,7 +22583,7 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	4736(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fEXT), .-GL_PREFIX(SecondaryColor3fEXT)
@@ -22343,25 +22594,25 @@ GL_PREFIX(SecondaryColor3fEXT):
 GL_PREFIX(SecondaryColor3fvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4744(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4744(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4744(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4744(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fvEXT), .-GL_PREFIX(SecondaryColor3fvEXT)
@@ -22372,7 +22623,7 @@ GL_PREFIX(SecondaryColor3fvEXT):
 GL_PREFIX(SecondaryColor3iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4752(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22382,13 +22633,13 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4752(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4752(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22398,7 +22649,7 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4752(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3iEXT), .-GL_PREFIX(SecondaryColor3iEXT)
@@ -22409,25 +22660,25 @@ GL_PREFIX(SecondaryColor3iEXT):
 GL_PREFIX(SecondaryColor3ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4760(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4760(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4760(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4760(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ivEXT), .-GL_PREFIX(SecondaryColor3ivEXT)
@@ -22438,7 +22689,7 @@ GL_PREFIX(SecondaryColor3ivEXT):
 GL_PREFIX(SecondaryColor3sEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4768(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22448,13 +22699,13 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4768(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4768(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22464,7 +22715,7 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4768(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3sEXT), .-GL_PREFIX(SecondaryColor3sEXT)
@@ -22475,25 +22726,25 @@ GL_PREFIX(SecondaryColor3sEXT):
 GL_PREFIX(SecondaryColor3svEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4776(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4776(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4776(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4776(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3svEXT), .-GL_PREFIX(SecondaryColor3svEXT)
@@ -22504,7 +22755,7 @@ GL_PREFIX(SecondaryColor3svEXT):
 GL_PREFIX(SecondaryColor3ubEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4784(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22514,13 +22765,13 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4784(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4784(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22530,7 +22781,7 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4784(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubEXT), .-GL_PREFIX(SecondaryColor3ubEXT)
@@ -22541,25 +22792,25 @@ GL_PREFIX(SecondaryColor3ubEXT):
 GL_PREFIX(SecondaryColor3ubvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4792(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4792(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4792(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4792(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubvEXT), .-GL_PREFIX(SecondaryColor3ubvEXT)
@@ -22570,7 +22821,7 @@ GL_PREFIX(SecondaryColor3ubvEXT):
 GL_PREFIX(SecondaryColor3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4800(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22580,13 +22831,13 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4800(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4800(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22596,7 +22847,7 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4800(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uiEXT), .-GL_PREFIX(SecondaryColor3uiEXT)
@@ -22607,25 +22858,25 @@ GL_PREFIX(SecondaryColor3uiEXT):
 GL_PREFIX(SecondaryColor3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4808(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4808(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4808(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4808(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uivEXT), .-GL_PREFIX(SecondaryColor3uivEXT)
@@ -22636,7 +22887,7 @@ GL_PREFIX(SecondaryColor3uivEXT):
 GL_PREFIX(SecondaryColor3usEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4816(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22646,13 +22897,13 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4816(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4816(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22662,7 +22913,7 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4816(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usEXT), .-GL_PREFIX(SecondaryColor3usEXT)
@@ -22673,25 +22924,25 @@ GL_PREFIX(SecondaryColor3usEXT):
 GL_PREFIX(SecondaryColor3usvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4824(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4824(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4824(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4824(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usvEXT), .-GL_PREFIX(SecondaryColor3usvEXT)
@@ -22702,7 +22953,7 @@ GL_PREFIX(SecondaryColor3usvEXT):
 GL_PREFIX(SecondaryColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4832(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22716,13 +22967,13 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4832(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4832(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22736,7 +22987,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4832(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColorPointerEXT), .-GL_PREFIX(SecondaryColorPointerEXT)
@@ -22747,7 +22998,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 GL_PREFIX(MultiDrawArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4840(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22761,13 +23012,13 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4840(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4840(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22781,7 +23032,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4840(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawArraysEXT), .-GL_PREFIX(MultiDrawArraysEXT)
@@ -22792,7 +23043,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 GL_PREFIX(MultiDrawElementsEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4848(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22806,13 +23057,13 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4848(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4848(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22826,7 +23077,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4848(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawElementsEXT), .-GL_PREFIX(MultiDrawElementsEXT)
@@ -22837,7 +23088,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 GL_PREFIX(FogCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4856(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22847,13 +23098,13 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4856(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22863,7 +23114,7 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordPointerEXT), .-GL_PREFIX(FogCoordPointerEXT)
@@ -22874,7 +23125,7 @@ GL_PREFIX(FogCoordPointerEXT):
 GL_PREFIX(FogCoorddEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4864(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -22882,13 +23133,13 @@ GL_PREFIX(FogCoorddEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4864(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4864(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -22896,7 +23147,7 @@ GL_PREFIX(FogCoorddEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4864(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddEXT), .-GL_PREFIX(FogCoorddEXT)
@@ -22907,25 +23158,25 @@ GL_PREFIX(FogCoorddEXT):
 GL_PREFIX(FogCoorddvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4872(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4872(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddvEXT), .-GL_PREFIX(FogCoorddvEXT)
@@ -22936,7 +23187,7 @@ GL_PREFIX(FogCoorddvEXT):
 GL_PREFIX(FogCoordfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4880(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -22944,13 +23195,13 @@ GL_PREFIX(FogCoordfEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4880(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4880(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -22958,7 +23209,7 @@ GL_PREFIX(FogCoordfEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	4880(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfEXT), .-GL_PREFIX(FogCoordfEXT)
@@ -22969,58 +23220,58 @@ GL_PREFIX(FogCoordfEXT):
 GL_PREFIX(FogCoordfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4888(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4888(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfvEXT), .-GL_PREFIX(FogCoordfvEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_612)
-	.type	GL_PREFIX(_dispatch_stub_612), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_612))
-GL_PREFIX(_dispatch_stub_612):
+	.globl	GL_PREFIX(_dispatch_stub_619)
+	.type	GL_PREFIX(_dispatch_stub_619), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_619))
+GL_PREFIX(_dispatch_stub_619):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4896(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4896(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4896(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4896(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_612), .-GL_PREFIX(_dispatch_stub_612)
+	.size	GL_PREFIX(_dispatch_stub_619), .-GL_PREFIX(_dispatch_stub_619)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BlendFuncSeparateEXT)
@@ -23028,7 +23279,7 @@ GL_PREFIX(_dispatch_stub_612):
 GL_PREFIX(BlendFuncSeparateEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4904(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23042,13 +23293,13 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4904(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4904(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23062,7 +23313,7 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4904(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BlendFuncSeparateEXT), .-GL_PREFIX(BlendFuncSeparateEXT)
@@ -23073,25 +23324,25 @@ GL_PREFIX(BlendFuncSeparateEXT):
 GL_PREFIX(FlushVertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4912(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4912(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4912(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4912(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FlushVertexArrayRangeNV), .-GL_PREFIX(FlushVertexArrayRangeNV)
@@ -23102,7 +23353,7 @@ GL_PREFIX(FlushVertexArrayRangeNV):
 GL_PREFIX(VertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4920(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23112,13 +23363,13 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4920(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23128,7 +23379,7 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexArrayRangeNV), .-GL_PREFIX(VertexArrayRangeNV)
@@ -23139,7 +23390,7 @@ GL_PREFIX(VertexArrayRangeNV):
 GL_PREFIX(CombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4928(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23157,13 +23408,13 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4928(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23181,7 +23432,7 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerInputNV), .-GL_PREFIX(CombinerInputNV)
@@ -23192,7 +23443,7 @@ GL_PREFIX(CombinerInputNV):
 GL_PREFIX(CombinerOutputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4936(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23210,13 +23461,13 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4936(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23234,7 +23485,7 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerOutputNV), .-GL_PREFIX(CombinerOutputNV)
@@ -23245,7 +23496,7 @@ GL_PREFIX(CombinerOutputNV):
 GL_PREFIX(CombinerParameterfNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4944(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23255,13 +23506,13 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4944(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4944(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23271,7 +23522,7 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4944(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfNV), .-GL_PREFIX(CombinerParameterfNV)
@@ -23282,7 +23533,7 @@ GL_PREFIX(CombinerParameterfNV):
 GL_PREFIX(CombinerParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4952(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23292,13 +23543,13 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4952(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23308,7 +23559,7 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfvNV), .-GL_PREFIX(CombinerParameterfvNV)
@@ -23319,7 +23570,7 @@ GL_PREFIX(CombinerParameterfvNV):
 GL_PREFIX(CombinerParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4960(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23329,13 +23580,13 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4960(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23345,7 +23596,7 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameteriNV), .-GL_PREFIX(CombinerParameteriNV)
@@ -23356,7 +23607,7 @@ GL_PREFIX(CombinerParameteriNV):
 GL_PREFIX(CombinerParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4968(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23366,13 +23617,13 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4968(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23382,7 +23633,7 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterivNV), .-GL_PREFIX(CombinerParameterivNV)
@@ -23393,7 +23644,7 @@ GL_PREFIX(CombinerParameterivNV):
 GL_PREFIX(FinalCombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4976(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23407,13 +23658,13 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4976(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23427,7 +23678,7 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FinalCombinerInputNV), .-GL_PREFIX(FinalCombinerInputNV)
@@ -23438,7 +23689,7 @@ GL_PREFIX(FinalCombinerInputNV):
 GL_PREFIX(GetCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4984(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23452,13 +23703,13 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4984(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23472,7 +23723,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterfvNV), .-GL_PREFIX(GetCombinerInputParameterfvNV)
@@ -23483,7 +23734,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 GL_PREFIX(GetCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4992(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23497,13 +23748,13 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4992(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4992(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23517,7 +23768,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4992(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterivNV), .-GL_PREFIX(GetCombinerInputParameterivNV)
@@ -23528,7 +23779,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 GL_PREFIX(GetCombinerOutputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5000(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23542,13 +23793,13 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5000(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5000(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23562,7 +23813,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5000(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterfvNV), .-GL_PREFIX(GetCombinerOutputParameterfvNV)
@@ -23573,7 +23824,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 GL_PREFIX(GetCombinerOutputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5008(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23587,13 +23838,13 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5008(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5008(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23607,7 +23858,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5008(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterivNV), .-GL_PREFIX(GetCombinerOutputParameterivNV)
@@ -23618,7 +23869,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5016(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23628,13 +23879,13 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5016(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5016(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23644,7 +23895,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5016(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterfvNV), .-GL_PREFIX(GetFinalCombinerInputParameterfvNV)
@@ -23655,7 +23906,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 GL_PREFIX(GetFinalCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5024(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23665,13 +23916,13 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5024(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5024(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23681,7 +23932,7 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5024(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterivNV), .-GL_PREFIX(GetFinalCombinerInputParameterivNV)
@@ -23692,25 +23943,25 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 GL_PREFIX(ResizeBuffersMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5032(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5032(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5032(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5032(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ResizeBuffersMESA), .-GL_PREFIX(ResizeBuffersMESA)
@@ -23721,7 +23972,7 @@ GL_PREFIX(ResizeBuffersMESA):
 GL_PREFIX(WindowPos2dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5040(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23731,13 +23982,13 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5040(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5040(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23747,7 +23998,7 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5040(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dMESA), .-GL_PREFIX(WindowPos2dMESA)
@@ -23758,25 +24009,25 @@ GL_PREFIX(WindowPos2dMESA):
 GL_PREFIX(WindowPos2dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5048(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5048(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dvMESA), .-GL_PREFIX(WindowPos2dvMESA)
@@ -23787,7 +24038,7 @@ GL_PREFIX(WindowPos2dvMESA):
 GL_PREFIX(WindowPos2fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5056(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23797,13 +24048,13 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5056(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5056(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23813,7 +24064,7 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5056(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fMESA), .-GL_PREFIX(WindowPos2fMESA)
@@ -23824,25 +24075,25 @@ GL_PREFIX(WindowPos2fMESA):
 GL_PREFIX(WindowPos2fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5064(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5064(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5064(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5064(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fvMESA), .-GL_PREFIX(WindowPos2fvMESA)
@@ -23853,7 +24104,7 @@ GL_PREFIX(WindowPos2fvMESA):
 GL_PREFIX(WindowPos2iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5072(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23863,13 +24114,13 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5072(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5072(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23879,7 +24130,7 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5072(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2iMESA), .-GL_PREFIX(WindowPos2iMESA)
@@ -23890,25 +24141,25 @@ GL_PREFIX(WindowPos2iMESA):
 GL_PREFIX(WindowPos2ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5080(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5080(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5080(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5080(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2ivMESA), .-GL_PREFIX(WindowPos2ivMESA)
@@ -23919,7 +24170,7 @@ GL_PREFIX(WindowPos2ivMESA):
 GL_PREFIX(WindowPos2sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5088(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23929,13 +24180,13 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5088(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5088(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23945,7 +24196,7 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5088(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2sMESA), .-GL_PREFIX(WindowPos2sMESA)
@@ -23956,25 +24207,25 @@ GL_PREFIX(WindowPos2sMESA):
 GL_PREFIX(WindowPos2svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5096(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5096(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2svMESA), .-GL_PREFIX(WindowPos2svMESA)
@@ -23985,7 +24236,7 @@ GL_PREFIX(WindowPos2svMESA):
 GL_PREFIX(WindowPos3dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5104(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23997,13 +24248,13 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5104(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5104(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -24015,7 +24266,7 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5104(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dMESA), .-GL_PREFIX(WindowPos3dMESA)
@@ -24026,25 +24277,25 @@ GL_PREFIX(WindowPos3dMESA):
 GL_PREFIX(WindowPos3dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5112(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5112(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dvMESA), .-GL_PREFIX(WindowPos3dvMESA)
@@ -24055,7 +24306,7 @@ GL_PREFIX(WindowPos3dvMESA):
 GL_PREFIX(WindowPos3fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5120(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -24067,13 +24318,13 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5120(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5120(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -24085,7 +24336,7 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5120(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fMESA), .-GL_PREFIX(WindowPos3fMESA)
@@ -24096,25 +24347,25 @@ GL_PREFIX(WindowPos3fMESA):
 GL_PREFIX(WindowPos3fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5128(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5128(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fvMESA), .-GL_PREFIX(WindowPos3fvMESA)
@@ -24125,7 +24376,7 @@ GL_PREFIX(WindowPos3fvMESA):
 GL_PREFIX(WindowPos3iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5136(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24135,13 +24386,13 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5136(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5136(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24151,7 +24402,7 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5136(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3iMESA), .-GL_PREFIX(WindowPos3iMESA)
@@ -24162,25 +24413,25 @@ GL_PREFIX(WindowPos3iMESA):
 GL_PREFIX(WindowPos3ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5144(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5144(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3ivMESA), .-GL_PREFIX(WindowPos3ivMESA)
@@ -24191,7 +24442,7 @@ GL_PREFIX(WindowPos3ivMESA):
 GL_PREFIX(WindowPos3sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5152(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24201,13 +24452,13 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5152(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5152(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24217,7 +24468,7 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5152(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3sMESA), .-GL_PREFIX(WindowPos3sMESA)
@@ -24228,25 +24479,25 @@ GL_PREFIX(WindowPos3sMESA):
 GL_PREFIX(WindowPos3svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5160(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5160(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3svMESA), .-GL_PREFIX(WindowPos3svMESA)
@@ -24257,7 +24508,7 @@ GL_PREFIX(WindowPos3svMESA):
 GL_PREFIX(WindowPos4dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5168(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -24271,13 +24522,13 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5168(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5168(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -24291,7 +24542,7 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5168(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dMESA), .-GL_PREFIX(WindowPos4dMESA)
@@ -24302,25 +24553,25 @@ GL_PREFIX(WindowPos4dMESA):
 GL_PREFIX(WindowPos4dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5176(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5176(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dvMESA), .-GL_PREFIX(WindowPos4dvMESA)
@@ -24331,7 +24582,7 @@ GL_PREFIX(WindowPos4dvMESA):
 GL_PREFIX(WindowPos4fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5184(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -24345,13 +24596,13 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5184(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5184(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -24365,7 +24616,7 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	5184(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fMESA), .-GL_PREFIX(WindowPos4fMESA)
@@ -24376,25 +24627,25 @@ GL_PREFIX(WindowPos4fMESA):
 GL_PREFIX(WindowPos4fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5192(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5192(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5192(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5192(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fvMESA), .-GL_PREFIX(WindowPos4fvMESA)
@@ -24405,7 +24656,7 @@ GL_PREFIX(WindowPos4fvMESA):
 GL_PREFIX(WindowPos4iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5200(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24419,13 +24670,13 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5200(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5200(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24439,7 +24690,7 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5200(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4iMESA), .-GL_PREFIX(WindowPos4iMESA)
@@ -24450,25 +24701,25 @@ GL_PREFIX(WindowPos4iMESA):
 GL_PREFIX(WindowPos4ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5208(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5208(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5208(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5208(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4ivMESA), .-GL_PREFIX(WindowPos4ivMESA)
@@ -24479,7 +24730,7 @@ GL_PREFIX(WindowPos4ivMESA):
 GL_PREFIX(WindowPos4sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5216(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24493,13 +24744,13 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5216(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5216(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24513,7 +24764,7 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5216(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4sMESA), .-GL_PREFIX(WindowPos4sMESA)
@@ -24524,37 +24775,37 @@ GL_PREFIX(WindowPos4sMESA):
 GL_PREFIX(WindowPos4svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5224(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5224(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5224(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5224(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4svMESA), .-GL_PREFIX(WindowPos4svMESA)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_654)
-	.type	GL_PREFIX(_dispatch_stub_654), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_654))
-GL_PREFIX(_dispatch_stub_654):
+	.globl	GL_PREFIX(_dispatch_stub_661)
+	.type	GL_PREFIX(_dispatch_stub_661), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_661))
+GL_PREFIX(_dispatch_stub_661):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5232(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24568,13 +24819,13 @@ GL_PREFIX(_dispatch_stub_654):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5232(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5232(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24588,19 +24839,19 @@ GL_PREFIX(_dispatch_stub_654):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5232(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_654), .-GL_PREFIX(_dispatch_stub_654)
+	.size	GL_PREFIX(_dispatch_stub_661), .-GL_PREFIX(_dispatch_stub_661)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_655)
-	.type	GL_PREFIX(_dispatch_stub_655), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_655))
-GL_PREFIX(_dispatch_stub_655):
+	.globl	GL_PREFIX(_dispatch_stub_662)
+	.type	GL_PREFIX(_dispatch_stub_662), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_662))
+GL_PREFIX(_dispatch_stub_662):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5240(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24618,13 +24869,13 @@ GL_PREFIX(_dispatch_stub_655):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5240(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5240(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24642,19 +24893,19 @@ GL_PREFIX(_dispatch_stub_655):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5240(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_655), .-GL_PREFIX(_dispatch_stub_655)
+	.size	GL_PREFIX(_dispatch_stub_662), .-GL_PREFIX(_dispatch_stub_662)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_656)
-	.type	GL_PREFIX(_dispatch_stub_656), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_656))
-GL_PREFIX(_dispatch_stub_656):
+	.globl	GL_PREFIX(_dispatch_stub_663)
+	.type	GL_PREFIX(_dispatch_stub_663), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_663))
+GL_PREFIX(_dispatch_stub_663):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5248(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24664,13 +24915,13 @@ GL_PREFIX(_dispatch_stub_656):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5248(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24680,49 +24931,49 @@ GL_PREFIX(_dispatch_stub_656):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_656), .-GL_PREFIX(_dispatch_stub_656)
+	.size	GL_PREFIX(_dispatch_stub_663), .-GL_PREFIX(_dispatch_stub_663)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_657)
-	.type	GL_PREFIX(_dispatch_stub_657), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_657))
-GL_PREFIX(_dispatch_stub_657):
+	.globl	GL_PREFIX(_dispatch_stub_664)
+	.type	GL_PREFIX(_dispatch_stub_664), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_664))
+GL_PREFIX(_dispatch_stub_664):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5256(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5256(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_657), .-GL_PREFIX(_dispatch_stub_657)
+	.size	GL_PREFIX(_dispatch_stub_664), .-GL_PREFIX(_dispatch_stub_664)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_658)
-	.type	GL_PREFIX(_dispatch_stub_658), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_658))
-GL_PREFIX(_dispatch_stub_658):
+	.globl	GL_PREFIX(_dispatch_stub_665)
+	.type	GL_PREFIX(_dispatch_stub_665), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_665))
+GL_PREFIX(_dispatch_stub_665):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5264(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24732,13 +24983,13 @@ GL_PREFIX(_dispatch_stub_658):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5264(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24748,19 +24999,19 @@ GL_PREFIX(_dispatch_stub_658):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_658), .-GL_PREFIX(_dispatch_stub_658)
+	.size	GL_PREFIX(_dispatch_stub_665), .-GL_PREFIX(_dispatch_stub_665)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_659)
-	.type	GL_PREFIX(_dispatch_stub_659), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_659))
-GL_PREFIX(_dispatch_stub_659):
+	.globl	GL_PREFIX(_dispatch_stub_666)
+	.type	GL_PREFIX(_dispatch_stub_666), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_666))
+GL_PREFIX(_dispatch_stub_666):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5272(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24770,13 +25021,13 @@ GL_PREFIX(_dispatch_stub_659):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5272(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24786,49 +25037,49 @@ GL_PREFIX(_dispatch_stub_659):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_659), .-GL_PREFIX(_dispatch_stub_659)
+	.size	GL_PREFIX(_dispatch_stub_666), .-GL_PREFIX(_dispatch_stub_666)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_660)
-	.type	GL_PREFIX(_dispatch_stub_660), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_660))
-GL_PREFIX(_dispatch_stub_660):
+	.globl	GL_PREFIX(_dispatch_stub_667)
+	.type	GL_PREFIX(_dispatch_stub_667), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_667))
+GL_PREFIX(_dispatch_stub_667):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5280(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5280(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5280(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_660), .-GL_PREFIX(_dispatch_stub_660)
+	.size	GL_PREFIX(_dispatch_stub_667), .-GL_PREFIX(_dispatch_stub_667)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_661)
-	.type	GL_PREFIX(_dispatch_stub_661), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_661))
-GL_PREFIX(_dispatch_stub_661):
+	.globl	GL_PREFIX(_dispatch_stub_668)
+	.type	GL_PREFIX(_dispatch_stub_668), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_668))
+GL_PREFIX(_dispatch_stub_668):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5288(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24838,13 +25089,13 @@ GL_PREFIX(_dispatch_stub_661):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5288(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5288(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24854,40 +25105,40 @@ GL_PREFIX(_dispatch_stub_661):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5288(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_661), .-GL_PREFIX(_dispatch_stub_661)
+	.size	GL_PREFIX(_dispatch_stub_668), .-GL_PREFIX(_dispatch_stub_668)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_662)
-	.type	GL_PREFIX(_dispatch_stub_662), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_662))
-GL_PREFIX(_dispatch_stub_662):
+	.globl	GL_PREFIX(_dispatch_stub_669)
+	.type	GL_PREFIX(_dispatch_stub_669), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_669))
+GL_PREFIX(_dispatch_stub_669):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5296(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5296(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_662), .-GL_PREFIX(_dispatch_stub_662)
+	.size	GL_PREFIX(_dispatch_stub_669), .-GL_PREFIX(_dispatch_stub_669)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(AreProgramsResidentNV)
@@ -24895,7 +25146,7 @@ GL_PREFIX(_dispatch_stub_662):
 GL_PREFIX(AreProgramsResidentNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5304(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24905,13 +25156,13 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5304(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24921,7 +25172,7 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AreProgramsResidentNV), .-GL_PREFIX(AreProgramsResidentNV)
@@ -24932,7 +25183,7 @@ GL_PREFIX(AreProgramsResidentNV):
 GL_PREFIX(BindProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5312(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24942,13 +25193,13 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5312(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24958,7 +25209,7 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindProgramNV), .-GL_PREFIX(BindProgramNV)
@@ -24969,7 +25220,7 @@ GL_PREFIX(BindProgramNV):
 GL_PREFIX(DeleteProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5320(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24979,13 +25230,13 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5320(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24995,7 +25246,7 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5320(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteProgramsNV), .-GL_PREFIX(DeleteProgramsNV)
@@ -25006,7 +25257,7 @@ GL_PREFIX(DeleteProgramsNV):
 GL_PREFIX(ExecuteProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5328(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25016,13 +25267,13 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5328(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25032,7 +25283,7 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ExecuteProgramNV), .-GL_PREFIX(ExecuteProgramNV)
@@ -25043,7 +25294,7 @@ GL_PREFIX(ExecuteProgramNV):
 GL_PREFIX(GenProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5336(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25053,13 +25304,13 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5336(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25069,7 +25320,7 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenProgramsNV), .-GL_PREFIX(GenProgramsNV)
@@ -25080,7 +25331,7 @@ GL_PREFIX(GenProgramsNV):
 GL_PREFIX(GetProgramParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5344(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25094,13 +25345,13 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5344(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25114,7 +25365,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterdvNV), .-GL_PREFIX(GetProgramParameterdvNV)
@@ -25125,7 +25376,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 GL_PREFIX(GetProgramParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5352(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25139,13 +25390,13 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5352(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25159,7 +25410,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterfvNV), .-GL_PREFIX(GetProgramParameterfvNV)
@@ -25170,7 +25421,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 GL_PREFIX(GetProgramStringNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5360(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25180,13 +25431,13 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5360(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25196,7 +25447,7 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramStringNV), .-GL_PREFIX(GetProgramStringNV)
@@ -25207,7 +25458,7 @@ GL_PREFIX(GetProgramStringNV):
 GL_PREFIX(GetProgramivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5368(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25217,13 +25468,13 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5368(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25233,7 +25484,7 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramivNV), .-GL_PREFIX(GetProgramivNV)
@@ -25244,7 +25495,7 @@ GL_PREFIX(GetProgramivNV):
 GL_PREFIX(GetTrackMatrixivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5376(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25258,13 +25509,13 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5376(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25278,7 +25529,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTrackMatrixivNV), .-GL_PREFIX(GetTrackMatrixivNV)
@@ -25289,7 +25540,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 GL_PREFIX(GetVertexAttribPointervNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5384(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25299,13 +25550,13 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5384(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25315,7 +25566,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribPointervNV), .-GL_PREFIX(GetVertexAttribPointervNV)
@@ -25326,7 +25577,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 GL_PREFIX(GetVertexAttribdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5392(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25336,13 +25587,13 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5392(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25352,7 +25603,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribdvNV), .-GL_PREFIX(GetVertexAttribdvNV)
@@ -25363,7 +25614,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 GL_PREFIX(GetVertexAttribfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5400(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25373,13 +25624,13 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5400(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25389,7 +25640,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribfvNV), .-GL_PREFIX(GetVertexAttribfvNV)
@@ -25400,7 +25651,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 GL_PREFIX(GetVertexAttribivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5408(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25410,13 +25661,13 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5408(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25426,7 +25677,7 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribivNV), .-GL_PREFIX(GetVertexAttribivNV)
@@ -25437,25 +25688,25 @@ GL_PREFIX(GetVertexAttribivNV):
 GL_PREFIX(IsProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5416(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5416(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsProgramNV), .-GL_PREFIX(IsProgramNV)
@@ -25466,7 +25717,7 @@ GL_PREFIX(IsProgramNV):
 GL_PREFIX(LoadProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5424(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25480,13 +25731,13 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5424(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25500,7 +25751,7 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LoadProgramNV), .-GL_PREFIX(LoadProgramNV)
@@ -25511,7 +25762,7 @@ GL_PREFIX(LoadProgramNV):
 GL_PREFIX(ProgramParameters4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5432(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25525,13 +25776,13 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5432(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25545,7 +25796,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4dvNV), .-GL_PREFIX(ProgramParameters4dvNV)
@@ -25556,7 +25807,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 GL_PREFIX(ProgramParameters4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5440(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25570,13 +25821,13 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5440(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25590,7 +25841,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4fvNV), .-GL_PREFIX(ProgramParameters4fvNV)
@@ -25601,7 +25852,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 GL_PREFIX(RequestResidentProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5448(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25611,13 +25862,13 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5448(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5448(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25627,7 +25878,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5448(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RequestResidentProgramsNV), .-GL_PREFIX(RequestResidentProgramsNV)
@@ -25638,7 +25889,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 GL_PREFIX(TrackMatrixNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5456(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25652,13 +25903,13 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5456(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25672,7 +25923,7 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TrackMatrixNV), .-GL_PREFIX(TrackMatrixNV)
@@ -25683,7 +25934,7 @@ GL_PREFIX(TrackMatrixNV):
 GL_PREFIX(VertexAttrib1dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5464(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25693,13 +25944,13 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5464(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5464(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25709,7 +25960,7 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5464(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dNV), .-GL_PREFIX(VertexAttrib1dNV)
@@ -25720,7 +25971,7 @@ GL_PREFIX(VertexAttrib1dNV):
 GL_PREFIX(VertexAttrib1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5472(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25730,13 +25981,13 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5472(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25746,7 +25997,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dvNV), .-GL_PREFIX(VertexAttrib1dvNV)
@@ -25757,7 +26008,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 GL_PREFIX(VertexAttrib1fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5480(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25767,13 +26018,13 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5480(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5480(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25783,7 +26034,7 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5480(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fNV), .-GL_PREFIX(VertexAttrib1fNV)
@@ -25794,7 +26045,7 @@ GL_PREFIX(VertexAttrib1fNV):
 GL_PREFIX(VertexAttrib1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5488(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25804,13 +26055,13 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5488(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25820,7 +26071,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fvNV), .-GL_PREFIX(VertexAttrib1fvNV)
@@ -25831,7 +26082,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 GL_PREFIX(VertexAttrib1sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5496(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25841,13 +26092,13 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5496(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25857,7 +26108,7 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1sNV), .-GL_PREFIX(VertexAttrib1sNV)
@@ -25868,7 +26119,7 @@ GL_PREFIX(VertexAttrib1sNV):
 GL_PREFIX(VertexAttrib1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5504(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25878,13 +26129,13 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5504(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25894,7 +26145,7 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1svNV), .-GL_PREFIX(VertexAttrib1svNV)
@@ -25905,7 +26156,7 @@ GL_PREFIX(VertexAttrib1svNV):
 GL_PREFIX(VertexAttrib2dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5512(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25917,13 +26168,13 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5512(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5512(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -25935,7 +26186,7 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5512(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dNV), .-GL_PREFIX(VertexAttrib2dNV)
@@ -25946,7 +26197,7 @@ GL_PREFIX(VertexAttrib2dNV):
 GL_PREFIX(VertexAttrib2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5520(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25956,13 +26207,13 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5520(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25972,7 +26223,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dvNV), .-GL_PREFIX(VertexAttrib2dvNV)
@@ -25983,7 +26234,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 GL_PREFIX(VertexAttrib2fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5528(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -25995,13 +26246,13 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5528(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5528(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -26013,7 +26264,7 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5528(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fNV), .-GL_PREFIX(VertexAttrib2fNV)
@@ -26024,7 +26275,7 @@ GL_PREFIX(VertexAttrib2fNV):
 GL_PREFIX(VertexAttrib2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5536(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26034,13 +26285,13 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5536(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26050,7 +26301,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fvNV), .-GL_PREFIX(VertexAttrib2fvNV)
@@ -26061,7 +26312,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 GL_PREFIX(VertexAttrib2sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5544(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26071,13 +26322,13 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5544(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26087,7 +26338,7 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2sNV), .-GL_PREFIX(VertexAttrib2sNV)
@@ -26098,7 +26349,7 @@ GL_PREFIX(VertexAttrib2sNV):
 GL_PREFIX(VertexAttrib2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5552(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26108,13 +26359,13 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5552(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26124,7 +26375,7 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2svNV), .-GL_PREFIX(VertexAttrib2svNV)
@@ -26135,7 +26386,7 @@ GL_PREFIX(VertexAttrib2svNV):
 GL_PREFIX(VertexAttrib3dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5560(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26149,13 +26400,13 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5560(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5560(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26169,7 +26420,7 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5560(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dNV), .-GL_PREFIX(VertexAttrib3dNV)
@@ -26180,7 +26431,7 @@ GL_PREFIX(VertexAttrib3dNV):
 GL_PREFIX(VertexAttrib3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5568(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26190,13 +26441,13 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5568(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26206,7 +26457,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dvNV), .-GL_PREFIX(VertexAttrib3dvNV)
@@ -26217,7 +26468,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 GL_PREFIX(VertexAttrib3fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5576(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26231,13 +26482,13 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5576(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5576(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26251,7 +26502,7 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5576(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fNV), .-GL_PREFIX(VertexAttrib3fNV)
@@ -26262,7 +26513,7 @@ GL_PREFIX(VertexAttrib3fNV):
 GL_PREFIX(VertexAttrib3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5584(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26272,13 +26523,13 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5584(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5584(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26288,7 +26539,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5584(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fvNV), .-GL_PREFIX(VertexAttrib3fvNV)
@@ -26299,7 +26550,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 GL_PREFIX(VertexAttrib3sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5592(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26313,13 +26564,13 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5592(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5592(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26333,7 +26584,7 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5592(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3sNV), .-GL_PREFIX(VertexAttrib3sNV)
@@ -26344,7 +26595,7 @@ GL_PREFIX(VertexAttrib3sNV):
 GL_PREFIX(VertexAttrib3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5600(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26354,13 +26605,13 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5600(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26370,7 +26621,7 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3svNV), .-GL_PREFIX(VertexAttrib3svNV)
@@ -26381,7 +26632,7 @@ GL_PREFIX(VertexAttrib3svNV):
 GL_PREFIX(VertexAttrib4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5608(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26397,13 +26648,13 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5608(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5608(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26419,7 +26670,7 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5608(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dNV), .-GL_PREFIX(VertexAttrib4dNV)
@@ -26430,7 +26681,7 @@ GL_PREFIX(VertexAttrib4dNV):
 GL_PREFIX(VertexAttrib4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5616(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26440,13 +26691,13 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5616(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26456,7 +26707,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dvNV), .-GL_PREFIX(VertexAttrib4dvNV)
@@ -26467,7 +26718,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 GL_PREFIX(VertexAttrib4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5624(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -26483,13 +26734,13 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5624(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5624(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -26505,7 +26756,7 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	5624(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fNV), .-GL_PREFIX(VertexAttrib4fNV)
@@ -26516,7 +26767,7 @@ GL_PREFIX(VertexAttrib4fNV):
 GL_PREFIX(VertexAttrib4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5632(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26526,13 +26777,13 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5632(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26542,7 +26793,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fvNV), .-GL_PREFIX(VertexAttrib4fvNV)
@@ -26553,7 +26804,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 GL_PREFIX(VertexAttrib4sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5640(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26567,13 +26818,13 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5640(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26587,7 +26838,7 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4sNV), .-GL_PREFIX(VertexAttrib4sNV)
@@ -26598,7 +26849,7 @@ GL_PREFIX(VertexAttrib4sNV):
 GL_PREFIX(VertexAttrib4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5648(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26608,13 +26859,13 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5648(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26624,7 +26875,7 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4svNV), .-GL_PREFIX(VertexAttrib4svNV)
@@ -26635,7 +26886,7 @@ GL_PREFIX(VertexAttrib4svNV):
 GL_PREFIX(VertexAttrib4ubNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5656(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26649,13 +26900,13 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5656(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26669,7 +26920,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubNV), .-GL_PREFIX(VertexAttrib4ubNV)
@@ -26680,7 +26931,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 GL_PREFIX(VertexAttrib4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5664(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26690,13 +26941,13 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5664(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26706,7 +26957,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubvNV), .-GL_PREFIX(VertexAttrib4ubvNV)
@@ -26717,7 +26968,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 GL_PREFIX(VertexAttribPointerNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5672(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26731,13 +26982,13 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5672(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26751,7 +27002,7 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribPointerNV), .-GL_PREFIX(VertexAttribPointerNV)
@@ -26762,7 +27013,7 @@ GL_PREFIX(VertexAttribPointerNV):
 GL_PREFIX(VertexAttribs1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5680(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26772,13 +27023,13 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5680(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26788,7 +27039,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1dvNV), .-GL_PREFIX(VertexAttribs1dvNV)
@@ -26799,7 +27050,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 GL_PREFIX(VertexAttribs1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5688(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26809,13 +27060,13 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5688(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26825,7 +27076,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1fvNV), .-GL_PREFIX(VertexAttribs1fvNV)
@@ -26836,7 +27087,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 GL_PREFIX(VertexAttribs1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5696(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26846,13 +27097,13 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5696(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26862,7 +27113,7 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5696(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1svNV), .-GL_PREFIX(VertexAttribs1svNV)
@@ -26873,7 +27124,7 @@ GL_PREFIX(VertexAttribs1svNV):
 GL_PREFIX(VertexAttribs2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5704(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26883,13 +27134,13 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5704(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26899,7 +27150,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2dvNV), .-GL_PREFIX(VertexAttribs2dvNV)
@@ -26910,7 +27161,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 GL_PREFIX(VertexAttribs2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5712(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26920,13 +27171,13 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5712(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26936,7 +27187,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2fvNV), .-GL_PREFIX(VertexAttribs2fvNV)
@@ -26947,7 +27198,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 GL_PREFIX(VertexAttribs2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5720(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26957,13 +27208,13 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5720(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26973,7 +27224,7 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2svNV), .-GL_PREFIX(VertexAttribs2svNV)
@@ -26984,7 +27235,7 @@ GL_PREFIX(VertexAttribs2svNV):
 GL_PREFIX(VertexAttribs3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5728(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26994,13 +27245,13 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5728(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27010,7 +27261,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3dvNV), .-GL_PREFIX(VertexAttribs3dvNV)
@@ -27021,7 +27272,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 GL_PREFIX(VertexAttribs3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5736(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27031,13 +27282,13 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5736(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27047,7 +27298,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3fvNV), .-GL_PREFIX(VertexAttribs3fvNV)
@@ -27058,7 +27309,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 GL_PREFIX(VertexAttribs3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5744(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27068,13 +27319,13 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5744(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27084,7 +27335,7 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3svNV), .-GL_PREFIX(VertexAttribs3svNV)
@@ -27095,7 +27346,7 @@ GL_PREFIX(VertexAttribs3svNV):
 GL_PREFIX(VertexAttribs4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5752(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27105,13 +27356,13 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5752(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27121,7 +27372,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4dvNV), .-GL_PREFIX(VertexAttribs4dvNV)
@@ -27132,7 +27383,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 GL_PREFIX(VertexAttribs4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5760(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27142,13 +27393,13 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5760(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27158,7 +27409,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4fvNV), .-GL_PREFIX(VertexAttribs4fvNV)
@@ -27169,7 +27420,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 GL_PREFIX(VertexAttribs4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5768(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27179,13 +27430,13 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5768(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27195,7 +27446,7 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4svNV), .-GL_PREFIX(VertexAttribs4svNV)
@@ -27206,7 +27457,7 @@ GL_PREFIX(VertexAttribs4svNV):
 GL_PREFIX(VertexAttribs4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5776(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27216,13 +27467,13 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5776(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27232,7 +27483,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4ubvNV), .-GL_PREFIX(VertexAttribs4ubvNV)
@@ -27243,7 +27494,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 GL_PREFIX(GetTexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5784(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27253,13 +27504,13 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5784(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27269,7 +27520,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterfvATI), .-GL_PREFIX(GetTexBumpParameterfvATI)
@@ -27280,7 +27531,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 GL_PREFIX(GetTexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5792(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27290,13 +27541,13 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5792(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27306,7 +27557,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterivATI), .-GL_PREFIX(GetTexBumpParameterivATI)
@@ -27317,7 +27568,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 GL_PREFIX(TexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5800(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27327,13 +27578,13 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5800(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27343,7 +27594,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterfvATI), .-GL_PREFIX(TexBumpParameterfvATI)
@@ -27354,7 +27605,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 GL_PREFIX(TexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5808(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27364,13 +27615,13 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5808(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27380,7 +27631,7 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterivATI), .-GL_PREFIX(TexBumpParameterivATI)
@@ -27391,7 +27642,7 @@ GL_PREFIX(TexBumpParameterivATI):
 GL_PREFIX(AlphaFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5816(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27409,13 +27660,13 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5816(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27433,7 +27684,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp1ATI), .-GL_PREFIX(AlphaFragmentOp1ATI)
@@ -27444,7 +27695,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 GL_PREFIX(AlphaFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5824(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27462,13 +27713,13 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5824(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27486,7 +27737,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp2ATI), .-GL_PREFIX(AlphaFragmentOp2ATI)
@@ -27497,7 +27748,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 GL_PREFIX(AlphaFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5832(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27515,13 +27766,13 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5832(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27539,7 +27790,7 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp3ATI), .-GL_PREFIX(AlphaFragmentOp3ATI)
@@ -27550,25 +27801,25 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 GL_PREFIX(BeginFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5840(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5840(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5840(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5840(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginFragmentShaderATI), .-GL_PREFIX(BeginFragmentShaderATI)
@@ -27579,25 +27830,25 @@ GL_PREFIX(BeginFragmentShaderATI):
 GL_PREFIX(BindFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5848(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5848(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragmentShaderATI), .-GL_PREFIX(BindFragmentShaderATI)
@@ -27608,7 +27859,7 @@ GL_PREFIX(BindFragmentShaderATI):
 GL_PREFIX(ColorFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5856(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27626,13 +27877,13 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5856(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5856(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27650,7 +27901,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5856(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp1ATI), .-GL_PREFIX(ColorFragmentOp1ATI)
@@ -27661,7 +27912,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 GL_PREFIX(ColorFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5864(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27679,13 +27930,13 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5864(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27703,7 +27954,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp2ATI), .-GL_PREFIX(ColorFragmentOp2ATI)
@@ -27714,7 +27965,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 GL_PREFIX(ColorFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5872(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27732,13 +27983,13 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5872(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5872(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27756,7 +28007,7 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5872(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp3ATI), .-GL_PREFIX(ColorFragmentOp3ATI)
@@ -27767,25 +28018,25 @@ GL_PREFIX(ColorFragmentOp3ATI):
 GL_PREFIX(DeleteFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5880(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5880(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFragmentShaderATI), .-GL_PREFIX(DeleteFragmentShaderATI)
@@ -27796,25 +28047,25 @@ GL_PREFIX(DeleteFragmentShaderATI):
 GL_PREFIX(EndFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5888(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5888(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5888(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5888(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndFragmentShaderATI), .-GL_PREFIX(EndFragmentShaderATI)
@@ -27825,25 +28076,25 @@ GL_PREFIX(EndFragmentShaderATI):
 GL_PREFIX(GenFragmentShadersATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5896(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5896(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFragmentShadersATI), .-GL_PREFIX(GenFragmentShadersATI)
@@ -27854,7 +28105,7 @@ GL_PREFIX(GenFragmentShadersATI):
 GL_PREFIX(PassTexCoordATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5904(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27864,13 +28115,13 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5904(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27880,7 +28131,7 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PassTexCoordATI), .-GL_PREFIX(PassTexCoordATI)
@@ -27891,7 +28142,7 @@ GL_PREFIX(PassTexCoordATI):
 GL_PREFIX(SampleMapATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5912(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27901,13 +28152,13 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5912(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27917,7 +28168,7 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SampleMapATI), .-GL_PREFIX(SampleMapATI)
@@ -27928,7 +28179,7 @@ GL_PREFIX(SampleMapATI):
 GL_PREFIX(SetFragmentShaderConstantATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5920(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27938,13 +28189,13 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5920(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5920(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27954,7 +28205,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5920(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SetFragmentShaderConstantATI), .-GL_PREFIX(SetFragmentShaderConstantATI)
@@ -27965,7 +28216,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 GL_PREFIX(PointParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5928(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27975,13 +28226,13 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5928(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27991,7 +28242,7 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameteriNV), .-GL_PREFIX(PointParameteriNV)
@@ -28002,7 +28253,7 @@ GL_PREFIX(PointParameteriNV):
 GL_PREFIX(PointParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5936(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28012,13 +28263,13 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5936(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28028,79 +28279,79 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterivNV), .-GL_PREFIX(PointParameterivNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_743)
-	.type	GL_PREFIX(_dispatch_stub_743), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_743))
-GL_PREFIX(_dispatch_stub_743):
+	.globl	GL_PREFIX(_dispatch_stub_750)
+	.type	GL_PREFIX(_dispatch_stub_750), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_750))
+GL_PREFIX(_dispatch_stub_750):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5944(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5944(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_743), .-GL_PREFIX(_dispatch_stub_743)
+	.size	GL_PREFIX(_dispatch_stub_750), .-GL_PREFIX(_dispatch_stub_750)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_744)
-	.type	GL_PREFIX(_dispatch_stub_744), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_744))
-GL_PREFIX(_dispatch_stub_744):
+	.globl	GL_PREFIX(_dispatch_stub_751)
+	.type	GL_PREFIX(_dispatch_stub_751), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_751))
+GL_PREFIX(_dispatch_stub_751):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5952(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5952(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_744), .-GL_PREFIX(_dispatch_stub_744)
+	.size	GL_PREFIX(_dispatch_stub_751), .-GL_PREFIX(_dispatch_stub_751)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_745)
-	.type	GL_PREFIX(_dispatch_stub_745), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_745))
-GL_PREFIX(_dispatch_stub_745):
+	.globl	GL_PREFIX(_dispatch_stub_752)
+	.type	GL_PREFIX(_dispatch_stub_752), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_752))
+GL_PREFIX(_dispatch_stub_752):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5960(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28110,13 +28361,13 @@ GL_PREFIX(_dispatch_stub_745):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5960(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28126,19 +28377,19 @@ GL_PREFIX(_dispatch_stub_745):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_745), .-GL_PREFIX(_dispatch_stub_745)
+	.size	GL_PREFIX(_dispatch_stub_752), .-GL_PREFIX(_dispatch_stub_752)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_746)
-	.type	GL_PREFIX(_dispatch_stub_746), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_746))
-GL_PREFIX(_dispatch_stub_746):
+	.globl	GL_PREFIX(_dispatch_stub_753)
+	.type	GL_PREFIX(_dispatch_stub_753), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_753))
+GL_PREFIX(_dispatch_stub_753):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5968(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28148,13 +28399,13 @@ GL_PREFIX(_dispatch_stub_746):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5968(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28164,40 +28415,40 @@ GL_PREFIX(_dispatch_stub_746):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_746), .-GL_PREFIX(_dispatch_stub_746)
+	.size	GL_PREFIX(_dispatch_stub_753), .-GL_PREFIX(_dispatch_stub_753)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_747)
-	.type	GL_PREFIX(_dispatch_stub_747), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_747))
-GL_PREFIX(_dispatch_stub_747):
+	.globl	GL_PREFIX(_dispatch_stub_754)
+	.type	GL_PREFIX(_dispatch_stub_754), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_754))
+GL_PREFIX(_dispatch_stub_754):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5976(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5976(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_747), .-GL_PREFIX(_dispatch_stub_747)
+	.size	GL_PREFIX(_dispatch_stub_754), .-GL_PREFIX(_dispatch_stub_754)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -28205,7 +28456,7 @@ GL_PREFIX(_dispatch_stub_747):
 GL_PREFIX(GetProgramNamedParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5984(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28219,13 +28470,13 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5984(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28239,7 +28490,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterdvNV), .-GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -28250,7 +28501,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 GL_PREFIX(GetProgramNamedParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5992(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28264,13 +28515,13 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5992(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28284,7 +28535,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterfvNV), .-GL_PREFIX(GetProgramNamedParameterfvNV)
@@ -28295,7 +28546,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 GL_PREFIX(ProgramNamedParameter4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6000(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -28315,13 +28566,13 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6000(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6000(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -28341,7 +28592,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6000(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dNV), .-GL_PREFIX(ProgramNamedParameter4dNV)
@@ -28352,7 +28603,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 GL_PREFIX(ProgramNamedParameter4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6008(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28366,13 +28617,13 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6008(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28386,7 +28637,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dvNV), .-GL_PREFIX(ProgramNamedParameter4dvNV)
@@ -28397,7 +28648,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 GL_PREFIX(ProgramNamedParameter4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6016(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -28417,13 +28668,13 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6016(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6016(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -28443,7 +28694,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6016(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fNV), .-GL_PREFIX(ProgramNamedParameter4fNV)
@@ -28454,7 +28705,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 GL_PREFIX(ProgramNamedParameter4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6024(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28468,13 +28719,13 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6024(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28488,19 +28739,19 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fvNV), .-GL_PREFIX(ProgramNamedParameter4fvNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_754)
-	.type	GL_PREFIX(_dispatch_stub_754), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_754))
-GL_PREFIX(_dispatch_stub_754):
+	.globl	GL_PREFIX(_dispatch_stub_761)
+	.type	GL_PREFIX(_dispatch_stub_761), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_761))
+GL_PREFIX(_dispatch_stub_761):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6032(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28510,13 +28761,13 @@ GL_PREFIX(_dispatch_stub_754):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6032(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28526,19 +28777,19 @@ GL_PREFIX(_dispatch_stub_754):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_754), .-GL_PREFIX(_dispatch_stub_754)
+	.size	GL_PREFIX(_dispatch_stub_761), .-GL_PREFIX(_dispatch_stub_761)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_755)
-	.type	GL_PREFIX(_dispatch_stub_755), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_755))
-GL_PREFIX(_dispatch_stub_755):
+	.globl	GL_PREFIX(_dispatch_stub_762)
+	.type	GL_PREFIX(_dispatch_stub_762), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_762))
+GL_PREFIX(_dispatch_stub_762):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6040(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28548,13 +28799,13 @@ GL_PREFIX(_dispatch_stub_755):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6040(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28564,10 +28815,10 @@ GL_PREFIX(_dispatch_stub_755):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_755), .-GL_PREFIX(_dispatch_stub_755)
+	.size	GL_PREFIX(_dispatch_stub_762), .-GL_PREFIX(_dispatch_stub_762)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFramebufferEXT)
@@ -28575,7 +28826,7 @@ GL_PREFIX(_dispatch_stub_755):
 GL_PREFIX(BindFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6048(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28585,13 +28836,13 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6048(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28601,7 +28852,7 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFramebufferEXT), .-GL_PREFIX(BindFramebufferEXT)
@@ -28612,7 +28863,7 @@ GL_PREFIX(BindFramebufferEXT):
 GL_PREFIX(BindRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6056(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28622,13 +28873,13 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6056(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28638,7 +28889,7 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindRenderbufferEXT), .-GL_PREFIX(BindRenderbufferEXT)
@@ -28649,25 +28900,25 @@ GL_PREFIX(BindRenderbufferEXT):
 GL_PREFIX(CheckFramebufferStatusEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6064(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6064(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CheckFramebufferStatusEXT), .-GL_PREFIX(CheckFramebufferStatusEXT)
@@ -28678,7 +28929,7 @@ GL_PREFIX(CheckFramebufferStatusEXT):
 GL_PREFIX(DeleteFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6072(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28688,13 +28939,13 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6072(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28704,7 +28955,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFramebuffersEXT), .-GL_PREFIX(DeleteFramebuffersEXT)
@@ -28715,7 +28966,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 GL_PREFIX(DeleteRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6080(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28725,13 +28976,13 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6080(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28741,7 +28992,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6080(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteRenderbuffersEXT), .-GL_PREFIX(DeleteRenderbuffersEXT)
@@ -28752,7 +29003,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 GL_PREFIX(FramebufferRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6088(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28766,13 +29017,13 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6088(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28786,7 +29037,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferRenderbufferEXT), .-GL_PREFIX(FramebufferRenderbufferEXT)
@@ -28797,7 +29048,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 GL_PREFIX(FramebufferTexture1DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6096(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28811,13 +29062,13 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6096(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28831,7 +29082,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture1DEXT), .-GL_PREFIX(FramebufferTexture1DEXT)
@@ -28842,7 +29093,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 GL_PREFIX(FramebufferTexture2DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6104(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28856,13 +29107,13 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6104(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28876,7 +29127,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture2DEXT), .-GL_PREFIX(FramebufferTexture2DEXT)
@@ -28887,7 +29138,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 GL_PREFIX(FramebufferTexture3DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6112(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28905,13 +29156,13 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6112(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28929,7 +29180,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture3DEXT), .-GL_PREFIX(FramebufferTexture3DEXT)
@@ -28940,7 +29191,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 GL_PREFIX(GenFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6120(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28950,13 +29201,13 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6120(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28966,7 +29217,7 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFramebuffersEXT), .-GL_PREFIX(GenFramebuffersEXT)
@@ -28977,7 +29228,7 @@ GL_PREFIX(GenFramebuffersEXT):
 GL_PREFIX(GenRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6128(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28987,13 +29238,13 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6128(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29003,7 +29254,7 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenRenderbuffersEXT), .-GL_PREFIX(GenRenderbuffersEXT)
@@ -29014,25 +29265,25 @@ GL_PREFIX(GenRenderbuffersEXT):
 GL_PREFIX(GenerateMipmapEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6136(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6136(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenerateMipmapEXT), .-GL_PREFIX(GenerateMipmapEXT)
@@ -29043,7 +29294,7 @@ GL_PREFIX(GenerateMipmapEXT):
 GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6144(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29057,13 +29308,13 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6144(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29077,7 +29328,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6144(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFramebufferAttachmentParameterivEXT), .-GL_PREFIX(GetFramebufferAttachmentParameterivEXT)
@@ -29088,7 +29339,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 GL_PREFIX(GetRenderbufferParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6152(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29098,13 +29349,13 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6152(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29114,7 +29365,7 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetRenderbufferParameterivEXT), .-GL_PREFIX(GetRenderbufferParameterivEXT)
@@ -29125,25 +29376,25 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 GL_PREFIX(IsFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6160(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6160(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsFramebufferEXT), .-GL_PREFIX(IsFramebufferEXT)
@@ -29154,25 +29405,25 @@ GL_PREFIX(IsFramebufferEXT):
 GL_PREFIX(IsRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6168(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6168(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsRenderbufferEXT), .-GL_PREFIX(IsRenderbufferEXT)
@@ -29183,7 +29434,7 @@ GL_PREFIX(IsRenderbufferEXT):
 GL_PREFIX(RenderbufferStorageEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6176(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29197,13 +29448,13 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6176(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29217,19 +29468,19 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RenderbufferStorageEXT), .-GL_PREFIX(RenderbufferStorageEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_773)
-	.type	GL_PREFIX(_dispatch_stub_773), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_773))
-GL_PREFIX(_dispatch_stub_773):
+	.globl	GL_PREFIX(_dispatch_stub_780)
+	.type	GL_PREFIX(_dispatch_stub_780), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_780))
+GL_PREFIX(_dispatch_stub_780):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6184(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29247,13 +29498,13 @@ GL_PREFIX(_dispatch_stub_773):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6184(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29271,19 +29522,19 @@ GL_PREFIX(_dispatch_stub_773):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_773), .-GL_PREFIX(_dispatch_stub_773)
+	.size	GL_PREFIX(_dispatch_stub_780), .-GL_PREFIX(_dispatch_stub_780)
 
 	.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(_dispatch_stub_781)
+	.type	GL_PREFIX(_dispatch_stub_781), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_781))
+GL_PREFIX(_dispatch_stub_781):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6192(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29293,13 +29544,13 @@ GL_PREFIX(_dispatch_stub_774):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6192(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29309,19 +29560,19 @@ GL_PREFIX(_dispatch_stub_774):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6248(%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_781), .-GL_PREFIX(_dispatch_stub_781)
 
 	.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_782)
+	.type	GL_PREFIX(_dispatch_stub_782), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_782))
+GL_PREFIX(_dispatch_stub_782):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6200(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29331,13 +29582,13 @@ GL_PREFIX(_dispatch_stub_775):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6200(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29347,10 +29598,10 @@ GL_PREFIX(_dispatch_stub_775):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6256(%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_782), .-GL_PREFIX(_dispatch_stub_782)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(FramebufferTextureLayerEXT)
@@ -29358,7 +29609,7 @@ GL_PREFIX(_dispatch_stub_775):
 GL_PREFIX(FramebufferTextureLayerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6208(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29372,13 +29623,13 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6208(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29392,7 +29643,7 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTextureLayerEXT), .-GL_PREFIX(FramebufferTextureLayerEXT)
@@ -29403,37 +29654,37 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 GL_PREFIX(ProvokingVertexEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6216(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6216(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProvokingVertexEXT), .-GL_PREFIX(ProvokingVertexEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_778)
-	.type	GL_PREFIX(_dispatch_stub_778), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_778))
-GL_PREFIX(_dispatch_stub_778):
+	.globl	GL_PREFIX(_dispatch_stub_785)
+	.type	GL_PREFIX(_dispatch_stub_785), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_785))
+GL_PREFIX(_dispatch_stub_785):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6224(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29443,13 +29694,13 @@ GL_PREFIX(_dispatch_stub_778):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6224(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29459,19 +29710,19 @@ GL_PREFIX(_dispatch_stub_778):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_778), .-GL_PREFIX(_dispatch_stub_778)
+	.size	GL_PREFIX(_dispatch_stub_785), .-GL_PREFIX(_dispatch_stub_785)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_779)
-	.type	GL_PREFIX(_dispatch_stub_779), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_779))
-GL_PREFIX(_dispatch_stub_779):
+	.globl	GL_PREFIX(_dispatch_stub_786)
+	.type	GL_PREFIX(_dispatch_stub_786), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_786))
+GL_PREFIX(_dispatch_stub_786):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6232(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29481,13 +29732,13 @@ GL_PREFIX(_dispatch_stub_779):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6232(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6232(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29497,19 +29748,19 @@ GL_PREFIX(_dispatch_stub_779):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6232(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_779), .-GL_PREFIX(_dispatch_stub_779)
+	.size	GL_PREFIX(_dispatch_stub_786), .-GL_PREFIX(_dispatch_stub_786)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_780)
-	.type	GL_PREFIX(_dispatch_stub_780), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_780))
-GL_PREFIX(_dispatch_stub_780):
+	.globl	GL_PREFIX(_dispatch_stub_787)
+	.type	GL_PREFIX(_dispatch_stub_787), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_787))
+GL_PREFIX(_dispatch_stub_787):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6240(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29523,13 +29774,13 @@ GL_PREFIX(_dispatch_stub_780):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6240(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29543,19 +29794,19 @@ GL_PREFIX(_dispatch_stub_780):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_780), .-GL_PREFIX(_dispatch_stub_780)
+	.size	GL_PREFIX(_dispatch_stub_787), .-GL_PREFIX(_dispatch_stub_787)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_781)
-	.type	GL_PREFIX(_dispatch_stub_781), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_781))
-GL_PREFIX(_dispatch_stub_781):
+	.globl	GL_PREFIX(_dispatch_stub_788)
+	.type	GL_PREFIX(_dispatch_stub_788), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_788))
+GL_PREFIX(_dispatch_stub_788):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6248(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29569,13 +29820,13 @@ GL_PREFIX(_dispatch_stub_781):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6248(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6248(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29589,19 +29840,19 @@ GL_PREFIX(_dispatch_stub_781):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6248(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_781), .-GL_PREFIX(_dispatch_stub_781)
+	.size	GL_PREFIX(_dispatch_stub_788), .-GL_PREFIX(_dispatch_stub_788)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_782)
-	.type	GL_PREFIX(_dispatch_stub_782), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_782))
-GL_PREFIX(_dispatch_stub_782):
+	.globl	GL_PREFIX(_dispatch_stub_789)
+	.type	GL_PREFIX(_dispatch_stub_789), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_789))
+GL_PREFIX(_dispatch_stub_789):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6256(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29615,13 +29866,13 @@ GL_PREFIX(_dispatch_stub_782):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6256(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6256(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29635,19 +29886,19 @@ GL_PREFIX(_dispatch_stub_782):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6256(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_782), .-GL_PREFIX(_dispatch_stub_782)
+	.size	GL_PREFIX(_dispatch_stub_789), .-GL_PREFIX(_dispatch_stub_789)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_783)
-	.type	GL_PREFIX(_dispatch_stub_783), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_783))
-GL_PREFIX(_dispatch_stub_783):
+	.globl	GL_PREFIX(_dispatch_stub_790)
+	.type	GL_PREFIX(_dispatch_stub_790), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_790))
+GL_PREFIX(_dispatch_stub_790):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6264(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29657,13 +29908,13 @@ GL_PREFIX(_dispatch_stub_783):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6264(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6264(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29673,19 +29924,19 @@ GL_PREFIX(_dispatch_stub_783):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6264(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_783), .-GL_PREFIX(_dispatch_stub_783)
+	.size	GL_PREFIX(_dispatch_stub_790), .-GL_PREFIX(_dispatch_stub_790)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_784)
-	.type	GL_PREFIX(_dispatch_stub_784), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_784))
-GL_PREFIX(_dispatch_stub_784):
+	.globl	GL_PREFIX(_dispatch_stub_791)
+	.type	GL_PREFIX(_dispatch_stub_791), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_791))
+GL_PREFIX(_dispatch_stub_791):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6272(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29695,13 +29946,13 @@ GL_PREFIX(_dispatch_stub_784):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6272(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6272(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29711,10 +29962,10 @@ GL_PREFIX(_dispatch_stub_784):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6272(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_784), .-GL_PREFIX(_dispatch_stub_784)
+	.size	GL_PREFIX(_dispatch_stub_791), .-GL_PREFIX(_dispatch_stub_791)
 
 	.globl GL_PREFIX(ArrayElementEXT) ; .set GL_PREFIX(ArrayElementEXT), GL_PREFIX(ArrayElement)
 	.globl GL_PREFIX(BindTextureEXT) ; .set GL_PREFIX(BindTextureEXT), GL_PREFIX(BindTexture)
@@ -29969,9 +30220,9 @@ GL_PREFIX(_dispatch_stub_784):
 	.globl GL_PREFIX(IsProgramARB) ; .set GL_PREFIX(IsProgramARB), GL_PREFIX(IsProgramNV)
 	.globl GL_PREFIX(PointParameteri) ; .set GL_PREFIX(PointParameteri), GL_PREFIX(PointParameteriNV)
 	.globl GL_PREFIX(PointParameteriv) ; .set GL_PREFIX(PointParameteriv), GL_PREFIX(PointParameterivNV)
-	.globl GL_PREFIX(DeleteVertexArrays) ; .set GL_PREFIX(DeleteVertexArrays), GL_PREFIX(_dispatch_stub_745)
-	.globl GL_PREFIX(IsVertexArray) ; .set GL_PREFIX(IsVertexArray), GL_PREFIX(_dispatch_stub_747)
-	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_755)
+	.globl GL_PREFIX(DeleteVertexArrays) ; .set GL_PREFIX(DeleteVertexArrays), GL_PREFIX(_dispatch_stub_752)
+	.globl GL_PREFIX(IsVertexArray) ; .set GL_PREFIX(IsVertexArray), GL_PREFIX(_dispatch_stub_754)
+	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_762)
 	.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)
@@ -29989,7 +30240,7 @@ GL_PREFIX(_dispatch_stub_784):
 	.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_773)
+	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_780)
 	.globl GL_PREFIX(FramebufferTextureLayer) ; .set GL_PREFIX(FramebufferTextureLayer), GL_PREFIX(FramebufferTextureLayerEXT)
 
 #if defined(GLX_USE_TLS) && defined(__linux__)
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index 204175b72d..46794adaf7 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -718,23 +718,30 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(BindVertexArray, _gloffset_BindVertexArray, BindVertexArray@4)
 	GL_STUB(GenVertexArrays, _gloffset_GenVertexArrays, GenVertexArrays@8)
 	GL_STUB(CopyBufferSubData, _gloffset_CopyBufferSubData, CopyBufferSubData@20)
+	GL_STUB(ClientWaitSync, _gloffset_ClientWaitSync, ClientWaitSync@12)
+	GL_STUB(DeleteSync, _gloffset_DeleteSync, DeleteSync@4)
+	GL_STUB(FenceSync, _gloffset_FenceSync, FenceSync@8)
+	GL_STUB(GetInteger64v, _gloffset_GetInteger64v, GetInteger64v@8)
+	GL_STUB(GetSynciv, _gloffset_GetSynciv, GetSynciv@20)
+	GL_STUB(IsSync, _gloffset_IsSync, IsSync@4)
+	GL_STUB(WaitSync, _gloffset_WaitSync, WaitSync@12)
 	GL_STUB(PolygonOffsetEXT, _gloffset_PolygonOffsetEXT, PolygonOffsetEXT@8)
-	GL_STUB(_dispatch_stub_568, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_568@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_568, _dispatch_stub_568@8))
-	GL_STUB(_dispatch_stub_569, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_569@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_569, _dispatch_stub_569@8))
-	GL_STUB(_dispatch_stub_570, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_570@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_570, _dispatch_stub_570@8))
-	GL_STUB(_dispatch_stub_571, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_571@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_571, _dispatch_stub_571@8))
-	GL_STUB(_dispatch_stub_572, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_572@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_572, _dispatch_stub_572@8))
-	GL_STUB(_dispatch_stub_573, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_573@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_573, _dispatch_stub_573@8))
-	GL_STUB(_dispatch_stub_574, _gloffset_SampleMaskSGIS, _dispatch_stub_574@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_574, _dispatch_stub_574@8))
-	GL_STUB(_dispatch_stub_575, _gloffset_SamplePatternSGIS, _dispatch_stub_575@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_575, _dispatch_stub_575@4))
+	GL_STUB(_dispatch_stub_575, _gloffset_GetPixelTexGenParameterfvSGIS, _dispatch_stub_575@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_575, _dispatch_stub_575@8))
+	GL_STUB(_dispatch_stub_576, _gloffset_GetPixelTexGenParameterivSGIS, _dispatch_stub_576@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_576, _dispatch_stub_576@8))
+	GL_STUB(_dispatch_stub_577, _gloffset_PixelTexGenParameterfSGIS, _dispatch_stub_577@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_577, _dispatch_stub_577@8))
+	GL_STUB(_dispatch_stub_578, _gloffset_PixelTexGenParameterfvSGIS, _dispatch_stub_578@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_578, _dispatch_stub_578@8))
+	GL_STUB(_dispatch_stub_579, _gloffset_PixelTexGenParameteriSGIS, _dispatch_stub_579@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_579, _dispatch_stub_579@8))
+	GL_STUB(_dispatch_stub_580, _gloffset_PixelTexGenParameterivSGIS, _dispatch_stub_580@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_580, _dispatch_stub_580@8))
+	GL_STUB(_dispatch_stub_581, _gloffset_SampleMaskSGIS, _dispatch_stub_581@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_581, _dispatch_stub_581@8))
+	GL_STUB(_dispatch_stub_582, _gloffset_SamplePatternSGIS, _dispatch_stub_582@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_582, _dispatch_stub_582@4))
 	GL_STUB(ColorPointerEXT, _gloffset_ColorPointerEXT, ColorPointerEXT@20)
 	GL_STUB(EdgeFlagPointerEXT, _gloffset_EdgeFlagPointerEXT, EdgeFlagPointerEXT@12)
 	GL_STUB(IndexPointerEXT, _gloffset_IndexPointerEXT, IndexPointerEXT@16)
@@ -745,10 +752,10 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(PointParameterfvEXT, _gloffset_PointParameterfvEXT, PointParameterfvEXT@8)
 	GL_STUB(LockArraysEXT, _gloffset_LockArraysEXT, LockArraysEXT@8)
 	GL_STUB(UnlockArraysEXT, _gloffset_UnlockArraysEXT, UnlockArraysEXT@0)
-	GL_STUB(_dispatch_stub_586, _gloffset_CullParameterdvEXT, _dispatch_stub_586@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_586, _dispatch_stub_586@8))
-	GL_STUB(_dispatch_stub_587, _gloffset_CullParameterfvEXT, _dispatch_stub_587@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_587, _dispatch_stub_587@8))
+	GL_STUB(_dispatch_stub_593, _gloffset_CullParameterdvEXT, _dispatch_stub_593@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_593, _dispatch_stub_593@8))
+	GL_STUB(_dispatch_stub_594, _gloffset_CullParameterfvEXT, _dispatch_stub_594@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_594, _dispatch_stub_594@8))
 	GL_STUB(SecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT, SecondaryColor3bEXT@12)
 	GL_STUB(SecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
 	GL_STUB(SecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT, SecondaryColor3dEXT@24)
@@ -773,8 +780,8 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(FogCoorddvEXT, _gloffset_FogCoorddvEXT, FogCoorddvEXT@4)
 	GL_STUB(FogCoordfEXT, _gloffset_FogCoordfEXT, FogCoordfEXT@4)
 	GL_STUB(FogCoordfvEXT, _gloffset_FogCoordfvEXT, FogCoordfvEXT@4)
-	GL_STUB(_dispatch_stub_612, _gloffset_PixelTexGenSGIX, _dispatch_stub_612@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_612, _dispatch_stub_612@4))
+	GL_STUB(_dispatch_stub_619, _gloffset_PixelTexGenSGIX, _dispatch_stub_619@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_619, _dispatch_stub_619@4))
 	GL_STUB(BlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
 	GL_STUB(FlushVertexArrayRangeNV, _gloffset_FlushVertexArrayRangeNV, FlushVertexArrayRangeNV@0)
 	GL_STUB(VertexArrayRangeNV, _gloffset_VertexArrayRangeNV, VertexArrayRangeNV@8)
@@ -816,24 +823,24 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(WindowPos4ivMESA, _gloffset_WindowPos4ivMESA, WindowPos4ivMESA@4)
 	GL_STUB(WindowPos4sMESA, _gloffset_WindowPos4sMESA, WindowPos4sMESA@16)
 	GL_STUB(WindowPos4svMESA, _gloffset_WindowPos4svMESA, WindowPos4svMESA@4)
-	GL_STUB(_dispatch_stub_654, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_654@20)
-	HIDDEN(GL_PREFIX(_dispatch_stub_654, _dispatch_stub_654@20))
-	GL_STUB(_dispatch_stub_655, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_655@24)
-	HIDDEN(GL_PREFIX(_dispatch_stub_655, _dispatch_stub_655@24))
-	GL_STUB(_dispatch_stub_656, _gloffset_DeleteFencesNV, _dispatch_stub_656@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_656, _dispatch_stub_656@8))
-	GL_STUB(_dispatch_stub_657, _gloffset_FinishFenceNV, _dispatch_stub_657@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_657, _dispatch_stub_657@4))
-	GL_STUB(_dispatch_stub_658, _gloffset_GenFencesNV, _dispatch_stub_658@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_658, _dispatch_stub_658@8))
-	GL_STUB(_dispatch_stub_659, _gloffset_GetFenceivNV, _dispatch_stub_659@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_659, _dispatch_stub_659@12))
-	GL_STUB(_dispatch_stub_660, _gloffset_IsFenceNV, _dispatch_stub_660@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_660, _dispatch_stub_660@4))
-	GL_STUB(_dispatch_stub_661, _gloffset_SetFenceNV, _dispatch_stub_661@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_661, _dispatch_stub_661@8))
-	GL_STUB(_dispatch_stub_662, _gloffset_TestFenceNV, _dispatch_stub_662@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_662, _dispatch_stub_662@4))
+	GL_STUB(_dispatch_stub_661, _gloffset_MultiModeDrawArraysIBM, _dispatch_stub_661@20)
+	HIDDEN(GL_PREFIX(_dispatch_stub_661, _dispatch_stub_661@20))
+	GL_STUB(_dispatch_stub_662, _gloffset_MultiModeDrawElementsIBM, _dispatch_stub_662@24)
+	HIDDEN(GL_PREFIX(_dispatch_stub_662, _dispatch_stub_662@24))
+	GL_STUB(_dispatch_stub_663, _gloffset_DeleteFencesNV, _dispatch_stub_663@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_663, _dispatch_stub_663@8))
+	GL_STUB(_dispatch_stub_664, _gloffset_FinishFenceNV, _dispatch_stub_664@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_664, _dispatch_stub_664@4))
+	GL_STUB(_dispatch_stub_665, _gloffset_GenFencesNV, _dispatch_stub_665@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_665, _dispatch_stub_665@8))
+	GL_STUB(_dispatch_stub_666, _gloffset_GetFenceivNV, _dispatch_stub_666@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_666, _dispatch_stub_666@12))
+	GL_STUB(_dispatch_stub_667, _gloffset_IsFenceNV, _dispatch_stub_667@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_667, _dispatch_stub_667@4))
+	GL_STUB(_dispatch_stub_668, _gloffset_SetFenceNV, _dispatch_stub_668@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_668, _dispatch_stub_668@8))
+	GL_STUB(_dispatch_stub_669, _gloffset_TestFenceNV, _dispatch_stub_669@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_669, _dispatch_stub_669@4))
 	GL_STUB(AreProgramsResidentNV, _gloffset_AreProgramsResidentNV, AreProgramsResidentNV@12)
 	GL_STUB(BindProgramNV, _gloffset_BindProgramNV, BindProgramNV@8)
 	GL_STUB(DeleteProgramsNV, _gloffset_DeleteProgramsNV, DeleteProgramsNV@8)
@@ -914,26 +921,26 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(SetFragmentShaderConstantATI, _gloffset_SetFragmentShaderConstantATI, SetFragmentShaderConstantATI@8)
 	GL_STUB(PointParameteriNV, _gloffset_PointParameteriNV, PointParameteriNV@8)
 	GL_STUB(PointParameterivNV, _gloffset_PointParameterivNV, PointParameterivNV@8)
-	GL_STUB(_dispatch_stub_743, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_743@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_743, _dispatch_stub_743@4))
-	GL_STUB(_dispatch_stub_744, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_744@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_744, _dispatch_stub_744@4))
-	GL_STUB(_dispatch_stub_745, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_745@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_745, _dispatch_stub_745@8))
-	GL_STUB(_dispatch_stub_746, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_746@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_746, _dispatch_stub_746@8))
-	GL_STUB(_dispatch_stub_747, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_747@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_747, _dispatch_stub_747@4))
+	GL_STUB(_dispatch_stub_750, _gloffset_ActiveStencilFaceEXT, _dispatch_stub_750@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_750, _dispatch_stub_750@4))
+	GL_STUB(_dispatch_stub_751, _gloffset_BindVertexArrayAPPLE, _dispatch_stub_751@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_751, _dispatch_stub_751@4))
+	GL_STUB(_dispatch_stub_752, _gloffset_DeleteVertexArraysAPPLE, _dispatch_stub_752@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_752, _dispatch_stub_752@8))
+	GL_STUB(_dispatch_stub_753, _gloffset_GenVertexArraysAPPLE, _dispatch_stub_753@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_753, _dispatch_stub_753@8))
+	GL_STUB(_dispatch_stub_754, _gloffset_IsVertexArrayAPPLE, _dispatch_stub_754@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_754, _dispatch_stub_754@4))
 	GL_STUB(GetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV, GetProgramNamedParameterdvNV@16)
 	GL_STUB(GetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV, GetProgramNamedParameterfvNV@16)
 	GL_STUB(ProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV, ProgramNamedParameter4dNV@44)
 	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_754, _gloffset_DepthBoundsEXT, _dispatch_stub_754@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_754, _dispatch_stub_754@16))
-	GL_STUB(_dispatch_stub_755, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_755@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_755, _dispatch_stub_755@8))
+	GL_STUB(_dispatch_stub_761, _gloffset_DepthBoundsEXT, _dispatch_stub_761@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_761, _dispatch_stub_761@16))
+	GL_STUB(_dispatch_stub_762, _gloffset_BlendEquationSeparateEXT, _dispatch_stub_762@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_762, _dispatch_stub_762@8))
 	GL_STUB(BindFramebufferEXT, _gloffset_BindFramebufferEXT, BindFramebufferEXT@8)
 	GL_STUB(BindRenderbufferEXT, _gloffset_BindRenderbufferEXT, BindRenderbufferEXT@8)
 	GL_STUB(CheckFramebufferStatusEXT, _gloffset_CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
@@ -951,28 +958,28 @@ 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_773, _gloffset_BlitFramebufferEXT, _dispatch_stub_773@40)
-	HIDDEN(GL_PREFIX(_dispatch_stub_773, _dispatch_stub_773@40))
-	GL_STUB(_dispatch_stub_774, _gloffset_BufferParameteriAPPLE, _dispatch_stub_774@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_774, _dispatch_stub_774@12))
-	GL_STUB(_dispatch_stub_775, _gloffset_FlushMappedBufferRangeAPPLE, _dispatch_stub_775@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_775, _dispatch_stub_775@12))
+	GL_STUB(_dispatch_stub_780, _gloffset_BlitFramebufferEXT, _dispatch_stub_780@40)
+	HIDDEN(GL_PREFIX(_dispatch_stub_780, _dispatch_stub_780@40))
+	GL_STUB(_dispatch_stub_781, _gloffset_BufferParameteriAPPLE, _dispatch_stub_781@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_781, _dispatch_stub_781@12))
+	GL_STUB(_dispatch_stub_782, _gloffset_FlushMappedBufferRangeAPPLE, _dispatch_stub_782@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_782, _dispatch_stub_782@12))
 	GL_STUB(FramebufferTextureLayerEXT, _gloffset_FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
 	GL_STUB(ProvokingVertexEXT, _gloffset_ProvokingVertexEXT, ProvokingVertexEXT@4)
-	GL_STUB(_dispatch_stub_778, _gloffset_GetTexParameterPointervAPPLE, _dispatch_stub_778@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_778, _dispatch_stub_778@12))
-	GL_STUB(_dispatch_stub_779, _gloffset_TextureRangeAPPLE, _dispatch_stub_779@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_779, _dispatch_stub_779@12))
-	GL_STUB(_dispatch_stub_780, _gloffset_StencilFuncSeparateATI, _dispatch_stub_780@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_780, _dispatch_stub_780@16))
-	GL_STUB(_dispatch_stub_781, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_781@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_781, _dispatch_stub_781@16))
-	GL_STUB(_dispatch_stub_782, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_782@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_782, _dispatch_stub_782@16))
-	GL_STUB(_dispatch_stub_783, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_783@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_783, _dispatch_stub_783@12))
-	GL_STUB(_dispatch_stub_784, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_784@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_784, _dispatch_stub_784@12))
+	GL_STUB(_dispatch_stub_785, _gloffset_GetTexParameterPointervAPPLE, _dispatch_stub_785@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_785, _dispatch_stub_785@12))
+	GL_STUB(_dispatch_stub_786, _gloffset_TextureRangeAPPLE, _dispatch_stub_786@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_786, _dispatch_stub_786@12))
+	GL_STUB(_dispatch_stub_787, _gloffset_StencilFuncSeparateATI, _dispatch_stub_787@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_787, _dispatch_stub_787@16))
+	GL_STUB(_dispatch_stub_788, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_788@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_788, _dispatch_stub_788@16))
+	GL_STUB(_dispatch_stub_789, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_789@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_789, _dispatch_stub_789@16))
+	GL_STUB(_dispatch_stub_790, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_790@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_790, _dispatch_stub_790@12))
+	GL_STUB(_dispatch_stub_791, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_791@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_791, _dispatch_stub_791@12))
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, _gloffset_BindTexture, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, _gloffset_DrawArrays, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
-- 
cgit v1.2.3


From f37070bab6af350caec905ea7658e9241042b6cc Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 28 Aug 2009 20:10:05 -0700
Subject: ARB sync: Add support for GL_ARB_sync to swrast

This isn't quite right yet.  The delete behavior and the context
clean-up needs some work.
---
 src/mesa/drivers/common/driverfuncs.c |   8 +
 src/mesa/drivers/dri/swrast/swrast.c  |   2 +
 src/mesa/main/api_exec.c              |  14 ++
 src/mesa/main/context.c               |  12 ++
 src/mesa/main/dd.h                    |  16 ++
 src/mesa/main/extensions.c            |   4 +
 src/mesa/main/get.c                   |  19 ++
 src/mesa/main/get_gen.py              |   7 +
 src/mesa/main/mfeatures.h             |   1 +
 src/mesa/main/mtypes.h                |  21 ++
 src/mesa/main/syncobj.c               | 372 ++++++++++++++++++++++++++++++++++
 src/mesa/main/syncobj.h               |  64 ++++++
 src/mesa/sources.mak                  |   1 +
 13 files changed, 541 insertions(+)
 create mode 100644 src/mesa/main/syncobj.c
 create mode 100644 src/mesa/main/syncobj.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 3b397fef7d..a9f3c8e727 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -45,6 +45,9 @@
 #include "main/fbobject.h"
 #include "main/texrender.h"
 #endif
+#if FEATURE_ARB_sync
+#include "main/syncobj.h"
+#endif
 
 #include "shader/program.h"
 #include "shader/prog_execute.h"
@@ -200,6 +203,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->GetDoublev = NULL;
    driver->GetFloatv = NULL;
    driver->GetIntegerv = NULL;
+   driver->GetInteger64v = NULL;
    driver->GetPointerv = NULL;
    
    /* buffer objects */
@@ -208,6 +212,10 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    /* query objects */
    _mesa_init_query_object_functions(driver);
 
+#if FEATURE_ARB_sync
+   _mesa_init_sync_object_functions(driver);
+#endif
+
 #if FEATURE_EXT_framebuffer_object
    driver->NewFramebuffer = _mesa_new_framebuffer;
    driver->NewRenderbuffer = _mesa_new_soft_renderbuffer;
diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
index 3aa7843b1b..69b92e9e44 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -65,6 +65,7 @@
 #define need_GL_ARB_shader_objects
 #define need_GL_ARB_vertex_array_object
 #define need_GL_ARB_vertex_program
+#define need_GL_ARB_sync
 #define need_GL_APPLE_vertex_array_object
 #define need_GL_ATI_fragment_shader
 #define need_GL_ATI_separate_stencil
@@ -97,6 +98,7 @@ const struct dri_extension card_extensions[] =
     { "GL_ARB_shader_objects",		GL_ARB_shader_objects_functions },
     { "GL_ARB_vertex_array_object",	GL_ARB_vertex_array_object_functions },
     { "GL_ARB_vertex_program",		GL_ARB_vertex_program_functions },
+    { "GL_ARB_sync",			GL_ARB_sync },
     { "GL_APPLE_vertex_array_object",	GL_APPLE_vertex_array_object_functions },
     { "GL_ATI_fragment_shader",		GL_ATI_fragment_shader_functions },
     { "GL_ATI_separate_stencil",	GL_ATI_separate_stencil_functions },
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index cbf48615bf..02550ae108 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -129,6 +129,9 @@
 #if FEATURE_ARB_shader_objects
 #include "shaders.h"
 #endif
+#if FEATURE_ARB_sync
+#include "syncobj.h"
+#endif
 #include "debug.h"
 #include "glapi/dispatch.h"
 
@@ -823,6 +826,17 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB);
 #endif    /* FEATURE_ARB_vertex_shader */
 
+   /* GL_ARB_sync */
+#if FEATURE_ARB_sync
+   SET_IsSync(exec, _mesa_IsSync);
+   SET_DeleteSync(exec, _mesa_DeleteSync);
+   SET_FenceSync(exec, _mesa_FenceSync);
+   SET_ClientWaitSync(exec, _mesa_ClientWaitSync);
+   SET_WaitSync(exec, _mesa_WaitSync);
+   SET_GetInteger64v(exec, _mesa_GetInteger64v);
+   SET_GetSynciv(exec, _mesa_GetSynciv);
+#endif
+
   /* GL_ATI_fragment_shader */
 #if FEATURE_ATI_fragment_shader
    SET_GenFragmentShadersATI(exec, _mesa_GenFragmentShadersATI);
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 4651760d78..f6d4ac4595 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -129,6 +129,9 @@
 #if FEATURE_ARB_occlusion_query
 #include "queryobj.h"
 #endif
+#if FEATURE_ARB_sync
+#include "syncobj.h"
+#endif
 #if FEATURE_drawpix
 #include "rastpos.h"
 #endif
@@ -592,6 +595,9 @@ _mesa_init_constants(GLcontext *ctx)
    /* GL_ARB_framebuffer_object */
    ctx->Const.MaxSamples = 0;
 
+   /* GL_ARB_sync */
+   ctx->Const.MaxServerWaitTimeout = (GLuint64) ~0;
+
    /* GL_ATI_envmap_bumpmap */
    ctx->Const.SupportedBumpUnits = SUPPORTED_ATI_BUMP_UNITS;
 
@@ -715,6 +721,9 @@ init_attrib_groups(GLcontext *ctx)
 #if FEATURE_ARB_occlusion_query
    _mesa_init_query( ctx );
 #endif
+#if FEATURE_ARB_sync
+   _mesa_init_sync( ctx );
+#endif
 #if FEATURE_drawpix
    _mesa_init_rastpos( ctx );
 #endif
@@ -1013,6 +1022,9 @@ _mesa_free_context_data( GLcontext *ctx )
    _mesa_free_shader_state(ctx);
 #if FEATURE_ARB_occlusion_query
    _mesa_free_query_data(ctx);
+#endif
+#if FEATURE_ARB_sync
+   _mesa_free_sync_data(ctx);
 #endif
    _mesa_free_varray_data(ctx);
 
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 3a59872b5a..4a700b5cb4 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -1044,6 +1044,22 @@ struct dd_function_table {
     */
    void (*EndCallList)( GLcontext *ctx );
 
+
+#if FEATURE_ARB_sync
+   /**
+    * \name GL_ARB_sync interfaces
+    */
+   /*@{*/
+   struct gl_sync_object * (*NewSyncObject)(GLcontext *, GLenum);
+   void (*FenceSync)(GLcontext *, struct gl_sync_object *, GLenum, GLbitfield);
+   void (*DeleteSyncObject)(GLcontext *, struct gl_sync_object *);
+   void (*CheckSync)(GLcontext *, struct gl_sync_object *);
+   void (*ClientWaitSync)(GLcontext *, struct gl_sync_object *,
+			  GLbitfield, GLuint64);
+   void (*ServerWaitSync)(GLcontext *, struct gl_sync_object *,
+			  GLbitfield, GLuint64);
+   /*@}*/
+#endif
 };
 
 
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 195fdde346..e3070b1547 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -67,6 +67,7 @@ static const struct {
    { OFF, "GL_ARB_shading_language_120",       F(ARB_shading_language_120) },
    { OFF, "GL_ARB_shadow",                     F(ARB_shadow) },
    { OFF, "GL_ARB_shadow_ambient",             F(ARB_shadow_ambient) },
+   { OFF, "GL_ARB_sync",                       F(ARB_sync) },
    { OFF, "GL_ARB_texture_border_clamp",       F(ARB_texture_border_clamp) },
    { ON,  "GL_ARB_texture_compression",        F(ARB_texture_compression) },
    { OFF, "GL_ARB_texture_cube_map",           F(ARB_texture_cube_map) },
@@ -239,6 +240,9 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
 #endif
 #if FEATURE_ARB_vertex_buffer_object
    /*ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;*/
+#endif
+#if FEATURE_ARB_sync
+   ctx->Extensions.ARB_sync = GL_TRUE;
 #endif
    ctx->Extensions.APPLE_vertex_array_object = GL_TRUE;
    ctx->Extensions.ATI_envmap_bumpmap = GL_TRUE;
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index fc742c4a90..477ed01030 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -19,6 +19,9 @@
 
 #define INT_TO_BOOLEAN(I)     ( (I) ? GL_TRUE : GL_FALSE )
 
+#define INT64_TO_BOOLEAN(I)   ( (I) ? GL_TRUE : GL_FALSE )
+#define INT64_TO_INT(I)       ( (GLint)((I > INT_MAX) ? INT_MAX : ((I < INT_MIN) ? INT_MIN : (I))) )
+
 #define BOOLEAN_TO_INT(B)     ( (GLint) (B) )
 #define BOOLEAN_TO_INT64(B)   ( (GLint64) (B) )
 #define BOOLEAN_TO_FLOAT(B)   ( (B) ? 1.0F : 0.0F )
@@ -1887,6 +1890,10 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          CHECK_EXT1(ARB_seamless_cube_map, "GetBooleanv");
          params[0] = ctx->Texture.CubeMapSeamless;
          break;
+      case GL_MAX_SERVER_WAIT_TIMEOUT:
+         CHECK_EXT1(ARB_sync, "GetBooleanv");
+         params[0] = INT64_TO_BOOLEAN(ctx->Const.MaxServerWaitTimeout);
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv(pname=0x%x)", pname);
    }
@@ -3714,6 +3721,10 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          CHECK_EXT1(ARB_seamless_cube_map, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Texture.CubeMapSeamless);
          break;
+      case GL_MAX_SERVER_WAIT_TIMEOUT:
+         CHECK_EXT1(ARB_sync, "GetFloatv");
+         params[0] = (GLfloat)(ctx->Const.MaxServerWaitTimeout);
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv(pname=0x%x)", pname);
    }
@@ -5541,6 +5552,10 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          CHECK_EXT1(ARB_seamless_cube_map, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Texture.CubeMapSeamless);
          break;
+      case GL_MAX_SERVER_WAIT_TIMEOUT:
+         CHECK_EXT1(ARB_sync, "GetIntegerv");
+         params[0] = INT64_TO_INT(ctx->Const.MaxServerWaitTimeout);
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv(pname=0x%x)", pname);
    }
@@ -7369,6 +7384,10 @@ _mesa_GetInteger64v( GLenum pname, GLint64 *params )
          CHECK_EXT1(ARB_seamless_cube_map, "GetInteger64v");
          params[0] = BOOLEAN_TO_INT64(ctx->Texture.CubeMapSeamless);
          break;
+      case GL_MAX_SERVER_WAIT_TIMEOUT:
+         CHECK_EXT1(ARB_sync, "GetInteger64v");
+         params[0] = ctx->Const.MaxServerWaitTimeout;
+         break;
       default:
          _mesa_error(ctx, GL_INVALID_ENUM, "glGetInteger64v(pname=0x%x)", pname);
    }
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 4f0feaad3c..2878c1b552 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -1022,6 +1022,10 @@ StateVars = [
 	# GL_ARB_seamless_cube_map
 	( "GL_TEXTURE_CUBE_MAP_SEAMLESS", GLboolean, ["ctx->Texture.CubeMapSeamless"], "",
 	  ["ARB_seamless_cube_map"] ),
+
+	# GL_ARB_sync
+	( "GL_MAX_SERVER_WAIT_TIMEOUT", GLint64, ["ctx->Const.MaxServerWaitTimeout"], "",
+	  ["ARB_sync"] ),
 ]
 
 
@@ -1157,6 +1161,9 @@ def EmitHeader():
 
 #define INT_TO_BOOLEAN(I)     ( (I) ? GL_TRUE : GL_FALSE )
 
+#define INT64_TO_BOOLEAN(I)   ( (I) ? GL_TRUE : GL_FALSE )
+#define INT64_TO_INT(I)       ( (GLint)((I > INT_MAX) ? INT_MAX : ((I < INT_MIN) ? INT_MIN : (I))) )
+
 #define BOOLEAN_TO_INT(B)     ( (GLint) (B) )
 #define BOOLEAN_TO_INT64(B)   ( (GLint64) (B) )
 #define BOOLEAN_TO_FLOAT(B)   ( (B) ? 1.0F : 0.0F )
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index ef973314e3..e23cdb1f42 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -70,6 +70,7 @@
 #define FEATURE_ARB_shader_objects (FEATURE_ARB_vertex_shader || FEATURE_ARB_fragment_shader)
 #define FEATURE_ARB_shading_language_100 FEATURE_ARB_shader_objects
 #define FEATURE_ARB_shading_language_120 FEATURE_ARB_shader_objects
+#define FEATURE_ARB_sync _HAVE_FULL_GL
 
 #define FEATURE_EXT_framebuffer_blit _HAVE_FULL_GL
 #define FEATURE_EXT_framebuffer_object _HAVE_FULL_GL
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 53dc6360ea..58da5d15eb 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1986,6 +1986,20 @@ struct gl_query_state
 };
 
 
+/** Sync object state */
+struct gl_sync_object {
+   GLenum Type;               /**< GL_SYNC_FENCE */
+   GLuint Name;               /**< Fence name */
+   GLint RefCount;            /**< Reference count */
+   GLboolean DeletePending;   /**< Object was deleted while there were still
+			       * live references (e.g., sync not yet finished)
+			       */
+   GLenum SyncCondition;
+   GLbitfield Flags;          /**< Flags passed to glFenceSync */
+   GLuint Status:1;           /**< Has the sync object been signaled? */
+};
+
+
 /** Set by #pragma directives */
 struct gl_sl_pragmas
 {
@@ -2435,6 +2449,12 @@ struct gl_constants
 
    GLbitfield SupportedBumpUnits; /**> units supporting GL_ATI_envmap_bumpmap as targets */
 
+   /**
+    * Maximum amount of time, measured in nanseconds, that the server can wait.
+    */
+   GLuint64 MaxServerWaitTimeout;
+
+
    /**< GL_EXT_provoking_vertex */
    GLboolean QuadsFollowProvokingVertexConvention;
 };
@@ -2467,6 +2487,7 @@ struct gl_extensions
    GLboolean ARB_shading_language_120;
    GLboolean ARB_shadow;
    GLboolean ARB_shadow_ambient; /* or GL_ARB_shadow_ambient */
+   GLboolean ARB_sync;
    GLboolean ARB_texture_border_clamp;
    GLboolean ARB_texture_compression;
    GLboolean ARB_texture_cube_map;
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
new file mode 100644
index 0000000000..eeeeb49175
--- /dev/null
+++ b/src/mesa/main/syncobj.c
@@ -0,0 +1,372 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file syncobj.c
+ * Sync object management.
+ *
+ * \author Ian Romanick <ian.d.romanick@intel.com>
+ */
+
+#include "glheader.h"
+#include "hash.h"
+#include "imports.h"
+#include "context.h"
+
+#if FEATURE_ARB_sync
+#include "syncobj.h"
+
+static struct gl_sync_object *
+_mesa_new_sync_object(GLcontext *ctx, GLenum type)
+{
+   struct gl_sync_object *s = MALLOC_STRUCT(gl_sync_object);
+   (void) ctx;
+   (void) type;
+
+   return s;
+}
+
+
+static void
+_mesa_delete_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
+{
+   (void) ctx;
+   _mesa_free(syncObj);
+}
+
+
+static void
+_mesa_fence_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
+		 GLenum condition, GLbitfield flags)
+{
+   (void) ctx;
+   (void) condition;
+   (void) flags;
+
+   syncObj->Status = 1;
+}
+
+
+static void
+_mesa_check_sync(GLcontext *ctx, struct gl_sync_object *syncObj)
+{
+   (void) ctx;
+   (void) syncObj;
+
+   /* No-op for software rendering.  Hardware drivers will need to determine
+    * whether the state of the sync object has changed.
+    */
+}
+
+
+static void
+_mesa_wait_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
+		GLbitfield flags, GLuint64 timeout)
+{
+   (void) ctx;
+   (void) syncObj;
+   (void) flags;
+   (void) timeout;
+
+
+   /* No-op for software rendering.  Hardware drivers will need to wait until
+    * the state of the sync object changes or the timeout expires.
+    */
+}
+
+
+void
+_mesa_init_sync_object_functions(struct dd_function_table *driver)
+{
+   driver->NewSyncObject = _mesa_new_sync_object;
+   driver->FenceSync = _mesa_fence_sync;
+   driver->DeleteSyncObject = _mesa_delete_sync_object;
+   driver->CheckSync = _mesa_check_sync;
+
+   /* Use the same no-op wait function for both.
+    */
+   driver->ClientWaitSync = _mesa_wait_sync;
+   driver->ServerWaitSync = _mesa_wait_sync;
+}
+
+
+/**
+ * Allocate/init the context state related to sync objects.
+ */
+void
+_mesa_init_sync(GLcontext *ctx)
+{
+   (void) ctx;
+}
+
+
+/**
+ * Free the context state related to sync objects.
+ */
+void
+_mesa_free_sync_data(GLcontext *ctx)
+{
+   (void) ctx;
+}
+
+
+GLboolean
+_mesa_IsSync(GLsync sync)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+
+   return ((syncObj != NULL) && (syncObj->Type == GL_SYNC_FENCE))
+      ? GL_TRUE : GL_FALSE;
+}
+
+
+static void
+_mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
+{
+   syncObj->RefCount--;
+   if (syncObj->RefCount == 0) {
+      (*ctx->Driver.DeleteSyncObject)(ctx, syncObj);
+   } else {
+      syncObj->DeletePending = 1;
+   }
+}
+
+
+void
+_mesa_DeleteSync(GLsync sync)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+
+   /* From the GL_ARB_sync spec:
+    *
+    *    DeleteSync will silently ignore a <sync> value of zero. An
+    *    INVALID_VALUE error is generated if <sync> is neither zero nor the
+    *    name of a sync object.
+    */
+   if (sync == 0) {
+      return;
+   }
+
+   if (syncObj->Type != GL_SYNC_FENCE) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glDeleteSync");
+      return;
+   }
+
+
+   /* If there are no client-waits or server-waits pending on this sync, delete
+    * the underlying object.
+    */
+   _mesa_unref_sync_object(ctx, syncObj);
+}
+
+
+
+GLsync
+_mesa_FenceSync(GLenum condition, GLbitfield flags)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_sync_object *syncObj;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
+
+
+   if (condition != GL_SYNC_GPU_COMMANDS_COMPLETE) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glFenceSync(condition=0x%x)",
+		  condition);
+      return 0;
+   }
+
+   if (flags != 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glFenceSync(flags=0x%x)",
+		  condition);
+      return 0;
+   }
+
+   syncObj = (*ctx->Driver.NewSyncObject)(ctx, GL_SYNC_FENCE);
+   if (syncObj != NULL) {
+      syncObj->Type = GL_SYNC_FENCE;
+      /* The name is not currently used, and it is never visible to
+       * applications.  If sync support is extended to provide support for
+       * NV_fence, this field will be used.  We'll also need to add an object
+       * ID hashtable.
+       */
+      syncObj->Name = 1;
+      syncObj->RefCount = 1;
+      syncObj->DeletePending = GL_FALSE;
+      syncObj->SyncCondition = condition;
+      syncObj->Flags = flags;
+      syncObj->Status = 0;
+
+      (*ctx->Driver.FenceSync)(ctx, syncObj, condition, flags);
+
+      return (GLsync) syncObj;
+   }
+
+   return NULL;
+}
+
+
+GLenum
+_mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
+   GLenum ret;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_WAIT_FAILED);
+
+
+   if ((syncObj == NULL) || (syncObj->Type != GL_SYNC_FENCE)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glClientWaitSync");
+      return GL_WAIT_FAILED;
+   }
+
+   if ((flags & ~GL_SYNC_FLUSH_COMMANDS_BIT) != 0) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glClientWaitSync(flags=0x%x)", flags);
+      return GL_WAIT_FAILED;
+   }
+
+
+   /* From the GL_ARB_sync spec:
+    *
+    *    ClientWaitSync returns one of four status values. A return value of
+    *    ALREADY_SIGNALED indicates that <sync> was signaled at the time
+    *    ClientWaitSync was called. ALREADY_SIGNALED will always be returned
+    *    if <sync> was signaled, even if the value of <timeout> is zero.
+    */
+   (*ctx->Driver.CheckSync)(ctx, syncObj);
+
+   if (syncObj->Status) {
+      return GL_ALREADY_SIGNALED;
+   }
+
+
+   (*ctx->Driver.ClientWaitSync)(ctx, syncObj, flags, timeout);
+
+   ret = syncObj->Status ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;
+
+   if (syncObj->DeletePending && syncObj->Status) {
+      _mesa_unref_sync_object(ctx, syncObj);
+   }
+
+   return ret;
+}
+
+
+void
+_mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+
+   if ((syncObj == NULL) || (syncObj->Type != GL_SYNC_FENCE)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glWaitSync");
+      return;
+   }
+
+   if (flags != 0) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glWaitSync(flags=0x%x)", flags);
+      return;
+   }
+
+   /* From the GL_ARB_sync spec:
+    *
+    *     If the value of <timeout> is zero, then WaitSync does nothing.
+    */
+   if (timeout == 0) {
+      return;
+   }
+
+   (*ctx->Driver.ServerWaitSync)(ctx, syncObj, flags, timeout);
+}
+
+
+void
+_mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
+		GLint *values)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
+   GLsizei size = 0;
+   GLint v[1];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+
+   if ((syncObj == NULL) || (syncObj->Type != GL_SYNC_FENCE)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glGetSynciv");
+      return;
+   }
+
+
+   switch (pname) {
+   case GL_OBJECT_TYPE:
+      v[0] = syncObj->Type;
+      size = 1;
+      break;
+
+   case GL_SYNC_CONDITION:
+      v[0] = syncObj->SyncCondition;
+      size = 1;
+      break;
+
+   case GL_SYNC_STATUS:
+      /* Update the state of the sync by dipping into the driver.  Note that
+       * this call won't block.  It just updates state in the common object
+       * data from the current driver state.
+       */
+      (*ctx->Driver.CheckSync)(ctx, syncObj);
+
+      v[0] = (syncObj->Status) ? GL_SIGNALED : GL_UNSIGNALED;
+      size = 1;
+      break;
+
+   case GL_SYNC_FLAGS:
+      v[0] = syncObj->Flags;
+      size = 1;
+      break;
+
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetSynciv(pname=0x%x)\n", pname);
+      return;
+   }
+
+
+   if (size > 0) {
+      const GLsizei copy_count = (size > bufSize) ? bufSize : size;
+
+      _mesa_memcpy(values, v, sizeof(GLint) * copy_count);
+   }
+
+
+   if (length != NULL) {
+      *length = size;
+   }
+}
+
+#endif /* FEATURE_ARB_sync */
diff --git a/src/mesa/main/syncobj.h b/src/mesa/main/syncobj.h
new file mode 100644
index 0000000000..d2b4d051c9
--- /dev/null
+++ b/src/mesa/main/syncobj.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file syncobj.h
+ * Sync object management.
+ *
+ * \author Ian Romanick <ian.d.romanick@intel.com>
+ */
+
+#ifndef SYNCOBJ_H
+#define SYNCOBJ_H
+
+#include "context.h"
+
+extern void
+_mesa_init_sync_object_functions(struct dd_function_table *driver);
+
+extern void
+_mesa_init_sync(GLcontext *);
+
+extern void
+_mesa_free_sync_data(GLcontext *);
+
+extern GLboolean
+_mesa_IsSync(GLsync sync);
+
+extern void
+_mesa_DeleteSync(GLsync sync);
+
+extern GLsync
+_mesa_FenceSync(GLenum condition, GLbitfield flags);
+
+extern GLenum
+_mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
+
+extern void
+_mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout);
+
+extern void
+_mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
+		GLint *values);
+
+#endif /* SYNCOBJ_H */
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 9a9c988ed9..fa2a6307a4 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -61,6 +61,7 @@ MAIN_SOURCES = \
 	main/shared.c \
 	main/state.c \
 	main/stencil.c \
+	main/syncobj.c \
 	main/texcompress.c \
 	main/texcompress_s3tc.c \
 	main/texcompress_fxt1.c \
-- 
cgit v1.2.3


From f5a22721c5731c7a4c20f86d9925d9e58324c7a5 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 31 Aug 2009 14:49:33 -0700
Subject: Add dummy list node type 'struct simple_node'

---
 src/mesa/main/simple_list.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/simple_list.h b/src/mesa/main/simple_list.h
index 63475f6f74..ff7f888238 100644
--- a/src/mesa/main/simple_list.h
+++ b/src/mesa/main/simple_list.h
@@ -37,6 +37,11 @@
 #ifndef _SIMPLE_LIST_H
 #define _SIMPLE_LIST_H
 
+struct simple_node {
+   struct simple_node *next;
+   struct simple_node *prev;
+};
+
 /**
  * Remove an element from list.
  *
-- 
cgit v1.2.3


From 16b393d05990b6e917e144f9de87d0103b4c3e6d Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 31 Aug 2009 14:57:50 -0700
Subject: ARB sync: Fix delete behavior and context destruction behavior

I believe this resolves the outstanding issues WRT sync object
deletetion.  I have also added a large comment at the top of syncobj.c
describing the expected memory management behavior.  I'm still a
little uncertain about the locking on ctx->Shared.
---
 src/mesa/main/mtypes.h  |  6 ++++
 src/mesa/main/shared.c  | 19 +++++++++-
 src/mesa/main/syncobj.c | 96 +++++++++++++++++++++++++++++++++++++------------
 src/mesa/main/syncobj.h |  6 ++++
 4 files changed, 103 insertions(+), 24 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 58da5d15eb..bd3bf28328 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -40,6 +40,7 @@
 #include "main/mfeatures.h"
 #include "glapi/glapi.h"
 #include "math/m_matrix.h"	/* GLmatrix */
+#include "main/simple_list.h"	/* struct simple_node */
 
 
 /**
@@ -1988,6 +1989,7 @@ struct gl_query_state
 
 /** Sync object state */
 struct gl_sync_object {
+   struct simple_node link;
    GLenum Type;               /**< GL_SYNC_FENCE */
    GLuint Name;               /**< Fence name */
    GLint RefCount;            /**< Reference count */
@@ -2145,6 +2147,10 @@ struct gl_shared_state
    struct _mesa_HashTable *FrameBuffers;
 #endif
 
+#if FEATURE_ARB_sync
+   struct simple_node SyncObjects;
+#endif
+
    void *DriverData;  /**< Device driver shared state */
 };
 
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index 93bbccd3c7..643ad3354e 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -43,7 +43,9 @@
 #if FEATURE_ATI_fragment_shader
 #include "shader/atifragshader.h"
 #endif
-
+#if FEATURE_ARB_sync
+#include "syncobj.h"
+#endif
 
 /**
  * Allocate and initialize a shared context state structure.
@@ -127,6 +129,10 @@ _mesa_alloc_shared_state(GLcontext *ctx)
    shared->RenderBuffers = _mesa_NewHashTable();
 #endif
 
+#if FEATURE_ARB_sync
+   make_empty_list(& shared->SyncObjects);
+#endif
+
    return shared;
 }
 
@@ -336,6 +342,17 @@ _mesa_free_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
    ctx->Driver.DeleteBuffer(ctx, shared->NullBufferObj);
 #endif
 
+#if FEATURE_ARB_sync
+   {
+      struct simple_node *node;
+      struct simple_node *temp;
+
+      foreach_s(node, temp, & shared->SyncObjects) {
+	 _mesa_unref_sync_object(ctx, (struct gl_sync_object *) node);
+      }
+   }
+#endif
+
    /*
     * Free texture objects (after FBOs since some textures might have
     * been bound to FBOs).
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index eeeeb49175..0471a0ad7f 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -25,6 +25,33 @@
  * \file syncobj.c
  * Sync object management.
  *
+ * Unlike textures and other objects that are shared between contexts, sync
+ * objects are not bound to the context.  As a result, the reference counting
+ * and delete behavior of sync objects is slightly different.  References to
+ * sync objects are added:
+ *
+ *    - By \c glFencSynce.  This sets the initial reference count to 1.
+ *    - At the start of \c glClientWaitSync.  The reference is held for the
+ *      duration of the wait call.
+ *
+ * References are removed:
+ *
+ *    - By \c glDeleteSync.
+ *    - At the end of \c glClientWaitSync.
+ *
+ * Additionally, drivers may call \c _mesa_ref_sync_object and
+ * \c _mesa_unref_sync_object as needed to implement \c ServerWaitSync.
+ *
+ * As with shader objects, sync object names become invalid as soon as
+ * \c glDeleteSync is called.  For this reason \c glDeleteSync sets the
+ * \c DeletePending flag.  All functions validate object handles by testing
+ * this flag.
+ *
+ * \note
+ * Only \c GL_ARB_sync objects are shared between contexts.  If support is ever
+ * added for either \c GL_NV_fence or \c GL_APPLE_fence different semantics
+ * will need to be implemented.
+ *
  * \author Ian Romanick <ian.d.romanick@intel.com>
  */
 
@@ -130,31 +157,52 @@ _mesa_free_sync_data(GLcontext *ctx)
 }
 
 
-GLboolean
-_mesa_IsSync(GLsync sync)
+static int
+_mesa_validate_sync(struct gl_sync_object *syncObj)
 {
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+   return (syncObj != NULL)
+      && (syncObj->Type == GL_SYNC_FENCE)
+      && !syncObj->DeletePending;
+}
 
 
-   return ((syncObj != NULL) && (syncObj->Type == GL_SYNC_FENCE))
-      ? GL_TRUE : GL_FALSE;
+void
+_mesa_ref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
+{
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+   syncObj->RefCount++;
+   _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
 }
 
 
-static void
+void
 _mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
 {
+   _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
    syncObj->RefCount--;
    if (syncObj->RefCount == 0) {
+      remove_from_list(& syncObj->link);
+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
       (*ctx->Driver.DeleteSyncObject)(ctx, syncObj);
    } else {
-      syncObj->DeletePending = 1;
+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
    }
 }
 
 
+GLboolean
+_mesa_IsSync(GLsync sync)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
+
+
+   return _mesa_validate_sync(syncObj) ? GL_TRUE : GL_FALSE;
+}
+
+
 void
 _mesa_DeleteSync(GLsync sync)
 {
@@ -173,7 +221,7 @@ _mesa_DeleteSync(GLsync sync)
       return;
    }
 
-   if (syncObj->Type != GL_SYNC_FENCE) {
+   if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glDeleteSync");
       return;
    }
@@ -182,6 +230,7 @@ _mesa_DeleteSync(GLsync sync)
    /* If there are no client-waits or server-waits pending on this sync, delete
     * the underlying object.
     */
+   syncObj->DeletePending = GL_TRUE;
    _mesa_unref_sync_object(ctx, syncObj);
 }
 
@@ -224,6 +273,10 @@ _mesa_FenceSync(GLenum condition, GLbitfield flags)
 
       (*ctx->Driver.FenceSync)(ctx, syncObj, condition, flags);
 
+      _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
+      insert_at_tail(& ctx->Shared->SyncObjects, & syncObj->link);
+      _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
+
       return (GLsync) syncObj;
    }
 
@@ -240,7 +293,7 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_WAIT_FAILED);
 
 
-   if ((syncObj == NULL) || (syncObj->Type != GL_SYNC_FENCE)) {
+   if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glClientWaitSync");
       return GL_WAIT_FAILED;
    }
@@ -251,6 +304,8 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
    }
 
 
+   _mesa_ref_sync_object(ctx, syncObj);
+
    /* From the GL_ARB_sync spec:
     *
     *    ClientWaitSync returns one of four status values. A return value of
@@ -259,20 +314,15 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
     *    if <sync> was signaled, even if the value of <timeout> is zero.
     */
    (*ctx->Driver.CheckSync)(ctx, syncObj);
-
    if (syncObj->Status) {
-      return GL_ALREADY_SIGNALED;
-   }
-
-
-   (*ctx->Driver.ClientWaitSync)(ctx, syncObj, flags, timeout);
-
-   ret = syncObj->Status ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;
+      ret = GL_ALREADY_SIGNALED;
+   } else {
+      (*ctx->Driver.ClientWaitSync)(ctx, syncObj, flags, timeout);
 
-   if (syncObj->DeletePending && syncObj->Status) {
-      _mesa_unref_sync_object(ctx, syncObj);
+      ret = syncObj->Status ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;
    }
 
+   _mesa_unref_sync_object(ctx, syncObj);
    return ret;
 }
 
@@ -285,7 +335,7 @@ _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
 
-   if ((syncObj == NULL) || (syncObj->Type != GL_SYNC_FENCE)) {
+   if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glWaitSync");
       return;
    }
@@ -318,7 +368,7 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
 
-   if ((syncObj == NULL) || (syncObj->Type != GL_SYNC_FENCE)) {
+   if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glGetSynciv");
       return;
    }
diff --git a/src/mesa/main/syncobj.h b/src/mesa/main/syncobj.h
index d2b4d051c9..fc160af289 100644
--- a/src/mesa/main/syncobj.h
+++ b/src/mesa/main/syncobj.h
@@ -42,6 +42,12 @@ _mesa_init_sync(GLcontext *);
 extern void
 _mesa_free_sync_data(GLcontext *);
 
+extern void
+_mesa_ref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj);
+
+extern void
+_mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj);
+
 extern GLboolean
 _mesa_IsSync(GLsync sync);
 
-- 
cgit v1.2.3


From 0f8fdd81989de5026c8e415f1525931b74dd8647 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 1 Sep 2009 11:24:54 -0700
Subject: Use MIN2 instead of open-coded version

Based on review comments by Brian Paul.
---
 src/mesa/main/syncobj.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index 0471a0ad7f..cbeda4b384 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -59,6 +59,7 @@
 #include "hash.h"
 #include "imports.h"
 #include "context.h"
+#include "macros.h"
 
 #if FEATURE_ARB_sync
 #include "syncobj.h"
@@ -408,7 +409,7 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
 
 
    if (size > 0) {
-      const GLsizei copy_count = (size > bufSize) ? bufSize : size;
+      const GLsizei copy_count = MIN2(size, bufSize);
 
       _mesa_memcpy(values, v, sizeof(GLint) * copy_count);
    }
-- 
cgit v1.2.3


From 6af24b6b03a2ce8300c7ae78fd06c6b1edd02017 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 1 Sep 2009 11:56:34 -0700
Subject: Whitespace and include file clean-up.

Based on review comments by Brian Paul.
---
 src/mesa/main/syncobj.c | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index cbeda4b384..b3c75c747a 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -56,7 +56,6 @@
  */
 
 #include "glheader.h"
-#include "hash.h"
 #include "imports.h"
 #include "context.h"
 #include "macros.h"
@@ -116,7 +115,6 @@ _mesa_wait_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
    (void) flags;
    (void) timeout;
 
-
    /* No-op for software rendering.  Hardware drivers will need to wait until
     * the state of the sync object changes or the timeout expires.
     */
@@ -199,7 +197,6 @@ _mesa_IsSync(GLsync sync)
    struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
 
-
    return _mesa_validate_sync(syncObj) ? GL_TRUE : GL_FALSE;
 }
 
@@ -211,7 +208,6 @@ _mesa_DeleteSync(GLsync sync)
    struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-
    /* From the GL_ARB_sync spec:
     *
     *    DeleteSync will silently ignore a <sync> value of zero. An
@@ -227,7 +223,6 @@ _mesa_DeleteSync(GLsync sync)
       return;
    }
 
-
    /* If there are no client-waits or server-waits pending on this sync, delete
     * the underlying object.
     */
@@ -236,7 +231,6 @@ _mesa_DeleteSync(GLsync sync)
 }
 
 
-
 GLsync
 _mesa_FenceSync(GLenum condition, GLbitfield flags)
 {
@@ -244,7 +238,6 @@ _mesa_FenceSync(GLenum condition, GLbitfield flags)
    struct gl_sync_object *syncObj;
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
 
-
    if (condition != GL_SYNC_GPU_COMMANDS_COMPLETE) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glFenceSync(condition=0x%x)",
 		  condition);
@@ -293,7 +286,6 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
    GLenum ret;
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_WAIT_FAILED);
 
-
    if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glClientWaitSync");
       return GL_WAIT_FAILED;
@@ -304,7 +296,6 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
       return GL_WAIT_FAILED;
    }
 
-
    _mesa_ref_sync_object(ctx, syncObj);
 
    /* From the GL_ARB_sync spec:
@@ -335,7 +326,6 @@ _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
    struct gl_sync_object *const syncObj = (struct gl_sync_object *) sync;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-
    if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glWaitSync");
       return;
@@ -368,13 +358,11 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
    GLint v[1];
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-
    if (!_mesa_validate_sync(syncObj)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glGetSynciv");
       return;
    }
 
-
    switch (pname) {
    case GL_OBJECT_TYPE:
       v[0] = syncObj->Type;
@@ -407,14 +395,12 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
       return;
    }
 
-
    if (size > 0) {
       const GLsizei copy_count = MIN2(size, bufSize);
 
       _mesa_memcpy(values, v, sizeof(GLint) * copy_count);
    }
 
-
    if (length != NULL) {
       *length = size;
    }
-- 
cgit v1.2.3


From 0342dce226fe79d7a6c0e7cd735c596fad3e8aac Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 1 Sep 2009 11:58:36 -0700
Subject: Don't dereference function pointers in calls.

I'm apparently alone in prefering this calling convention, so I'll be
a team player. :p  Based on review comments by Brian Paul and Eric
Anholt.
---
 src/mesa/main/syncobj.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index b3c75c747a..075931c7ce 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -183,7 +183,7 @@ _mesa_unref_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
       remove_from_list(& syncObj->link);
       _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
 
-      (*ctx->Driver.DeleteSyncObject)(ctx, syncObj);
+      ctx->Driver.DeleteSyncObject(ctx, syncObj);
    } else {
       _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);
    }
@@ -250,7 +250,7 @@ _mesa_FenceSync(GLenum condition, GLbitfield flags)
       return 0;
    }
 
-   syncObj = (*ctx->Driver.NewSyncObject)(ctx, GL_SYNC_FENCE);
+   syncObj = ctx->Driver.NewSyncObject(ctx, GL_SYNC_FENCE);
    if (syncObj != NULL) {
       syncObj->Type = GL_SYNC_FENCE;
       /* The name is not currently used, and it is never visible to
@@ -265,7 +265,7 @@ _mesa_FenceSync(GLenum condition, GLbitfield flags)
       syncObj->Flags = flags;
       syncObj->Status = 0;
 
-      (*ctx->Driver.FenceSync)(ctx, syncObj, condition, flags);
+      ctx->Driver.FenceSync(ctx, syncObj, condition, flags);
 
       _glthread_LOCK_MUTEX(ctx->Shared->Mutex);
       insert_at_tail(& ctx->Shared->SyncObjects, & syncObj->link);
@@ -305,11 +305,11 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
     *    ClientWaitSync was called. ALREADY_SIGNALED will always be returned
     *    if <sync> was signaled, even if the value of <timeout> is zero.
     */
-   (*ctx->Driver.CheckSync)(ctx, syncObj);
+   ctx->Driver.CheckSync(ctx, syncObj);
    if (syncObj->Status) {
       ret = GL_ALREADY_SIGNALED;
    } else {
-      (*ctx->Driver.ClientWaitSync)(ctx, syncObj, flags, timeout);
+      ctx->Driver.ClientWaitSync(ctx, syncObj, flags, timeout);
 
       ret = syncObj->Status ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;
    }
@@ -344,7 +344,7 @@ _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
       return;
    }
 
-   (*ctx->Driver.ServerWaitSync)(ctx, syncObj, flags, timeout);
+   ctx->Driver.ServerWaitSync(ctx, syncObj, flags, timeout);
 }
 
 
@@ -379,7 +379,7 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
        * this call won't block.  It just updates state in the common object
        * data from the current driver state.
        */
-      (*ctx->Driver.CheckSync)(ctx, syncObj);
+      ctx->Driver.CheckSync(ctx, syncObj);
 
       v[0] = (syncObj->Status) ? GL_SIGNALED : GL_UNSIGNALED;
       size = 1;
-- 
cgit v1.2.3


From e059885ce357dee8b847f10e8e8c515a4a20042e Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 3 Sep 2009 12:47:25 -0600
Subject: mesa: rename gl_sync_object::Status to StatusFlag

There's a symbol collision with X11/Xlib.h #define Status int
in the Mesa xlib code.  This seems the simpliest way to work around this.
---
 src/mesa/drivers/dri/intel/intel_syncobj.c |  4 ++--
 src/mesa/main/mtypes.h                     |  2 +-
 src/mesa/main/syncobj.c                    | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/intel/intel_syncobj.c b/src/mesa/drivers/dri/intel/intel_syncobj.c
index d447b6a0fa..1286fe929b 100644
--- a/src/mesa/drivers/dri/intel/intel_syncobj.c
+++ b/src/mesa/drivers/dri/intel/intel_syncobj.c
@@ -94,7 +94,7 @@ static void intel_client_wait_sync(GLcontext *ctx, struct gl_sync_object *s,
 
    if (sync->bo) {
       drm_intel_bo_wait_rendering(sync->bo);
-      s->Status = 1;
+      s->StatusFlag = 1;
       drm_intel_bo_unreference(sync->bo);
       sync->bo = NULL;
    }
@@ -117,7 +117,7 @@ static void intel_check_sync(GLcontext *ctx, struct gl_sync_object *s)
    if (sync->bo && drm_intel_bo_busy(sync->bo)) {
       drm_intel_bo_unreference(sync->bo);
       sync->bo = NULL;
-      s->Status = 1;
+      s->StatusFlag = 1;
    }
 }
 
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index bd3bf28328..6b64bf8139 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1998,7 +1998,7 @@ struct gl_sync_object {
 			       */
    GLenum SyncCondition;
    GLbitfield Flags;          /**< Flags passed to glFenceSync */
-   GLuint Status:1;           /**< Has the sync object been signaled? */
+   GLuint StatusFlag:1;       /**< Has the sync object been signaled? */
 };
 
 
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index 075931c7ce..64f923ff91 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -90,7 +90,7 @@ _mesa_fence_sync(GLcontext *ctx, struct gl_sync_object *syncObj,
    (void) condition;
    (void) flags;
 
-   syncObj->Status = 1;
+   syncObj->StatusFlag = 1;
 }
 
 
@@ -263,7 +263,7 @@ _mesa_FenceSync(GLenum condition, GLbitfield flags)
       syncObj->DeletePending = GL_FALSE;
       syncObj->SyncCondition = condition;
       syncObj->Flags = flags;
-      syncObj->Status = 0;
+      syncObj->StatusFlag = 0;
 
       ctx->Driver.FenceSync(ctx, syncObj, condition, flags);
 
@@ -306,12 +306,12 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
     *    if <sync> was signaled, even if the value of <timeout> is zero.
     */
    ctx->Driver.CheckSync(ctx, syncObj);
-   if (syncObj->Status) {
+   if (syncObj->StatusFlag) {
       ret = GL_ALREADY_SIGNALED;
    } else {
       ctx->Driver.ClientWaitSync(ctx, syncObj, flags, timeout);
 
-      ret = syncObj->Status ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;
+      ret = syncObj->StatusFlag ? GL_CONDITION_SATISFIED : GL_TIMEOUT_EXPIRED;
    }
 
    _mesa_unref_sync_object(ctx, syncObj);
@@ -381,7 +381,7 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
        */
       ctx->Driver.CheckSync(ctx, syncObj);
 
-      v[0] = (syncObj->Status) ? GL_SIGNALED : GL_UNSIGNALED;
+      v[0] = (syncObj->StatusFlag) ? GL_SIGNALED : GL_UNSIGNALED;
       size = 1;
       break;
 
-- 
cgit v1.2.3