xwininfo libX11 libXmu libxcb mesa xserver xkeyboard-config git update 29

aug 2011

22 files changed, 5782 insertions, 5761 deletions

diff --git a/mesalib/src/mesa/main/api_arrayelt.c b/mesalib/src/mesa/main/api_arrayelt.c
index f88da8458..b93a057e6 100644
--- a/mesalib/src/mesa/main/api_arrayelt.c
+++ b/mesalib/src/mesa/main/api_arrayelt.c
@@ -1602,10 +1602,10 @@ void _ae_map_vbos( struct gl_context *ctx )
       _ae_update_state(ctx);
 
    for (i = 0; i < actx->nr_vbos; i++)
-      ctx->Driver.MapBuffer(ctx,
-			    GL_ARRAY_BUFFER_ARB,
-			    GL_DYNAMIC_DRAW_ARB,
-			    actx->vbo[i]);
+      ctx->Driver.MapBufferRange(ctx, 0,
+				 actx->vbo[i]->Size,
+				 GL_MAP_READ_BIT,
+				 actx->vbo[i]);
 
    if (actx->nr_vbos)
       actx->mapped_vbos = GL_TRUE;
@@ -1622,9 +1622,7 @@ void _ae_unmap_vbos( struct gl_context *ctx )
    assert (!actx->NewState);
 
    for (i = 0; i < actx->nr_vbos; i++)
-      ctx->Driver.UnmapBuffer(ctx,
-			      GL_ARRAY_BUFFER_ARB,
-			      actx->vbo[i]);
+      ctx->Driver.UnmapBuffer(ctx, actx->vbo[i]);
 
    actx->mapped_vbos = GL_FALSE;
 }
diff --git a/mesalib/src/mesa/main/api_validate.c b/mesalib/src/mesa/main/api_validate.c
index 2981d4229..699b414f5 100644
--- a/mesalib/src/mesa/main/api_validate.c
+++ b/mesalib/src/mesa/main/api_validate.c
@@ -65,8 +65,8 @@ _mesa_max_buffer_index(struct gl_context *ctx, GLuint count, GLenum type,
 
    if (_mesa_is_bufferobj(elementBuf)) {
       /* elements are in a user-defined buffer object.  need to map it */
-      map = ctx->Driver.MapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER,
-                                  GL_READ_ONLY, elementBuf);
+      map = ctx->Driver.MapBufferRange(ctx, 0, elementBuf->Size,
+				       GL_MAP_READ_BIT, elementBuf);
       /* Actual address is the sum of pointers */
       indices = (const GLvoid *) ADD_POINTERS(map, (const GLubyte *) indices);
    }
@@ -89,7 +89,7 @@ _mesa_max_buffer_index(struct gl_context *ctx, GLuint count, GLenum type,
    }
 
    if (map) {
-      ctx->Driver.UnmapBuffer(ctx, GL_ELEMENT_ARRAY_BUFFER_ARB, elementBuf);
+      ctx->Driver.UnmapBuffer(ctx, elementBuf);
    }
 
    return max;
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index c52358ecb..c453f9c85 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -386,11 +386,11 @@ _mesa_buffer_data( struct gl_context *ctx, GLenum target, GLsizeiptrARB size,
  * \sa glBufferSubDataARB, dd_function_table::BufferSubData.
  */
 static void
-_mesa_buffer_subdata( struct gl_context *ctx, GLenum target, GLintptrARB offset,
+_mesa_buffer_subdata( struct gl_context *ctx, GLintptrARB offset,
 		      GLsizeiptrARB size, const GLvoid * data,
 		      struct gl_buffer_object * bufObj )
 {
-   (void) ctx; (void) target;
+   (void) ctx;
 
    /* this should have been caught in _mesa_BufferSubData() */
    ASSERT(size + offset <= bufObj->Size);
@@ -419,12 +419,11 @@ _mesa_buffer_subdata( struct gl_context *ctx, GLenum target, GLintptrARB offset,
  * \sa glBufferGetSubDataARB, dd_function_table::GetBufferSubData.
  */
 static void
-_mesa_buffer_get_subdata( struct gl_context *ctx,
-                          GLenum target, GLintptrARB offset,
+_mesa_buffer_get_subdata( struct gl_context *ctx, GLintptrARB offset,
 			  GLsizeiptrARB size, GLvoid * data,
 			  struct gl_buffer_object * bufObj )
 {
-   (void) ctx; (void) target;
+   (void) ctx;
 
    if (bufObj->Data && ((GLsizeiptrARB) (size + offset) <= bufObj->Size)) {
       memcpy( data, (GLubyte *) bufObj->Data + offset, size );
@@ -433,49 +432,15 @@ _mesa_buffer_get_subdata( struct gl_context *ctx,
 
 
 /**
- * Default callback for \c dd_function_tabel::MapBuffer().
- *
- * The function parameters will have been already tested for errors.
- *
- * \param ctx     GL context.
- * \param target  Buffer object target on which to operate.
- * \param access  Information about how the buffer will be accessed.
- * \param bufObj  Object to be mapped.
- * \return  A pointer to the object's internal data store that can be accessed
- *          by the processor
- *
- * \sa glMapBufferARB, dd_function_table::MapBuffer
- */
-static void *
-_mesa_buffer_map( struct gl_context *ctx, GLenum target, GLenum access,
-		  struct gl_buffer_object *bufObj )
-{
-   (void) ctx;
-   (void) target;
-   (void) access;
-   /* Just return a direct pointer to the data */
-   if (_mesa_bufferobj_mapped(bufObj)) {
-      /* already mapped! */
-      return NULL;
-   }
-   bufObj->Pointer = bufObj->Data;
-   bufObj->Length = bufObj->Size;
-   bufObj->Offset = 0;
-   return bufObj->Pointer;
-}
-
-
-/**
  * Default fallback for \c dd_function_table::MapBufferRange().
  * Called via glMapBufferRange().
  */
 static void *
-_mesa_buffer_map_range( struct gl_context *ctx, GLenum target, GLintptr offset,
+_mesa_buffer_map_range( struct gl_context *ctx, GLintptr offset,
                         GLsizeiptr length, GLbitfield access,
                         struct gl_buffer_object *bufObj )
 {
    (void) ctx;
-   (void) target;
    assert(!_mesa_bufferobj_mapped(bufObj));
    /* Just return a direct pointer to the data */
    bufObj->Pointer = bufObj->Data + offset;
@@ -491,12 +456,11 @@ _mesa_buffer_map_range( struct gl_context *ctx, GLenum target, GLintptr offset,
  * Called via glFlushMappedBufferRange().
  */
 static void
-_mesa_buffer_flush_mapped_range( struct gl_context *ctx, GLenum target, 
+_mesa_buffer_flush_mapped_range( struct gl_context *ctx,
                                  GLintptr offset, GLsizeiptr length,
                                  struct gl_buffer_object *obj )
 {
    (void) ctx;
-   (void) target;
    (void) offset;
    (void) length;
    (void) obj;
@@ -512,11 +476,9 @@ _mesa_buffer_flush_mapped_range( struct gl_context *ctx, GLenum target,
  * \sa glUnmapBufferARB, dd_function_table::UnmapBuffer
  */
 static GLboolean
-_mesa_buffer_unmap( struct gl_context *ctx, GLenum target,
-                    struct gl_buffer_object *bufObj )
+_mesa_buffer_unmap( struct gl_context *ctx, struct gl_buffer_object *bufObj )
 {
    (void) ctx;
-   (void) target;
    /* XXX we might assert here that bufObj->Pointer is non-null */
    bufObj->Pointer = NULL;
    bufObj->Length = 0;
@@ -543,16 +505,16 @@ _mesa_copy_buffer_subdata(struct gl_context *ctx,
    assert(!_mesa_bufferobj_mapped(src));
    assert(!_mesa_bufferobj_mapped(dst));
 
-   srcPtr = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_COPY_READ_BUFFER,
-                                              GL_READ_ONLY, src);
-   dstPtr = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_COPY_WRITE_BUFFER,
-                                              GL_WRITE_ONLY, dst);
+   srcPtr = (GLubyte *) ctx->Driver.MapBufferRange(ctx, 0, src->Size,
+						   GL_MAP_READ_BIT, src);
+   dstPtr = (GLubyte *) ctx->Driver.MapBufferRange(ctx, 0, dst->Size,
+						   GL_MAP_WRITE_BIT, dst);
 
    if (srcPtr && dstPtr)
       memcpy(dstPtr + writeOffset, srcPtr + readOffset, size);
 
-   ctx->Driver.UnmapBuffer(ctx, GL_COPY_READ_BUFFER, src);
-   ctx->Driver.UnmapBuffer(ctx, GL_COPY_WRITE_BUFFER, dst);
+   ctx->Driver.UnmapBuffer(ctx, src);
+   ctx->Driver.UnmapBuffer(ctx, dst);
 }
 
 
@@ -712,7 +674,6 @@ _mesa_init_buffer_object_functions(struct dd_function_table *driver)
    driver->BufferData = _mesa_buffer_data;
    driver->BufferSubData = _mesa_buffer_subdata;
    driver->GetBufferSubData = _mesa_buffer_get_subdata;
-   driver->MapBuffer = _mesa_buffer_map;
    driver->UnmapBuffer = _mesa_buffer_unmap;
 
    /* GL_ARB_map_buffer_range */
@@ -774,7 +735,7 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
 
          if (_mesa_bufferobj_mapped(bufObj)) {
             /* if mapped, unmap it now */
-            ctx->Driver.UnmapBuffer(ctx, 0, bufObj);
+            ctx->Driver.UnmapBuffer(ctx, bufObj);
             bufObj->AccessFlags = DEFAULT_ACCESS;
             bufObj->Pointer = NULL;
          }
@@ -934,7 +895,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
    
    if (_mesa_bufferobj_mapped(bufObj)) {
       /* Unmap the existing buffer.  We'll replace it now.  Not an error. */
-      ctx->Driver.UnmapBuffer(ctx, target, bufObj);
+      ctx->Driver.UnmapBuffer(ctx, bufObj);
       bufObj->AccessFlags = DEFAULT_ACCESS;
       ASSERT(bufObj->Pointer == NULL);
    }  
@@ -980,7 +941,7 @@ _mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,
    bufObj->Written = GL_TRUE;
 
    ASSERT(ctx->Driver.BufferSubData);
-   ctx->Driver.BufferSubData( ctx, target, offset, size, data, bufObj );
+   ctx->Driver.BufferSubData( ctx, offset, size, data, bufObj );
 }
 
 
@@ -1000,7 +961,7 @@ _mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,
    }
 
    ASSERT(ctx->Driver.GetBufferSubData);
-   ctx->Driver.GetBufferSubData( ctx, target, offset, size, data, bufObj );
+   ctx->Driver.GetBufferSubData( ctx, offset, size, data, bufObj );
 }
 
 
@@ -1043,8 +1004,8 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
       return NULL;
    }
 
-   ASSERT(ctx->Driver.MapBuffer);
-   map = ctx->Driver.MapBuffer( ctx, target, access, bufObj );
+   ASSERT(ctx->Driver.MapBufferRange);
+   map = ctx->Driver.MapBufferRange(ctx, 0, bufObj->Size, accessFlags, bufObj);
    if (!map) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(map failed)");
       return NULL;
@@ -1147,7 +1108,7 @@ _mesa_UnmapBufferARB(GLenum target)
    }
 #endif
 
-   status = ctx->Driver.UnmapBuffer( ctx, target, bufObj );
+   status = ctx->Driver.UnmapBuffer( ctx, bufObj );
    bufObj->AccessFlags = DEFAULT_ACCESS;
    ASSERT(bufObj->Pointer == NULL);
    ASSERT(bufObj->Offset == 0);
@@ -1451,8 +1412,7 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
    }
       
    ASSERT(ctx->Driver.MapBufferRange);
-   map = ctx->Driver.MapBufferRange(ctx, target, offset, length,
-                                    access, bufObj);
+   map = ctx->Driver.MapBufferRange(ctx, offset, length, access, bufObj);
    if (!map) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMapBufferARB(map failed)");
    }
@@ -1535,7 +1495,7 @@ _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
    ASSERT(bufObj->AccessFlags & GL_MAP_WRITE_BIT);
 
    if (ctx->Driver.FlushMappedBufferRange)
-      ctx->Driver.FlushMappedBufferRange(ctx, target, offset, length, bufObj);
+      ctx->Driver.FlushMappedBufferRange(ctx, offset, length, bufObj);
 }
 
 
diff --git a/mesalib/src/mesa/main/compiler.h b/mesalib/src/mesa/main/compiler.h
index ee7d0b2f8..8ed1c6fa6 100644
--- a/mesalib/src/mesa/main/compiler.h
+++ b/mesalib/src/mesa/main/compiler.h
@@ -45,9 +45,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#if defined(__linux__) && defined(__i386__)
-#include <fpu_control.h>
-#endif
 #include <float.h>
 #include <stdarg.h>
 
diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h
index e0c5844e1..fcf40ecf1 100644
--- a/mesalib/src/mesa/main/dd.h
+++ b/mesalib/src/mesa/main/dd.h
@@ -194,7 +194,7 @@ struct dd_function_table {
     * cases, srcFormat and srcType can be GL_NONE.
     * Called by glTexImage(), etc.
     */
-   GLuint (*ChooseTextureFormat)( struct gl_context *ctx, GLint internalFormat,
+   gl_format (*ChooseTextureFormat)( struct gl_context *ctx, GLint internalFormat,
                                      GLenum srcFormat, GLenum srcType );
 
    /**
@@ -698,17 +698,14 @@ struct dd_function_table {
                             const GLvoid *data, GLenum usage,
                             struct gl_buffer_object *obj );
 
-   void (*BufferSubData)( struct gl_context *ctx, GLenum target, GLintptrARB offset,
+   void (*BufferSubData)( struct gl_context *ctx, GLintptrARB offset,
 			  GLsizeiptrARB size, const GLvoid *data,
 			  struct gl_buffer_object *obj );
 
-   void (*GetBufferSubData)( struct gl_context *ctx, GLenum target,
+   void (*GetBufferSubData)( struct gl_context *ctx,
 			     GLintptrARB offset, GLsizeiptrARB size,
 			     GLvoid *data, struct gl_buffer_object *obj );
 
-   void * (*MapBuffer)( struct gl_context *ctx, GLenum target, GLenum access,
-			struct gl_buffer_object *obj );
-
    void (*CopyBufferSubData)( struct gl_context *ctx,
                               struct gl_buffer_object *src,
                               struct gl_buffer_object *dst,
@@ -717,15 +714,15 @@ struct dd_function_table {
 
    /* May return NULL if MESA_MAP_NOWAIT_BIT is set in access:
     */
-   void * (*MapBufferRange)( struct gl_context *ctx, GLenum target, GLintptr offset,
+   void * (*MapBufferRange)( struct gl_context *ctx, GLintptr offset,
                              GLsizeiptr length, GLbitfield access,
                              struct gl_buffer_object *obj);
 
-   void (*FlushMappedBufferRange)(struct gl_context *ctx, GLenum target, 
+   void (*FlushMappedBufferRange)(struct gl_context *ctx,
                                   GLintptr offset, GLsizeiptr length,
                                   struct gl_buffer_object *obj);
 
-   GLboolean (*UnmapBuffer)( struct gl_context *ctx, GLenum target,
+   GLboolean (*UnmapBuffer)( struct gl_context *ctx,
 			     struct gl_buffer_object *obj );
    /*@}*/
 
diff --git a/mesalib/src/mesa/main/debug.c b/mesalib/src/mesa/main/debug.c
index 99030ac8e..b1fc096f2 100644
--- a/mesalib/src/mesa/main/debug.c
+++ b/mesalib/src/mesa/main/debug.c
@@ -1,634 +1,623 @@
-/*

- * Mesa 3-D graphics library

- * Version:  6.5

- *

- * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.

- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.

- *

- * 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 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

- * BRIAN PAUL 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.

- */

-

-#include "mtypes.h"

-#include "attrib.h"

-#include "colormac.h"

-#include "enums.h"

-#include "formats.h"

-#include "hash.h"

-#include "imports.h"

-#include "debug.h"

-#include "get.h"

-#include "pixelstore.h"

-#include "readpix.h"

-#include "texobj.h"

-

-

-static const char *

-tex_target_name(GLenum tgt)

-{

-   static const struct {

-      GLenum target;

-      const char *name;

-   } tex_targets[] = {

-      { GL_TEXTURE_1D, "GL_TEXTURE_1D" },

-      { GL_TEXTURE_2D, "GL_TEXTURE_2D" },

-      { GL_TEXTURE_3D, "GL_TEXTURE_3D" },

-      { GL_TEXTURE_CUBE_MAP, "GL_TEXTURE_CUBE_MAP" },

-      { GL_TEXTURE_RECTANGLE, "GL_TEXTURE_RECTANGLE" },

-      { GL_TEXTURE_1D_ARRAY_EXT, "GL_TEXTURE_1D_ARRAY" },

-      { GL_TEXTURE_2D_ARRAY_EXT, "GL_TEXTURE_2D_ARRAY" }

-   };

-   GLuint i;

-   for (i = 0; i < Elements(tex_targets); i++) {

-      if (tex_targets[i].target == tgt)

-         return tex_targets[i].name;

-   }

-   return "UNKNOWN TEX TARGET";

-}

-

-

-void

-_mesa_print_state( const char *msg, GLuint state )

-{

-   _mesa_debug(NULL,

-	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",

-	   msg,

-	   state,

-	   (state & _NEW_MODELVIEW)       ? "ctx->ModelView, " : "",

-	   (state & _NEW_PROJECTION)      ? "ctx->Projection, " : "",

-	   (state & _NEW_TEXTURE_MATRIX)  ? "ctx->TextureMatrix, " : "",

-	   (state & _NEW_COLOR)           ? "ctx->Color, " : "",

-	   (state & _NEW_DEPTH)           ? "ctx->Depth, " : "",

-	   (state & _NEW_EVAL)            ? "ctx->Eval/EvalMap, " : "",

-	   (state & _NEW_FOG)             ? "ctx->Fog, " : "",

-	   (state & _NEW_HINT)            ? "ctx->Hint, " : "",

-	   (state & _NEW_LIGHT)           ? "ctx->Light, " : "",

-	   (state & _NEW_LINE)            ? "ctx->Line, " : "",

-	   (state & _NEW_PIXEL)           ? "ctx->Pixel, " : "",

-	   (state & _NEW_POINT)           ? "ctx->Point, " : "",

-	   (state & _NEW_POLYGON)         ? "ctx->Polygon, " : "",

-	   (state & _NEW_POLYGONSTIPPLE)  ? "ctx->PolygonStipple, " : "",

-	   (state & _NEW_SCISSOR)         ? "ctx->Scissor, " : "",

-	   (state & _NEW_STENCIL)         ? "ctx->Stencil, " : "",

-	   (state & _NEW_TEXTURE)         ? "ctx->Texture, " : "",

-	   (state & _NEW_TRANSFORM)       ? "ctx->Transform, " : "",

-	   (state & _NEW_VIEWPORT)        ? "ctx->Viewport, " : "",

-	   (state & _NEW_PACKUNPACK)      ? "ctx->Pack/Unpack, " : "",

-	   (state & _NEW_ARRAY)           ? "ctx->Array, " : "",

-	   (state & _NEW_RENDERMODE)      ? "ctx->RenderMode, " : "",

-	   (state & _NEW_BUFFERS)         ? "ctx->Visual, ctx->DrawBuffer,, " : "");

-}

-

-

-

-void

-_mesa_print_tri_caps( const char *name, GLuint flags )

-{

-   _mesa_debug(NULL,

-	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s\n",

-	   name,

-	   flags,

-	   (flags & DD_FLATSHADE)           ? "flat-shade, " : "",

-	   (flags & DD_SEPARATE_SPECULAR)   ? "separate-specular, " : "",

-	   (flags & DD_TRI_LIGHT_TWOSIDE)   ? "tri-light-twoside, " : "",

-	   (flags & DD_TRI_TWOSTENCIL)      ? "tri-twostencil, " : "",

-	   (flags & DD_TRI_UNFILLED)        ? "tri-unfilled, " : "",

-	   (flags & DD_TRI_STIPPLE)         ? "tri-stipple, " : "",

-	   (flags & DD_TRI_OFFSET)          ? "tri-offset, " : "",

-	   (flags & DD_TRI_SMOOTH)          ? "tri-smooth, " : "",

-	   (flags & DD_LINE_SMOOTH)         ? "line-smooth, " : "",

-	   (flags & DD_LINE_STIPPLE)        ? "line-stipple, " : "",

-	   (flags & DD_POINT_SMOOTH)        ? "point-smooth, " : "",

-	   (flags & DD_POINT_ATTEN)         ? "point-atten, " : "",

-	   (flags & DD_TRI_CULL_FRONT_BACK) ? "cull-all, " : ""

-      );

-}

-

-

-/**

- * Print information about this Mesa version and build options.

- */

-void _mesa_print_info( void )

-{

-   _mesa_debug(NULL, "Mesa GL_VERSION = %s\n",

-	   (char *) _mesa_GetString(GL_VERSION));

-   _mesa_debug(NULL, "Mesa GL_RENDERER = %s\n",

-	   (char *) _mesa_GetString(GL_RENDERER));

-   _mesa_debug(NULL, "Mesa GL_VENDOR = %s\n",

-	   (char *) _mesa_GetString(GL_VENDOR));

-   _mesa_debug(NULL, "Mesa GL_EXTENSIONS = %s\n",

-	   (char *) _mesa_GetString(GL_EXTENSIONS));

-#if defined(THREADS)

-   _mesa_debug(NULL, "Mesa thread-safe: YES\n");

-#else

-   _mesa_debug(NULL, "Mesa thread-safe: NO\n");

-#endif

-#if defined(USE_X86_ASM)

-   _mesa_debug(NULL, "Mesa x86-optimized: YES\n");

-#else

-   _mesa_debug(NULL, "Mesa x86-optimized: NO\n");

-#endif

-#if defined(USE_SPARC_ASM)

-   _mesa_debug(NULL, "Mesa sparc-optimized: YES\n");

-#else

-   _mesa_debug(NULL, "Mesa sparc-optimized: NO\n");

-#endif

-}

-

-

-/**

- * Set the debugging flags.

- *

- * \param debug debug string

- *

- * If compiled with debugging support then search for keywords in \p debug and

- * enables the verbose debug output of the respective feature.

- */

-static void add_debug_flags( const char *debug )

-{

-#ifdef DEBUG

-   struct debug_option {

-      const char *name;

-      GLbitfield flag;

-   };

-   static const struct debug_option debug_opt[] = {

-      { "varray",    VERBOSE_VARRAY },

-      { "tex",       VERBOSE_TEXTURE },

-      { "mat",       VERBOSE_MATERIAL },

-      { "pipe",      VERBOSE_PIPELINE },

-      { "driver",    VERBOSE_DRIVER },

-      { "state",     VERBOSE_STATE },

-      { "api",       VERBOSE_API },

-      { "list",      VERBOSE_DISPLAY_LIST },

-      { "lighting",  VERBOSE_LIGHTING },

-      { "disassem",  VERBOSE_DISASSEM },

-      { "draw",      VERBOSE_DRAW },

-      { "swap",      VERBOSE_SWAPBUFFERS }

-   };

-   GLuint i;

-

-   MESA_VERBOSE = 0x0;

-   for (i = 0; i < Elements(debug_opt); i++) {

-      if (strstr(debug, debug_opt[i].name) || strcmp(debug, "all") == 0)

-         MESA_VERBOSE |= debug_opt[i].flag;

-   }

-

-   /* Debug flag:

-    */

-   if (strstr(debug, "flush"))

-      MESA_DEBUG_FLAGS |= DEBUG_ALWAYS_FLUSH;

-

-#if defined(_FPU_GETCW) && defined(_FPU_SETCW)

-   if (strstr(debug, "fpexceptions")) {

-      /* raise FP exceptions */

-      fpu_control_t mask;

-      _FPU_GETCW(mask);

-      mask &= ~(_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM

-                | _FPU_MASK_OM | _FPU_MASK_UM);

-      _FPU_SETCW(mask);

-   }

-#endif

-

-#else

-   (void) debug;

-#endif

-}

-

-

-void 

-_mesa_init_debug( struct gl_context *ctx )

-{

-   char *c;

-   c = _mesa_getenv("MESA_DEBUG");

-   if (c)

-      add_debug_flags(c);

-

-   c = _mesa_getenv("MESA_VERBOSE");

-   if (c)

-      add_debug_flags(c);

-}

-

-

-/*

- * Write ppm file

- */

-static void

-write_ppm(const char *filename, const GLubyte *buffer, int width, int height,

-          int comps, int rcomp, int gcomp, int bcomp, GLboolean invert)

-{

-   FILE *f = fopen( filename, "w" );

-   if (f) {

-      int x, y;

-      const GLubyte *ptr = buffer;

-      fprintf(f,"P6\n");

-      fprintf(f,"# ppm-file created by osdemo.c\n");

-      fprintf(f,"%i %i\n", width,height);

-      fprintf(f,"255\n");

-      fclose(f);

-      f = fopen( filename, "ab" );  /* reopen in binary append mode */

-      for (y=0; y < height; y++) {

-         for (x = 0; x < width; x++) {

-            int yy = invert ? (height - 1 - y) : y;

-            int i = (yy * width + x) * comps;

-            fputc(ptr[i+rcomp], f); /* write red */

-            fputc(ptr[i+gcomp], f); /* write green */

-            fputc(ptr[i+bcomp], f); /* write blue */

-         }

-      }

-      fclose(f);

-   }

-   else {

-      fprintf(stderr, "Unable to create %s in write_ppm()\n", filename);

-   }

-}

-

-

-/**

- * Write a texture image to a ppm file.

- * \param face  cube face in [0,5]

- * \param level  mipmap level

- */

-static void

-write_texture_image(struct gl_texture_object *texObj,

-                    GLuint face, GLuint level)

-{

-   struct gl_texture_image *img = texObj->Image[face][level];

-   if (img) {

-      GET_CURRENT_CONTEXT(ctx);

-      struct gl_pixelstore_attrib store;

-      GLubyte *buffer;

-      char s[100];

-

-      buffer = (GLubyte *) malloc(img->Width * img->Height

-                                        * img->Depth * 4);

-

-      store = ctx->Pack; /* save */

-      ctx->Pack = ctx->DefaultPacking;

-

-      ctx->Driver.GetTexImage(ctx, texObj->Target, level,

-                              GL_RGBA, GL_UNSIGNED_BYTE,

-                              buffer, texObj, img);

-

-      /* make filename */

-      _mesa_snprintf(s, sizeof(s), "/tmp/tex%u.l%u.f%u.ppm", texObj->Name, level, face);

-

-      printf("  Writing image level %u to %s\n", level, s);

-      write_ppm(s, buffer, img->Width, img->Height, 4, 0, 1, 2, GL_FALSE);

-

-      ctx->Pack = store; /* restore */

-

-      free(buffer);

-   }

-}

-

-

-/**

- * Write renderbuffer image to a ppm file.

- */

-void

-_mesa_write_renderbuffer_image(const struct gl_renderbuffer *rb)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLubyte *buffer;

-   char s[100];

-   GLenum format, type;

-

-   if (rb->_BaseFormat == GL_RGB || 

-       rb->_BaseFormat == GL_RGBA) {

-      format = GL_RGBA;

-      type = GL_UNSIGNED_BYTE;

-   }

-   else if (rb->_BaseFormat == GL_DEPTH_STENCIL) {

-      format = GL_DEPTH_STENCIL;

-      type = GL_UNSIGNED_INT_24_8;

-   }

-   else {

-      _mesa_debug(NULL,

-                  "Unsupported BaseFormat 0x%x in "

-                  "_mesa_write_renderbuffer_image()\n",

-                  rb->_BaseFormat);

-      return;

-   }

-

-   buffer = (GLubyte *) malloc(rb->Width * rb->Height * 4);

-

-   ctx->Driver.ReadPixels(ctx, 0, 0, rb->Width, rb->Height,

-                          format, type, &ctx->DefaultPacking, buffer);

-

-   /* make filename */

-   _mesa_snprintf(s, sizeof(s), "/tmp/renderbuffer%u.ppm", rb->Name);

-   _mesa_snprintf(s, sizeof(s), "C:\\renderbuffer%u.ppm", rb->Name);

-

-   printf("  Writing renderbuffer image to %s\n", s);

-

-   _mesa_debug(NULL, "  Writing renderbuffer image to %s\n", s);

-

-   write_ppm(s, buffer, rb->Width, rb->Height, 4, 0, 1, 2, GL_TRUE);

-

-   free(buffer);

-}

-

-

-/** How many texture images (mipmap levels, faces) to write to files */

-#define WRITE_NONE 0

-#define WRITE_ONE  1

-#define WRITE_ALL  2

-

-static GLuint WriteImages;

-

-

-static void

-dump_texture(struct gl_texture_object *texObj, GLuint writeImages)

-{

-   const GLuint numFaces = texObj->Target == GL_TEXTURE_CUBE_MAP ? 6 : 1;

-   GLboolean written = GL_FALSE;

-   GLuint i, j;

-

-   printf("Texture %u\n", texObj->Name);

-   printf("  Target %s\n", tex_target_name(texObj->Target));

-   for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {

-      for (j = 0; j < numFaces; j++) {

-         struct gl_texture_image *texImg = texObj->Image[j][i];

-         if (texImg) {

-            printf("  Face %u level %u: %d x %d x %d, format %s at %p\n",

-		   j, i,

-		   texImg->Width, texImg->Height, texImg->Depth,

-		   _mesa_get_format_name(texImg->TexFormat),

-		   texImg->Data);

-            if (writeImages == WRITE_ALL ||

-                (writeImages == WRITE_ONE && !written)) {

-               write_texture_image(texObj, j, i);

-               written = GL_TRUE;

-            }

-         }

-      }

-   }

-}

-

-

-/**

- * Dump a single texture.

- */

-void

-_mesa_dump_texture(GLuint texture, GLuint writeImages)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   struct gl_texture_object *texObj = _mesa_lookup_texture(ctx, texture);

-   if (texObj) {

-      dump_texture(texObj, writeImages);

-   }

-}

-

-

-static void

-dump_texture_cb(GLuint id, void *data, void *userData)

-{

-   struct gl_texture_object *texObj = (struct gl_texture_object *) data;

-   (void) userData;

-   dump_texture(texObj, WriteImages);

-}

-

-

-/**

- * Print basic info about all texture objext to stdout.

- * If dumpImages is true, write PPM of level[0] image to a file.

- */

-void

-_mesa_dump_textures(GLuint writeImages)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   WriteImages = writeImages;

-   _mesa_HashWalk(ctx->Shared->TexObjects, dump_texture_cb, ctx);

-}

-

-

-static void

-dump_renderbuffer(const struct gl_renderbuffer *rb, GLboolean writeImage)

-{

-   printf("Renderbuffer %u: %u x %u  IntFormat = %s\n",

-	  rb->Name, rb->Width, rb->Height,

-	  _mesa_lookup_enum_by_nr(rb->InternalFormat));

-   if (writeImage) {

-      _mesa_write_renderbuffer_image(rb);

-   }

-}

-

-

-static void

-dump_renderbuffer_cb(GLuint id, void *data, void *userData)

-{

-   const struct gl_renderbuffer *rb = (const struct gl_renderbuffer *) data;

-   (void) userData;

-   dump_renderbuffer(rb, WriteImages);

-}

-

-

-/**

- * Print basic info about all renderbuffers to stdout.

- * If dumpImages is true, write PPM of level[0] image to a file.

- */

-void

-_mesa_dump_renderbuffers(GLboolean writeImages)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   WriteImages = writeImages;

-   _mesa_HashWalk(ctx->Shared->RenderBuffers, dump_renderbuffer_cb, ctx);

-}

-

-

-

-void

-_mesa_dump_color_buffer(const char *filename)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   const GLuint w = ctx->DrawBuffer->Width;

-   const GLuint h = ctx->DrawBuffer->Height;

-   GLubyte *buf;

-

-   buf = (GLubyte *) malloc(w * h * 4);

-

-   _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);

-   _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);

-   _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);

-

-   _mesa_ReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, buf);

-

-   printf("ReadBuffer %p 0x%x  DrawBuffer %p 0x%x\n",

-	  (void *) ctx->ReadBuffer->_ColorReadBuffer,

-	  ctx->ReadBuffer->ColorReadBuffer,

-	  (void *) ctx->DrawBuffer->_ColorDrawBuffers[0],

-	  ctx->DrawBuffer->ColorDrawBuffer[0]);

-   printf("Writing %d x %d color buffer to %s\n", w, h, filename);

-   write_ppm(filename, buf, w, h, 4, 0, 1, 2, GL_TRUE);

-

-   _mesa_PopClientAttrib();

-

-   free(buf);

-}

-

-

-void

-_mesa_dump_depth_buffer(const char *filename)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   const GLuint w = ctx->DrawBuffer->Width;

-   const GLuint h = ctx->DrawBuffer->Height;

-   GLuint *buf;

-   GLubyte *buf2;

-   GLuint i;

-

-   buf = (GLuint *) malloc(w * h * 4);  /* 4 bpp */

-   buf2 = (GLubyte *) malloc(w * h * 3); /* 3 bpp */

-

-   _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);

-   _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);

-   _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);

-

-   _mesa_ReadPixels(0, 0, w, h, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, buf);

-

-   /* spread 24 bits of Z across R, G, B */

-   for (i = 0; i < w * h; i++) {

-      buf2[i*3+0] = (buf[i] >> 24) & 0xff;

-      buf2[i*3+1] = (buf[i] >> 16) & 0xff;

-      buf2[i*3+2] = (buf[i] >>  8) & 0xff;

-   }

-

-   printf("Writing %d x %d depth buffer to %s\n", w, h, filename);

-   write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE);

-

-   _mesa_PopClientAttrib();

-

-   free(buf);

-   free(buf2);

-}

-

-

-void

-_mesa_dump_stencil_buffer(const char *filename)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   const GLuint w = ctx->DrawBuffer->Width;

-   const GLuint h = ctx->DrawBuffer->Height;

-   GLubyte *buf;

-   GLubyte *buf2;

-   GLuint i;

-

-   buf = (GLubyte *) malloc(w * h);  /* 1 bpp */

-   buf2 = (GLubyte *) malloc(w * h * 3); /* 3 bpp */

-

-   _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);

-   _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);

-   _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);

-

-   _mesa_ReadPixels(0, 0, w, h, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, buf);

-

-   for (i = 0; i < w * h; i++) {

-      buf2[i*3+0] = buf[i];

-      buf2[i*3+1] = (buf[i] & 127) * 2;

-      buf2[i*3+2] = (buf[i] - 128) * 2;

-   }

-

-   printf("Writing %d x %d stencil buffer to %s\n", w, h, filename);

-   write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE);

-

-   _mesa_PopClientAttrib();

-

-   free(buf);

-   free(buf2);

-}

-

-

-void

-_mesa_dump_image(const char *filename, const void *image, GLuint w, GLuint h,

-                 GLenum format, GLenum type)

-{

-   GLboolean invert = GL_TRUE;

-

-   if (format == GL_RGBA && type == GL_UNSIGNED_BYTE) {

-      write_ppm(filename, image, w, h, 4, 0, 1, 2, invert);

-   }

-   else if (format == GL_BGRA && type == GL_UNSIGNED_BYTE) {

-      write_ppm(filename, image, w, h, 4, 2, 1, 0, invert);

-   }

-   else if (format == GL_LUMINANCE_ALPHA && type == GL_UNSIGNED_BYTE) {

-      write_ppm(filename, image, w, h, 2, 1, 0, 0, invert);

-   }

-   else {

-      _mesa_problem(NULL, "Unsupported format/type in _mesa_dump_image()");

-   }

-}

-

-

-/**

- * Quick and dirty function to "print" a texture to stdout.

- */

-void

-_mesa_print_texture(struct gl_context *ctx, const struct gl_texture_image *img)

-{

-#if CHAN_TYPE != GL_UNSIGNED_BYTE

-   _mesa_problem(NULL, "PrintTexture not supported");

-#else

-   GLuint i, j, c;

-   const GLubyte *data = (const GLubyte *) img->Data;

-

-   if (!data) {

-      printf("No texture data\n");

-      return;

-   }

-

-   /* XXX add more formats or make into a new format utility function */

-   switch (img->TexFormat) {

-      case MESA_FORMAT_A8:

-      case MESA_FORMAT_L8:

-      case MESA_FORMAT_I8:

-      case MESA_FORMAT_CI8:

-         c = 1;

-         break;

-      case MESA_FORMAT_AL88:

-      case MESA_FORMAT_AL88_REV:

-         c = 2;

-         break;

-      case MESA_FORMAT_RGB888:

-      case MESA_FORMAT_BGR888:

-         c = 3;

-         break;

-      case MESA_FORMAT_RGBA8888:

-      case MESA_FORMAT_ARGB8888:

-         c = 4;

-         break;

-      default:

-         _mesa_problem(NULL, "error in PrintTexture\n");

-         return;

-   }

-

-   for (i = 0; i < img->Height; i++) {

-      for (j = 0; j < img->Width; j++) {

-         if (c==1)

-            printf("%02x  ", data[0]);

-         else if (c==2)

-            printf("%02x%02x  ", data[0], data[1]);

-         else if (c==3)

-            printf("%02x%02x%02x  ", data[0], data[1], data[2]);

-         else if (c==4)

-            printf("%02x%02x%02x%02x  ", data[0], data[1], data[2], data[3]);

-         data += (img->RowStride - img->Width) * c;

-      }

-      /* XXX use img->ImageStride here */

-      printf("\n");

-   }

-#endif

-}

+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5
+ *
+ * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
+ *
+ * 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 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
+ * BRIAN PAUL 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.
+ */
+
+#include "mtypes.h"
+#include "attrib.h"
+#include "colormac.h"
+#include "enums.h"
+#include "formats.h"
+#include "hash.h"
+#include "imports.h"
+#include "debug.h"
+#include "get.h"
+#include "pixelstore.h"
+#include "readpix.h"
+#include "texobj.h"
+
+
+static const char *
+tex_target_name(GLenum tgt)
+{
+   static const struct {
+      GLenum target;
+      const char *name;
+   } tex_targets[] = {
+      { GL_TEXTURE_1D, "GL_TEXTURE_1D" },
+      { GL_TEXTURE_2D, "GL_TEXTURE_2D" },
+      { GL_TEXTURE_3D, "GL_TEXTURE_3D" },
+      { GL_TEXTURE_CUBE_MAP, "GL_TEXTURE_CUBE_MAP" },
+      { GL_TEXTURE_RECTANGLE, "GL_TEXTURE_RECTANGLE" },
+      { GL_TEXTURE_1D_ARRAY_EXT, "GL_TEXTURE_1D_ARRAY" },
+      { GL_TEXTURE_2D_ARRAY_EXT, "GL_TEXTURE_2D_ARRAY" }
+   };
+   GLuint i;
+   for (i = 0; i < Elements(tex_targets); i++) {
+      if (tex_targets[i].target == tgt)
+         return tex_targets[i].name;
+   }
+   return "UNKNOWN TEX TARGET";
+}
+
+
+void
+_mesa_print_state( const char *msg, GLuint state )
+{
+   _mesa_debug(NULL,
+	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+	   msg,
+	   state,
+	   (state & _NEW_MODELVIEW)       ? "ctx->ModelView, " : "",
+	   (state & _NEW_PROJECTION)      ? "ctx->Projection, " : "",
+	   (state & _NEW_TEXTURE_MATRIX)  ? "ctx->TextureMatrix, " : "",
+	   (state & _NEW_COLOR)           ? "ctx->Color, " : "",
+	   (state & _NEW_DEPTH)           ? "ctx->Depth, " : "",
+	   (state & _NEW_EVAL)            ? "ctx->Eval/EvalMap, " : "",
+	   (state & _NEW_FOG)             ? "ctx->Fog, " : "",
+	   (state & _NEW_HINT)            ? "ctx->Hint, " : "",
+	   (state & _NEW_LIGHT)           ? "ctx->Light, " : "",
+	   (state & _NEW_LINE)            ? "ctx->Line, " : "",
+	   (state & _NEW_PIXEL)           ? "ctx->Pixel, " : "",
+	   (state & _NEW_POINT)           ? "ctx->Point, " : "",
+	   (state & _NEW_POLYGON)         ? "ctx->Polygon, " : "",
+	   (state & _NEW_POLYGONSTIPPLE)  ? "ctx->PolygonStipple, " : "",
+	   (state & _NEW_SCISSOR)         ? "ctx->Scissor, " : "",
+	   (state & _NEW_STENCIL)         ? "ctx->Stencil, " : "",
+	   (state & _NEW_TEXTURE)         ? "ctx->Texture, " : "",
+	   (state & _NEW_TRANSFORM)       ? "ctx->Transform, " : "",
+	   (state & _NEW_VIEWPORT)        ? "ctx->Viewport, " : "",
+	   (state & _NEW_PACKUNPACK)      ? "ctx->Pack/Unpack, " : "",
+	   (state & _NEW_ARRAY)           ? "ctx->Array, " : "",
+	   (state & _NEW_RENDERMODE)      ? "ctx->RenderMode, " : "",
+	   (state & _NEW_BUFFERS)         ? "ctx->Visual, ctx->DrawBuffer,, " : "");
+}
+
+
+
+void
+_mesa_print_tri_caps( const char *name, GLuint flags )
+{
+   _mesa_debug(NULL,
+	   "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s\n",
+	   name,
+	   flags,
+	   (flags & DD_FLATSHADE)           ? "flat-shade, " : "",
+	   (flags & DD_SEPARATE_SPECULAR)   ? "separate-specular, " : "",
+	   (flags & DD_TRI_LIGHT_TWOSIDE)   ? "tri-light-twoside, " : "",
+	   (flags & DD_TRI_TWOSTENCIL)      ? "tri-twostencil, " : "",
+	   (flags & DD_TRI_UNFILLED)        ? "tri-unfilled, " : "",
+	   (flags & DD_TRI_STIPPLE)         ? "tri-stipple, " : "",
+	   (flags & DD_TRI_OFFSET)          ? "tri-offset, " : "",
+	   (flags & DD_TRI_SMOOTH)          ? "tri-smooth, " : "",
+	   (flags & DD_LINE_SMOOTH)         ? "line-smooth, " : "",
+	   (flags & DD_LINE_STIPPLE)        ? "line-stipple, " : "",
+	   (flags & DD_POINT_SMOOTH)        ? "point-smooth, " : "",
+	   (flags & DD_POINT_ATTEN)         ? "point-atten, " : "",
+	   (flags & DD_TRI_CULL_FRONT_BACK) ? "cull-all, " : ""
+      );
+}
+
+
+/**
+ * Print information about this Mesa version and build options.
+ */
+void _mesa_print_info( void )
+{
+   _mesa_debug(NULL, "Mesa GL_VERSION = %s\n",
+	   (char *) _mesa_GetString(GL_VERSION));
+   _mesa_debug(NULL, "Mesa GL_RENDERER = %s\n",
+	   (char *) _mesa_GetString(GL_RENDERER));
+   _mesa_debug(NULL, "Mesa GL_VENDOR = %s\n",
+	   (char *) _mesa_GetString(GL_VENDOR));
+   _mesa_debug(NULL, "Mesa GL_EXTENSIONS = %s\n",
+	   (char *) _mesa_GetString(GL_EXTENSIONS));
+#if defined(THREADS)
+   _mesa_debug(NULL, "Mesa thread-safe: YES\n");
+#else
+   _mesa_debug(NULL, "Mesa thread-safe: NO\n");
+#endif
+#if defined(USE_X86_ASM)
+   _mesa_debug(NULL, "Mesa x86-optimized: YES\n");
+#else
+   _mesa_debug(NULL, "Mesa x86-optimized: NO\n");
+#endif
+#if defined(USE_SPARC_ASM)
+   _mesa_debug(NULL, "Mesa sparc-optimized: YES\n");
+#else
+   _mesa_debug(NULL, "Mesa sparc-optimized: NO\n");
+#endif
+}
+
+
+/**
+ * Set the debugging flags.
+ *
+ * \param debug debug string
+ *
+ * If compiled with debugging support then search for keywords in \p debug and
+ * enables the verbose debug output of the respective feature.
+ */
+static void add_debug_flags( const char *debug )
+{
+#ifdef DEBUG
+   struct debug_option {
+      const char *name;
+      GLbitfield flag;
+   };
+   static const struct debug_option debug_opt[] = {
+      { "varray",    VERBOSE_VARRAY },
+      { "tex",       VERBOSE_TEXTURE },
+      { "mat",       VERBOSE_MATERIAL },
+      { "pipe",      VERBOSE_PIPELINE },
+      { "driver",    VERBOSE_DRIVER },
+      { "state",     VERBOSE_STATE },
+      { "api",       VERBOSE_API },
+      { "list",      VERBOSE_DISPLAY_LIST },
+      { "lighting",  VERBOSE_LIGHTING },
+      { "disassem",  VERBOSE_DISASSEM },
+      { "draw",      VERBOSE_DRAW },
+      { "swap",      VERBOSE_SWAPBUFFERS }
+   };
+   GLuint i;
+
+   MESA_VERBOSE = 0x0;
+   for (i = 0; i < Elements(debug_opt); i++) {
+      if (strstr(debug, debug_opt[i].name) || strcmp(debug, "all") == 0)
+         MESA_VERBOSE |= debug_opt[i].flag;
+   }
+
+   /* Debug flag:
+    */
+   if (strstr(debug, "flush"))
+      MESA_DEBUG_FLAGS |= DEBUG_ALWAYS_FLUSH;
+
+#else
+   (void) debug;
+#endif
+}
+
+
+void 
+_mesa_init_debug( struct gl_context *ctx )
+{
+   char *c;
+   c = _mesa_getenv("MESA_DEBUG");
+   if (c)
+      add_debug_flags(c);
+
+   c = _mesa_getenv("MESA_VERBOSE");
+   if (c)
+      add_debug_flags(c);
+}
+
+
+/*
+ * Write ppm file
+ */
+static void
+write_ppm(const char *filename, const GLubyte *buffer, int width, int height,
+          int comps, int rcomp, int gcomp, int bcomp, GLboolean invert)
+{
+   FILE *f = fopen( filename, "w" );
+   if (f) {
+      int x, y;
+      const GLubyte *ptr = buffer;
+      fprintf(f,"P6\n");
+      fprintf(f,"# ppm-file created by osdemo.c\n");
+      fprintf(f,"%i %i\n", width,height);
+      fprintf(f,"255\n");
+      fclose(f);
+      f = fopen( filename, "ab" );  /* reopen in binary append mode */
+      for (y=0; y < height; y++) {
+         for (x = 0; x < width; x++) {
+            int yy = invert ? (height - 1 - y) : y;
+            int i = (yy * width + x) * comps;
+            fputc(ptr[i+rcomp], f); /* write red */
+            fputc(ptr[i+gcomp], f); /* write green */
+            fputc(ptr[i+bcomp], f); /* write blue */
+         }
+      }
+      fclose(f);
+   }
+   else {
+      fprintf(stderr, "Unable to create %s in write_ppm()\n", filename);
+   }
+}
+
+
+/**
+ * Write a texture image to a ppm file.
+ * \param face  cube face in [0,5]
+ * \param level  mipmap level
+ */
+static void
+write_texture_image(struct gl_texture_object *texObj,
+                    GLuint face, GLuint level)
+{
+   struct gl_texture_image *img = texObj->Image[face][level];
+   if (img) {
+      GET_CURRENT_CONTEXT(ctx);
+      struct gl_pixelstore_attrib store;
+      GLubyte *buffer;
+      char s[100];
+
+      buffer = (GLubyte *) malloc(img->Width * img->Height
+                                        * img->Depth * 4);
+
+      store = ctx->Pack; /* save */
+      ctx->Pack = ctx->DefaultPacking;
+
+      ctx->Driver.GetTexImage(ctx, texObj->Target, level,
+                              GL_RGBA, GL_UNSIGNED_BYTE,
+                              buffer, texObj, img);
+
+      /* make filename */
+      _mesa_snprintf(s, sizeof(s), "/tmp/tex%u.l%u.f%u.ppm", texObj->Name, level, face);
+
+      printf("  Writing image level %u to %s\n", level, s);
+      write_ppm(s, buffer, img->Width, img->Height, 4, 0, 1, 2, GL_FALSE);
+
+      ctx->Pack = store; /* restore */
+
+      free(buffer);
+   }
+}
+
+
+/**
+ * Write renderbuffer image to a ppm file.
+ */
+void
+_mesa_write_renderbuffer_image(const struct gl_renderbuffer *rb)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLubyte *buffer;
+   char s[100];
+   GLenum format, type;
+
+   if (rb->_BaseFormat == GL_RGB || 
+       rb->_BaseFormat == GL_RGBA) {
+      format = GL_RGBA;
+      type = GL_UNSIGNED_BYTE;
+   }
+   else if (rb->_BaseFormat == GL_DEPTH_STENCIL) {
+      format = GL_DEPTH_STENCIL;
+      type = GL_UNSIGNED_INT_24_8;
+   }
+   else {
+      _mesa_debug(NULL,
+                  "Unsupported BaseFormat 0x%x in "
+                  "_mesa_write_renderbuffer_image()\n",
+                  rb->_BaseFormat);
+      return;
+   }
+
+   buffer = (GLubyte *) malloc(rb->Width * rb->Height * 4);
+
+   ctx->Driver.ReadPixels(ctx, 0, 0, rb->Width, rb->Height,
+                          format, type, &ctx->DefaultPacking, buffer);
+
+   /* make filename */
+   _mesa_snprintf(s, sizeof(s), "/tmp/renderbuffer%u.ppm", rb->Name);
+   _mesa_snprintf(s, sizeof(s), "C:\\renderbuffer%u.ppm", rb->Name);
+
+   printf("  Writing renderbuffer image to %s\n", s);
+
+   _mesa_debug(NULL, "  Writing renderbuffer image to %s\n", s);
+
+   write_ppm(s, buffer, rb->Width, rb->Height, 4, 0, 1, 2, GL_TRUE);
+
+   free(buffer);
+}
+
+
+/** How many texture images (mipmap levels, faces) to write to files */
+#define WRITE_NONE 0
+#define WRITE_ONE  1
+#define WRITE_ALL  2
+
+static GLuint WriteImages;
+
+
+static void
+dump_texture(struct gl_texture_object *texObj, GLuint writeImages)
+{
+   const GLuint numFaces = texObj->Target == GL_TEXTURE_CUBE_MAP ? 6 : 1;
+   GLboolean written = GL_FALSE;
+   GLuint i, j;
+
+   printf("Texture %u\n", texObj->Name);
+   printf("  Target %s\n", tex_target_name(texObj->Target));
+   for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {
+      for (j = 0; j < numFaces; j++) {
+         struct gl_texture_image *texImg = texObj->Image[j][i];
+         if (texImg) {
+            printf("  Face %u level %u: %d x %d x %d, format %s at %p\n",
+		   j, i,
+		   texImg->Width, texImg->Height, texImg->Depth,
+		   _mesa_get_format_name(texImg->TexFormat),
+		   texImg->Data);
+            if (writeImages == WRITE_ALL ||
+                (writeImages == WRITE_ONE && !written)) {
+               write_texture_image(texObj, j, i);
+               written = GL_TRUE;
+            }
+         }
+      }
+   }
+}
+
+
+/**
+ * Dump a single texture.
+ */
+void
+_mesa_dump_texture(GLuint texture, GLuint writeImages)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct gl_texture_object *texObj = _mesa_lookup_texture(ctx, texture);
+   if (texObj) {
+      dump_texture(texObj, writeImages);
+   }
+}
+
+
+static void
+dump_texture_cb(GLuint id, void *data, void *userData)
+{
+   struct gl_texture_object *texObj = (struct gl_texture_object *) data;
+   (void) userData;
+   dump_texture(texObj, WriteImages);
+}
+
+
+/**
+ * Print basic info about all texture objext to stdout.
+ * If dumpImages is true, write PPM of level[0] image to a file.
+ */
+void
+_mesa_dump_textures(GLuint writeImages)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   WriteImages = writeImages;
+   _mesa_HashWalk(ctx->Shared->TexObjects, dump_texture_cb, ctx);
+}
+
+
+static void
+dump_renderbuffer(const struct gl_renderbuffer *rb, GLboolean writeImage)
+{
+   printf("Renderbuffer %u: %u x %u  IntFormat = %s\n",
+	  rb->Name, rb->Width, rb->Height,
+	  _mesa_lookup_enum_by_nr(rb->InternalFormat));
+   if (writeImage) {
+      _mesa_write_renderbuffer_image(rb);
+   }
+}
+
+
+static void
+dump_renderbuffer_cb(GLuint id, void *data, void *userData)
+{
+   const struct gl_renderbuffer *rb = (const struct gl_renderbuffer *) data;
+   (void) userData;
+   dump_renderbuffer(rb, WriteImages);
+}
+
+
+/**
+ * Print basic info about all renderbuffers to stdout.
+ * If dumpImages is true, write PPM of level[0] image to a file.
+ */
+void
+_mesa_dump_renderbuffers(GLboolean writeImages)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   WriteImages = writeImages;
+   _mesa_HashWalk(ctx->Shared->RenderBuffers, dump_renderbuffer_cb, ctx);
+}
+
+
+
+void
+_mesa_dump_color_buffer(const char *filename)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const GLuint w = ctx->DrawBuffer->Width;
+   const GLuint h = ctx->DrawBuffer->Height;
+   GLubyte *buf;
+
+   buf = (GLubyte *) malloc(w * h * 4);
+
+   _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
+   _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);
+   _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
+
+   _mesa_ReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, buf);
+
+   printf("ReadBuffer %p 0x%x  DrawBuffer %p 0x%x\n",
+	  (void *) ctx->ReadBuffer->_ColorReadBuffer,
+	  ctx->ReadBuffer->ColorReadBuffer,
+	  (void *) ctx->DrawBuffer->_ColorDrawBuffers[0],
+	  ctx->DrawBuffer->ColorDrawBuffer[0]);
+   printf("Writing %d x %d color buffer to %s\n", w, h, filename);
+   write_ppm(filename, buf, w, h, 4, 0, 1, 2, GL_TRUE);
+
+   _mesa_PopClientAttrib();
+
+   free(buf);
+}
+
+
+void
+_mesa_dump_depth_buffer(const char *filename)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const GLuint w = ctx->DrawBuffer->Width;
+   const GLuint h = ctx->DrawBuffer->Height;
+   GLuint *buf;
+   GLubyte *buf2;
+   GLuint i;
+
+   buf = (GLuint *) malloc(w * h * 4);  /* 4 bpp */
+   buf2 = (GLubyte *) malloc(w * h * 3); /* 3 bpp */
+
+   _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
+   _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);
+   _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
+
+   _mesa_ReadPixels(0, 0, w, h, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, buf);
+
+   /* spread 24 bits of Z across R, G, B */
+   for (i = 0; i < w * h; i++) {
+      buf2[i*3+0] = (buf[i] >> 24) & 0xff;
+      buf2[i*3+1] = (buf[i] >> 16) & 0xff;
+      buf2[i*3+2] = (buf[i] >>  8) & 0xff;
+   }
+
+   printf("Writing %d x %d depth buffer to %s\n", w, h, filename);
+   write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE);
+
+   _mesa_PopClientAttrib();
+
+   free(buf);
+   free(buf2);
+}
+
+
+void
+_mesa_dump_stencil_buffer(const char *filename)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const GLuint w = ctx->DrawBuffer->Width;
+   const GLuint h = ctx->DrawBuffer->Height;
+   GLubyte *buf;
+   GLubyte *buf2;
+   GLuint i;
+
+   buf = (GLubyte *) malloc(w * h);  /* 1 bpp */
+   buf2 = (GLubyte *) malloc(w * h * 3); /* 3 bpp */
+
+   _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
+   _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);
+   _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE);
+
+   _mesa_ReadPixels(0, 0, w, h, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, buf);
+
+   for (i = 0; i < w * h; i++) {
+      buf2[i*3+0] = buf[i];
+      buf2[i*3+1] = (buf[i] & 127) * 2;
+      buf2[i*3+2] = (buf[i] - 128) * 2;
+   }
+
+   printf("Writing %d x %d stencil buffer to %s\n", w, h, filename);
+   write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE);
+
+   _mesa_PopClientAttrib();
+
+   free(buf);
+   free(buf2);
+}
+
+
+void
+_mesa_dump_image(const char *filename, const void *image, GLuint w, GLuint h,
+                 GLenum format, GLenum type)
+{
+   GLboolean invert = GL_TRUE;
+
+   if (format == GL_RGBA && type == GL_UNSIGNED_BYTE) {
+      write_ppm(filename, image, w, h, 4, 0, 1, 2, invert);
+   }
+   else if (format == GL_BGRA && type == GL_UNSIGNED_BYTE) {
+      write_ppm(filename, image, w, h, 4, 2, 1, 0, invert);
+   }
+   else if (format == GL_LUMINANCE_ALPHA && type == GL_UNSIGNED_BYTE) {
+      write_ppm(filename, image, w, h, 2, 1, 0, 0, invert);
+   }
+   else {
+      _mesa_problem(NULL, "Unsupported format/type in _mesa_dump_image()");
+   }
+}
+
+
+/**
+ * Quick and dirty function to "print" a texture to stdout.
+ */
+void
+_mesa_print_texture(struct gl_context *ctx, const struct gl_texture_image *img)
+{
+#if CHAN_TYPE != GL_UNSIGNED_BYTE
+   _mesa_problem(NULL, "PrintTexture not supported");
+#else
+   GLuint i, j, c;
+   const GLubyte *data = (const GLubyte *) img->Data;
+
+   if (!data) {
+      printf("No texture data\n");
+      return;
+   }
+
+   /* XXX add more formats or make into a new format utility function */
+   switch (img->TexFormat) {
+      case MESA_FORMAT_A8:
+      case MESA_FORMAT_L8:
+      case MESA_FORMAT_I8:
+      case MESA_FORMAT_CI8:
+         c = 1;
+         break;
+      case MESA_FORMAT_AL88:
+      case MESA_FORMAT_AL88_REV:
+         c = 2;
+         break;
+      case MESA_FORMAT_RGB888:
+      case MESA_FORMAT_BGR888:
+         c = 3;
+         break;
+      case MESA_FORMAT_RGBA8888:
+      case MESA_FORMAT_ARGB8888:
+         c = 4;
+         break;
+      default:
+         _mesa_problem(NULL, "error in PrintTexture\n");
+         return;
+   }
+
+   for (i = 0; i < img->Height; i++) {
+      for (j = 0; j < img->Width; j++) {
+         if (c==1)
+            printf("%02x  ", data[0]);
+         else if (c==2)
+            printf("%02x%02x  ", data[0], data[1]);
+         else if (c==3)
+            printf("%02x%02x%02x  ", data[0], data[1], data[2]);
+         else if (c==4)
+            printf("%02x%02x%02x%02x  ", data[0], data[1], data[2], data[3]);
+         data += (img->RowStride - img->Width) * c;
+      }
+      /* XXX use img->ImageStride here */
+      printf("\n");
+   }
+#endif
+}
diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c
index f9282398c..6e075b4e5 100644
--- a/mesalib/src/mesa/main/dlist.c
+++ b/mesalib/src/mesa/main/dlist.c
@@ -894,8 +894,8 @@ unpack_image(struct gl_context *ctx, GLuint dimensions,
       GLvoid *image;
 
       map = (GLubyte *)
-         ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                               GL_READ_ONLY_ARB, unpack->BufferObj);
+         ctx->Driver.MapBufferRange(ctx, 0, unpack->BufferObj->Size,
+				    GL_MAP_READ_BIT, unpack->BufferObj);
       if (!map) {
          /* unable to map src buffer! */
          _mesa_error(ctx, GL_INVALID_OPERATION, "unable to map PBO");
@@ -906,8 +906,7 @@ unpack_image(struct gl_context *ctx, GLuint dimensions,
       image = _mesa_unpack_image(dimensions, width, height, depth,
                                  format, type, src, unpack);
 
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              unpack->BufferObj);
+      ctx->Driver.UnmapBuffer(ctx, unpack->BufferObj);
 
       if (!image) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "display list construction");
diff --git a/mesalib/src/mesa/main/drawtex.c b/mesalib/src/mesa/main/drawtex.c
index e386e90f6..83485a928 100644
--- a/mesalib/src/mesa/main/drawtex.c
+++ b/mesalib/src/mesa/main/drawtex.c
@@ -1,133 +1,137 @@
-/*

- * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>

- *

- * 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.

- */

-

-#include "main/drawtex.h"

-#include "main/state.h"

-#include "main/imports.h"

-#include "main/mfeatures.h"

-#include "main/mtypes.h"

-

-

-#if FEATURE_OES_draw_texture

-

-

-static void

-draw_texture(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,

-             GLfloat width, GLfloat height)

-{

-   if (!ctx->Extensions.OES_draw_texture) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glDrawTex(unsupported)");

-      return;

-   }

-   if (width <= 0.0f || height <= 0.0f) {

-      _mesa_error(ctx, GL_INVALID_VALUE, "glDrawTex(width or height <= 0)");

-      return;

-   }

-

-   if (ctx->NewState)

-      _mesa_update_state(ctx);

-

-   ASSERT(ctx->Driver.DrawTex);

-   ctx->Driver.DrawTex(ctx, x, y, z, width, height);

-}

-

-

-void GLAPIENTRY

-_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   draw_texture(ctx, x, y, z, width, height);

-}

-

-

-void GLAPIENTRY

-_mesa_DrawTexfv(const GLfloat *coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   draw_texture(ctx, coords[0], coords[1], coords[2], coords[3], coords[4]);

-}

-

-

-void GLAPIENTRY

-_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,

-                (GLfloat) width, (GLfloat) height);

-}

-

-

-void GLAPIENTRY

-_mesa_DrawTexiv(const GLint *coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],

-                (GLfloat) coords[2], (GLfloat) coords[3], (GLfloat) coords[4]);

-}

-

-

-void GLAPIENTRY

-_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,

-                (GLfloat) width, (GLfloat) height);

-}

-

-

-void GLAPIENTRY

-_mesa_DrawTexsv(const GLshort *coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],

-                (GLfloat) coords[2], (GLfloat) coords[3], (GLfloat) coords[4]);

-}

-

-

-void GLAPIENTRY

-_mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   draw_texture(ctx,

-                (GLfloat) x / 65536.0f,

-                (GLfloat) y / 65536.0f,

-                (GLfloat) z / 65536.0f,

-                (GLfloat) width / 65536.0f,

-                (GLfloat) height / 65536.0f);

-}

-

-

-void GLAPIENTRY

-_mesa_DrawTexxv(const GLfixed *coords)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   draw_texture(ctx,

-                (GLfloat) coords[0] / 65536.0f,

-                (GLfloat) coords[1] / 65536.0f,

-                (GLfloat) coords[2] / 65536.0f,

-                (GLfloat) coords[3] / 65536.0f,

-                (GLfloat) coords[4] / 65536.0f);

-}

-

-#endif /* FEATURE_OES_draw_texture */

+/*
+ * Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>
+ *
+ * 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.
+ */
+
+#include "main/drawtex.h"
+#include "main/state.h"
+#include "main/imports.h"
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
+
+
+#if FEATURE_OES_draw_texture
+
+
+static void
+draw_texture(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
+             GLfloat width, GLfloat height)
+{
+   if (!ctx->Extensions.OES_draw_texture) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glDrawTex(unsupported)");
+      return;
+   }
+   if (width <= 0.0f || height <= 0.0f) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDrawTex(width or height <= 0)");
+      return;
+   }
+
+   _mesa_set_vp_override(ctx, GL_TRUE);
+
+   if (ctx->NewState)
+      _mesa_update_state(ctx);
+
+   ASSERT(ctx->Driver.DrawTex);
+   ctx->Driver.DrawTex(ctx, x, y, z, width, height);
+
+   _mesa_set_vp_override(ctx, GL_FALSE);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, x, y, z, width, height);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexfv(const GLfloat *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, coords[0], coords[1], coords[2], coords[3], coords[4]);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
+                (GLfloat) width, (GLfloat) height);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexiv(const GLint *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
+                (GLfloat) coords[2], (GLfloat) coords[3], (GLfloat) coords[4]);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
+                (GLfloat) width, (GLfloat) height);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexsv(const GLshort *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
+                (GLfloat) coords[2], (GLfloat) coords[3], (GLfloat) coords[4]);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx,
+                (GLfloat) x / 65536.0f,
+                (GLfloat) y / 65536.0f,
+                (GLfloat) z / 65536.0f,
+                (GLfloat) width / 65536.0f,
+                (GLfloat) height / 65536.0f);
+}
+
+
+void GLAPIENTRY
+_mesa_DrawTexxv(const GLfixed *coords)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   draw_texture(ctx,
+                (GLfloat) coords[0] / 65536.0f,
+                (GLfloat) coords[1] / 65536.0f,
+                (GLfloat) coords[2] / 65536.0f,
+                (GLfloat) coords[3] / 65536.0f,
+                (GLfloat) coords[4] / 65536.0f);
+}
+
+#endif /* FEATURE_OES_draw_texture */
diff --git a/mesalib/src/mesa/main/enums.c b/mesalib/src/mesa/main/enums.c
index 8a50e2656..f55a23ada 100644
--- a/mesalib/src/mesa/main/enums.c
+++ b/mesalib/src/mesa/main/enums.c
@@ -1285,6 +1285,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_NUM_COMPRESSED_TEXTURE_FORMATS\0"
    "GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB\0"
    "GL_NUM_EXTENSIONS\0"
+   "GL_NUM_PROGRAM_BINARY_FORMATS\0"
    "GL_NUM_PROGRAM_BINARY_FORMATS_OES\0"
    "GL_NUM_SHADER_BINARY_FORMATS\0"
    "GL_OBJECT_ACTIVE_ATTRIBUTES_ARB\0"
@@ -1493,8 +1494,11 @@ LONGSTRING static const char enum_string_table[] =
    "GL_PROGRAM_ADDRESS_REGISTERS_ARB\0"
    "GL_PROGRAM_ALU_INSTRUCTIONS_ARB\0"
    "GL_PROGRAM_ATTRIBS_ARB\0"
+   "GL_PROGRAM_BINARY_FORMATS\0"
    "GL_PROGRAM_BINARY_FORMATS_OES\0"
+   "GL_PROGRAM_BINARY_LENGTH\0"
    "GL_PROGRAM_BINARY_LENGTH_OES\0"
+   "GL_PROGRAM_BINARY_RETRIEVABLE_HINT\0"
    "GL_PROGRAM_BINDING_ARB\0"
    "GL_PROGRAM_ERROR_POSITION_ARB\0"
    "GL_PROGRAM_ERROR_POSITION_NV\0"
@@ -2352,7 +2356,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[2313] =
+static const enum_elt all_enums[2317] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -3602,1096 +3606,1100 @@ static const enum_elt all_enums[2313] =
    { 27636, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
    { 27670, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
    { 27708, 0x0000821D }, /* GL_NUM_EXTENSIONS */
-   { 27726, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
-   { 27760, 0x00008DF9 }, /* GL_NUM_SHADER_BINARY_FORMATS */
-   { 27789, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 27821, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 27863, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 27893, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 27933, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 27964, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 27993, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 28021, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 28051, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 28068, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 28094, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 28110, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 28145, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 28167, 0x00009112 }, /* GL_OBJECT_TYPE */
-   { 28182, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 28201, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 28231, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 28252, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 28280, 0x00000001 }, /* GL_ONE */
-   { 28287, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 28315, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 28347, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 28375, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 28407, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 28430, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 28453, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 28476, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 28499, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 28517, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 28539, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 28561, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 28577, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 28597, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 28617, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 28635, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 28657, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 28679, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 28695, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 28715, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 28735, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 28753, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 28775, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 28797, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 28813, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 28833, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 28853, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 28874, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 28893, 0x00001507 }, /* GL_OR */
-   { 28899, 0x00000A01 }, /* GL_ORDER */
-   { 28908, 0x0000150D }, /* GL_OR_INVERTED */
-   { 28923, 0x0000150B }, /* GL_OR_REVERSE */
-   { 28937, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 28954, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 28972, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 28993, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 29013, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 29031, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 29050, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 29070, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 29090, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 29108, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 29127, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 29152, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 29176, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 29197, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 29219, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 29241, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 29266, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 29290, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 29311, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 29333, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 29355, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 29377, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 29408, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 29428, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 29453, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 29473, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 29498, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 29518, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 29543, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 29563, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 29588, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 29608, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 29633, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 29653, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 29678, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 29698, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 29723, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 29743, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 29768, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 29788, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 29813, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 29833, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 29858, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 29876, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 29897, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 29926, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 29959, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 29984, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 30007, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 30038, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 30073, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 30100, 0x00001B00 }, /* GL_POINT */
-   { 30109, 0x00000000 }, /* GL_POINTS */
-   { 30119, 0x00000002 }, /* GL_POINT_BIT */
-   { 30132, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 30162, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 30196, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 30230, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 30265, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 30294, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 30327, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 30360, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 30394, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 30408, 0x00008B9F }, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-   { 30447, 0x00008B9C }, /* GL_POINT_SIZE_ARRAY_OES */
-   { 30471, 0x0000898C }, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
-   { 30503, 0x0000898B }, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
-   { 30534, 0x0000898A }, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
-   { 30563, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 30589, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 30607, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 30629, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 30651, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 30674, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 30692, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 30714, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 30736, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 30759, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 30779, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 30795, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 30816, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 30832, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 30852, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 30881, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 30900, 0x00008861 }, /* GL_POINT_SPRITE_OES */
-   { 30920, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 30946, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 30961, 0x00000009 }, /* GL_POLYGON */
-   { 30972, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 30987, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 31003, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 31026, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 31051, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 31074, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 31097, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 31121, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 31145, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 31163, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 31186, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 31205, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 31228, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 31245, 0x00001203 }, /* GL_POSITION */
-   { 31257, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 31289, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 31325, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 31358, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 31395, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 31426, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 31461, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 31493, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 31529, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 31562, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 31594, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 31630, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 31663, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 31700, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 31730, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 31764, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 31795, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 31830, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 31861, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 31896, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 31928, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 31964, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 31994, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 32028, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 32059, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 32094, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 32126, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 32157, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 32192, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 32224, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 32260, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 32289, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 32322, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 32352, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 32386, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 32425, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 32458, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 32498, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 32532, 0x00008578 }, /* GL_PREVIOUS */
-   { 32544, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 32560, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 32576, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 32593, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 32614, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 32635, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED */
-   { 32659, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */
-   { 32687, 0x00008F9D }, /* GL_PRIMITIVE_RESTART */
-   { 32708, 0x00008F9E }, /* GL_PRIMITIVE_RESTART_INDEX */
-   { 32735, 0x00008559 }, /* GL_PRIMITIVE_RESTART_INDEX_NV */
-   { 32765, 0x00008558 }, /* GL_PRIMITIVE_RESTART_NV */
-   { 32789, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 32822, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 32854, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 32877, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
-   { 32907, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
-   { 32936, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 32959, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 32989, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 33018, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 33046, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 33068, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 33096, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 33124, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 33146, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 33167, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 33207, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 33246, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 33276, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 33311, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 33344, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 33378, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 33417, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 33456, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 33478, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 33504, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 33528, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE */
-   { 33550, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
-   { 33576, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 33599, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 33621, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 33642, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 33663, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 33690, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 33722, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 33754, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 33789, 0x00001701 }, /* GL_PROJECTION */
-   { 33803, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 33824, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 33867, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 33893, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
-   { 33913, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
-   { 33937, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 33958, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 33977, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 34000, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 34039, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 34077, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 34097, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY */
-   { 34123, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 34153, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 34177, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 34197, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY */
-   { 34223, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 34253, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 34277, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 34297, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 34330, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 34356, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 34386, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE */
-   { 34413, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 34444, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 34474, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
-   { 34493, 0x00002003 }, /* GL_Q */
-   { 34498, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 34523, 0x00000007 }, /* GL_QUADS */
-   { 34532, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-   { 34576, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-   { 34624, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 34641, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 34655, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT */
-   { 34682, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
-   { 34712, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT */
-   { 34736, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
-   { 34763, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 34785, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 34811, 0x00008E14 }, /* GL_QUERY_NO_WAIT */
-   { 34828, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
-   { 34848, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 34864, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 34884, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 34910, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 34940, 0x00008E13 }, /* GL_QUERY_WAIT */
-   { 34954, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
-   { 34971, 0x00002002 }, /* GL_R */
-   { 34976, 0x00008C3A }, /* GL_R11F_G11F_B10F */
-   { 34994, 0x00008F98 }, /* GL_R16_SNORM */
-   { 35007, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 35019, 0x00008F94 }, /* GL_R8_SNORM */
-   { 35031, 0x00008C89 }, /* GL_RASTERIZER_DISCARD */
-   { 35053, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
-   { 35079, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 35112, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 35127, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 35147, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
-   { 35175, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 35207, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 35231, 0x000088B8 }, /* GL_READ_ONLY */
-   { 35244, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 35261, 0x000088BA }, /* GL_READ_WRITE */
-   { 35275, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 35293, 0x00001903 }, /* GL_RED */
-   { 35300, 0x00008016 }, /* GL_REDUCE */
-   { 35310, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 35324, 0x00000D15 }, /* GL_RED_BIAS */
-   { 35336, 0x00000D52 }, /* GL_RED_BITS */
-   { 35348, 0x00008D94 }, /* GL_RED_INTEGER */
-   { 35363, 0x00008D94 }, /* GL_RED_INTEGER_EXT */
-   { 35382, 0x00000D14 }, /* GL_RED_SCALE */
-   { 35395, 0x00008F90 }, /* GL_RED_SNORM */
-   { 35408, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 35426, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 35448, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 35469, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
-   { 35491, 0x00008A19 }, /* GL_RELEASED_APPLE */
-   { 35509, 0x00001C00 }, /* GL_RENDER */
-   { 35519, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 35535, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 35562, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
-   { 35593, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
-   { 35617, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 35645, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
-   { 35673, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 35699, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
-   { 35729, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 35756, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
-   { 35787, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 35807, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 35834, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
-   { 35865, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 35888, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 35915, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
-   { 35942, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 35974, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 36010, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
-   { 36046, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
-   { 36066, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 36091, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
-   { 36120, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 36144, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
-   { 36172, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 36201, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
-   { 36234, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 36256, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 36282, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
-   { 36308, 0x00001F01 }, /* GL_RENDERER */
-   { 36320, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 36335, 0x00002901 }, /* GL_REPEAT */
-   { 36345, 0x00001E01 }, /* GL_REPLACE */
-   { 36356, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 36371, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 36394, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 36412, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 36434, 0x00008256 }, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
-   { 36469, 0x00008A1B }, /* GL_RETAINED_APPLE */
-   { 36487, 0x00000102 }, /* GL_RETURN */
-   { 36497, 0x00008F99 }, /* GL_RG16_SNORM */
-   { 36511, 0x00008F95 }, /* GL_RG8_SNORM */
-   { 36524, 0x00001907 }, /* GL_RGB */
-   { 36531, 0x00008052 }, /* GL_RGB10 */
-   { 36540, 0x00008059 }, /* GL_RGB10_A2 */
-   { 36552, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 36568, 0x00008052 }, /* GL_RGB10_EXT */
-   { 36581, 0x00008053 }, /* GL_RGB12 */
-   { 36590, 0x00008053 }, /* GL_RGB12_EXT */
-   { 36603, 0x00008054 }, /* GL_RGB16 */
-   { 36612, 0x0000881B }, /* GL_RGB16F */
-   { 36622, 0x00008D89 }, /* GL_RGB16I */
-   { 36632, 0x00008D89 }, /* GL_RGB16I_EXT */
-   { 36646, 0x00008D77 }, /* GL_RGB16UI */
-   { 36657, 0x00008D77 }, /* GL_RGB16UI_EXT */
-   { 36672, 0x00008054 }, /* GL_RGB16_EXT */
-   { 36685, 0x00008F9A }, /* GL_RGB16_SNORM */
-   { 36700, 0x0000804E }, /* GL_RGB2_EXT */
-   { 36712, 0x00008815 }, /* GL_RGB32F */
-   { 36722, 0x00008D83 }, /* GL_RGB32I */
-   { 36732, 0x00008D83 }, /* GL_RGB32I_EXT */
-   { 36746, 0x00008D71 }, /* GL_RGB32UI */
-   { 36757, 0x00008D71 }, /* GL_RGB32UI_EXT */
-   { 36772, 0x0000804F }, /* GL_RGB4 */
-   { 36780, 0x0000804F }, /* GL_RGB4_EXT */
-   { 36792, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 36805, 0x00008050 }, /* GL_RGB5 */
-   { 36813, 0x00008D62 }, /* GL_RGB565 */
-   { 36823, 0x00008D62 }, /* GL_RGB565_OES */
-   { 36837, 0x00008057 }, /* GL_RGB5_A1 */
-   { 36848, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 36863, 0x00008057 }, /* GL_RGB5_A1_OES */
-   { 36878, 0x00008050 }, /* GL_RGB5_EXT */
-   { 36890, 0x00008051 }, /* GL_RGB8 */
-   { 36898, 0x00008D8F }, /* GL_RGB8I */
-   { 36907, 0x00008D8F }, /* GL_RGB8I_EXT */
-   { 36920, 0x00008D7D }, /* GL_RGB8UI */
-   { 36930, 0x00008D7D }, /* GL_RGB8UI_EXT */
-   { 36944, 0x00008051 }, /* GL_RGB8_EXT */
-   { 36956, 0x00008051 }, /* GL_RGB8_OES */
-   { 36968, 0x00008F96 }, /* GL_RGB8_SNORM */
-   { 36982, 0x00008C3D }, /* GL_RGB9_E5 */
-   { 36993, 0x00001908 }, /* GL_RGBA */
-   { 37001, 0x0000805A }, /* GL_RGBA12 */
-   { 37011, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 37025, 0x0000805B }, /* GL_RGBA16 */
-   { 37035, 0x0000881A }, /* GL_RGBA16F */
-   { 37046, 0x00008D88 }, /* GL_RGBA16I */
-   { 37057, 0x00008D88 }, /* GL_RGBA16I_EXT */
-   { 37072, 0x00008D76 }, /* GL_RGBA16UI */
-   { 37084, 0x00008D76 }, /* GL_RGBA16UI_EXT */
-   { 37100, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 37114, 0x00008F9B }, /* GL_RGBA16_SNORM */
-   { 37130, 0x00008055 }, /* GL_RGBA2 */
-   { 37139, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 37152, 0x00008814 }, /* GL_RGBA32F */
-   { 37163, 0x00008D82 }, /* GL_RGBA32I */
-   { 37174, 0x00008D82 }, /* GL_RGBA32I_EXT */
-   { 37189, 0x00008D70 }, /* GL_RGBA32UI */
-   { 37201, 0x00008D70 }, /* GL_RGBA32UI_EXT */
-   { 37217, 0x00008056 }, /* GL_RGBA4 */
-   { 37226, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 37245, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 37258, 0x00008056 }, /* GL_RGBA4_OES */
-   { 37271, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 37285, 0x00008058 }, /* GL_RGBA8 */
-   { 37294, 0x00008D8E }, /* GL_RGBA8I */
-   { 37304, 0x00008D8E }, /* GL_RGBA8I_EXT */
-   { 37318, 0x00008D7C }, /* GL_RGBA8UI */
-   { 37329, 0x00008D7C }, /* GL_RGBA8UI_EXT */
-   { 37344, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 37357, 0x00008058 }, /* GL_RGBA8_OES */
-   { 37370, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 37385, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 37403, 0x00008820 }, /* GL_RGBA_FLOAT_MODE_ARB */
-   { 37426, 0x00008D99 }, /* GL_RGBA_INTEGER */
-   { 37442, 0x00008D99 }, /* GL_RGBA_INTEGER_EXT */
-   { 37462, 0x00008D9E }, /* GL_RGBA_INTEGER_MODE_EXT */
-   { 37487, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 37500, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 37513, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 37527, 0x00008D98 }, /* GL_RGB_INTEGER */
-   { 37542, 0x00008D98 }, /* GL_RGB_INTEGER_EXT */
-   { 37561, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 37573, 0x00008573 }, /* GL_RGB_SCALE */
-   { 37586, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 37603, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 37620, 0x00008F92 }, /* GL_RGB_SNORM */
-   { 37633, 0x00008F91 }, /* GL_RG_SNORM */
-   { 37645, 0x00000407 }, /* GL_RIGHT */
-   { 37654, 0x00002000 }, /* GL_S */
-   { 37659, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 37673, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY */
-   { 37693, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY_EXT */
-   { 37717, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW */
-   { 37744, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW_EXT */
-   { 37775, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 37796, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 37810, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY */
-   { 37830, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY_EXT */
-   { 37854, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW */
-   { 37881, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW_EXT */
-   { 37912, 0x00008B63 }, /* GL_SAMPLER_2D_RECT */
-   { 37931, 0x00008B64 }, /* GL_SAMPLER_2D_RECT_SHADOW */
-   { 37957, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 37978, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 37992, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
-   { 38010, 0x00008919 }, /* GL_SAMPLER_BINDING */
-   { 38029, 0x00008DC2 }, /* GL_SAMPLER_BUFFER */
-   { 38047, 0x00008DC2 }, /* GL_SAMPLER_BUFFER_EXT */
-   { 38069, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 38085, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW */
-   { 38108, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW_EXT */
-   { 38135, 0x000080A9 }, /* GL_SAMPLES */
-   { 38146, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 38162, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 38177, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 38195, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 38217, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 38245, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 38277, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 38300, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 38327, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 38345, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 38368, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 38390, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 38409, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 38432, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 38458, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 38488, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 38513, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 38542, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 38557, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 38572, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 38588, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 38613, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 38653, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 38697, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 38730, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 38760, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 38792, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 38822, 0x00001C02 }, /* GL_SELECT */
-   { 38832, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 38860, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 38885, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 38901, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS */
-   { 38921, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
-   { 38945, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 38972, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 39003, 0x0000150F }, /* GL_SET */
-   { 39010, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
-   { 39035, 0x00008DFA }, /* GL_SHADER_COMPILER */
-   { 39054, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 39075, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 39099, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 39114, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 39129, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 39157, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 39180, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 39210, 0x00001601 }, /* GL_SHININESS */
-   { 39223, 0x00001402 }, /* GL_SHORT */
-   { 39232, 0x00009119 }, /* GL_SIGNALED */
-   { 39244, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 39265, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 39281, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 39301, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 39320, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 39334, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 39349, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 39371, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 39391, 0x00001D01 }, /* GL_SMOOTH */
-   { 39401, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 39434, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 39461, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 39494, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 39521, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 39538, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 39559, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 39580, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 39595, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 39614, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 39633, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 39650, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 39671, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 39692, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 39707, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 39726, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 39745, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 39762, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 39783, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 39804, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 39819, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 39838, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 39857, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 39877, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 39895, 0x00001202 }, /* GL_SPECULAR */
-   { 39907, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 39921, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 39936, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 39954, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 39971, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 39985, 0x00008580 }, /* GL_SRC0_RGB */
-   { 39997, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 40011, 0x00008581 }, /* GL_SRC1_RGB */
-   { 40023, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 40037, 0x00008582 }, /* GL_SRC2_RGB */
-   { 40049, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 40062, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 40084, 0x00000300 }, /* GL_SRC_COLOR */
-   { 40097, 0x00008C40 }, /* GL_SRGB */
-   { 40105, 0x00008C41 }, /* GL_SRGB8 */
-   { 40114, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 40130, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 40144, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 40162, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 40181, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 40196, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 40215, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 40230, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 40249, 0x000088E5 }, /* GL_STATIC_READ */
-   { 40264, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 40283, 0x00001802 }, /* GL_STENCIL */
-   { 40294, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 40316, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 40342, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
-   { 40368, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 40389, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 40414, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 40435, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 40460, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 40492, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 40528, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 40560, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 40596, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 40616, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 40643, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 40669, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 40685, 0x00008224 }, /* GL_STENCIL_BUFFER */
-   { 40703, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 40725, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 40748, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 40764, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 40780, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 40797, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
-   { 40815, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
-   { 40834, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 40857, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 40879, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
-   { 40901, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
-   { 40919, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 40941, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
-   { 40963, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
-   { 40981, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 41003, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
-   { 41025, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 41046, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 41073, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 41100, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 41115, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 41131, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 41160, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 41182, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 41203, 0x00000C33 }, /* GL_STEREO */
-   { 41213, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
-   { 41237, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
-   { 41262, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
-   { 41286, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 41301, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 41320, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 41335, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 41354, 0x000088E1 }, /* GL_STREAM_READ */
-   { 41369, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 41388, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 41405, 0x000084E7 }, /* GL_SUBTRACT */
-   { 41417, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 41433, 0x00009113 }, /* GL_SYNC_CONDITION */
-   { 41451, 0x00009116 }, /* GL_SYNC_FENCE */
-   { 41465, 0x00009115 }, /* GL_SYNC_FLAGS */
-   { 41479, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
-   { 41506, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-   { 41536, 0x00009114 }, /* GL_SYNC_STATUS */
-   { 41551, 0x00002001 }, /* GL_T */
-   { 41556, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 41571, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 41590, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 41606, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 41621, 0x00002A27 }, /* GL_T2F_V3F */
-   { 41632, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 41651, 0x00002A28 }, /* GL_T4F_V4F */
-   { 41662, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 41685, 0x00001702 }, /* GL_TEXTURE */
-   { 41696, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 41708, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 41724, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 41736, 0x000084CA }, /* GL_TEXTURE10 */
-   { 41749, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 41766, 0x000084CB }, /* GL_TEXTURE11 */
-   { 41779, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 41796, 0x000084CC }, /* GL_TEXTURE12 */
-   { 41809, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 41826, 0x000084CD }, /* GL_TEXTURE13 */
-   { 41839, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 41856, 0x000084CE }, /* GL_TEXTURE14 */
-   { 41869, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 41886, 0x000084CF }, /* GL_TEXTURE15 */
-   { 41899, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 41916, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 41929, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 41946, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 41959, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 41976, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 41989, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 42006, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 42019, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 42036, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 42052, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 42064, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 42077, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 42094, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 42107, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 42124, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 42137, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 42154, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 42167, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 42184, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 42197, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 42214, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 42227, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 42244, 0x000084DA }, /* GL_TEXTURE26 */
-   { 42257, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 42274, 0x000084DB }, /* GL_TEXTURE27 */
-   { 42287, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 42304, 0x000084DC }, /* GL_TEXTURE28 */
-   { 42317, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 42334, 0x000084DD }, /* GL_TEXTURE29 */
-   { 42347, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 42364, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 42380, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 42392, 0x000084DE }, /* GL_TEXTURE30 */
-   { 42405, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 42422, 0x000084DF }, /* GL_TEXTURE31 */
-   { 42435, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 42452, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 42468, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 42480, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 42496, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 42508, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 42524, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 42536, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 42552, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 42564, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 42580, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 42592, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 42608, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 42620, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 42636, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 42650, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY */
-   { 42670, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 42694, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 42708, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY */
-   { 42728, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 42752, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 42766, 0x0000806F }, /* GL_TEXTURE_3D_OES */
-   { 42784, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 42806, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 42832, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 42854, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 42876, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY */
-   { 42904, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 42936, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 42958, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY */
-   { 42986, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 43018, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 43040, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
-   { 43066, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER */
-   { 43092, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER_ARB */
-   { 43122, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 43150, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 43182, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
-   { 43214, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE */
-   { 43243, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 43276, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 43308, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 43323, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 43344, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 43369, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 43387, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 43411, 0x00008C2A }, /* GL_TEXTURE_BUFFER */
-   { 43429, 0x00008C2A }, /* GL_TEXTURE_BUFFER_ARB */
-   { 43451, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
-   { 43488, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB */
-   { 43529, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT */
-   { 43554, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT_ARB */
-   { 43583, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 43614, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 43644, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 43674, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 43709, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 43740, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 43778, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 43805, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 43837, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 43871, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 43895, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 43923, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 43947, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 43975, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 44008, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 44032, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 44054, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 44076, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 44102, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 44136, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 44169, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 44206, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 44234, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 44266, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 44289, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 44327, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 44369, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 44400, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 44428, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 44458, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 44486, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
-   { 44511, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 44531, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 44555, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 44586, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 44621, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
-   { 44656, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 44687, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 44722, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
-   { 44757, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 44788, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 44823, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
-   { 44858, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
-   { 44882, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 44913, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 44948, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
-   { 44983, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 45014, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 45049, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
-   { 45084, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 45115, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 45150, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
-   { 45185, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-   { 45214, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 45231, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 45253, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 45279, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 45294, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 45315, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 45335, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 45361, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
-   { 45391, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 45411, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
-   { 45435, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 45452, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 45469, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 45486, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
-   { 45509, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 45526, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 45551, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 45573, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 45599, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 45617, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 45643, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 45669, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 45699, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 45726, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 45751, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 45771, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 45795, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 45822, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 45849, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 45876, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 45902, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 45932, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 45954, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 45972, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 46012, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 46042, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 46070, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 46098, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 46126, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 46147, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 46166, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 46188, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 46207, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 46227, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-   { 46257, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-   { 46288, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE */
-   { 46309, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 46334, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 46358, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 46378, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 46402, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 46422, 0x00008C3F }, /* GL_TEXTURE_SHARED_SIZE */
-   { 46445, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 46468, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 46492, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
-   { 46520, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-   { 46550, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 46575, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 46609, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 46626, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 46644, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
-   { 46666, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 46684, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 46702, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
-   { 46721, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 46741, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 46760, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 46789, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 46806, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
-   { 46828, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
-   { 46858, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER */
-   { 46887, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-   { 46923, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
-   { 46960, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
-   { 47001, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
-   { 47034, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
-   { 47068, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
-   { 47106, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-   { 47142, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
-   { 47176, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
-   { 47214, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
-   { 47249, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
-   { 47288, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
-   { 47329, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
-   { 47374, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
-   { 47405, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
-   { 47440, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
-   { 47481, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
-   { 47526, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 47552, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 47582, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 47614, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 47644, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 47678, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 47694, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 47725, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 47760, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 47788, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 47820, 0x00000004 }, /* GL_TRIANGLES */
-   { 47833, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY */
-   { 47856, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
-   { 47883, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 47899, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 47920, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 47938, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY */
-   { 47966, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
-   { 47998, 0x00000001 }, /* GL_TRUE */
-   { 48006, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
-   { 48025, 0x00008255 }, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
-   { 48054, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 48074, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 48097, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 48117, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 48138, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 48160, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 48182, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 48202, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 48223, 0x00009118 }, /* GL_UNSIGNALED */
-   { 48237, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 48254, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 48281, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 48304, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 48320, 0x00008C3B }, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
-   { 48352, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 48379, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
-   { 48410, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 48431, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
-   { 48456, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 48480, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
-   { 48505, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 48536, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
-   { 48571, 0x00008C3E }, /* GL_UNSIGNED_INT_5_9_9_9_REV */
-   { 48599, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 48623, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 48651, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D */
-   { 48678, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
-   { 48711, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT */
-   { 48748, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D_EXT */
-   { 48779, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D */
-   { 48806, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
-   { 48839, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT */
-   { 48876, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D_EXT */
-   { 48907, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
-   { 48939, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT */
-   { 48975, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D */
-   { 49002, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D_EXT */
-   { 49033, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
-   { 49064, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT */
-   { 49099, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
-   { 49128, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE_EXT */
-   { 49161, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2 */
-   { 49182, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2_EXT */
-   { 49207, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3 */
-   { 49228, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3_EXT */
-   { 49253, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4 */
-   { 49274, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4_EXT */
-   { 49299, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 49322, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 49340, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 49370, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
-   { 49404, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 49430, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 49460, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
-   { 49494, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 49520, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 49544, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 49572, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 49600, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 49627, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 49659, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 49690, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 49704, 0x00002A20 }, /* GL_V2F */
-   { 49711, 0x00002A21 }, /* GL_V3F */
-   { 49718, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 49737, 0x00001F00 }, /* GL_VENDOR */
-   { 49747, 0x00001F02 }, /* GL_VERSION */
-   { 49758, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 49774, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 49798, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 49828, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 49859, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 49894, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 49918, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 49939, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 49962, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 49983, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 50010, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 50038, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 50066, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 50094, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 50122, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 50150, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 50178, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 50205, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 50232, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 50259, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 50286, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 50313, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 50340, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 50367, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 50394, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 50421, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 50459, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 50501, 0x000088FE }, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
-   { 50536, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 50567, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 50602, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
-   { 50633, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT */
-   { 50668, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 50702, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 50740, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 50771, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 50806, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 50834, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 50866, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 50896, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 50930, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 50958, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 50990, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 51010, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 51032, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 51061, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 51082, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 51111, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 51144, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 51176, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 51203, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 51234, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 51264, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 51281, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 51302, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 51329, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 51341, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 51357, 0x00008A1A }, /* GL_VOLATILE_APPLE */
-   { 51375, 0x0000911D }, /* GL_WAIT_FAILED */
-   { 51390, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 51410, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 51441, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 51476, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
-   { 51511, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
-   { 51531, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 51559, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
-   { 51587, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 51612, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
-   { 51637, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 51664, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
-   { 51691, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 51716, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
-   { 51741, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 51765, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 51784, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 51798, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 51816, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
-   { 51834, 0x00001506 }, /* GL_XOR */
-   { 51841, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 51860, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 51874, 0x00000000 }, /* GL_ZERO */
-   { 51882, 0x00000D16 }, /* GL_ZOOM_X */
-   { 51892, 0x00000D17 }, /* GL_ZOOM_Y */
+   { 27726, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS */
+   { 27756, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
+   { 27790, 0x00008DF9 }, /* GL_NUM_SHADER_BINARY_FORMATS */
+   { 27819, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 27851, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 27893, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 27923, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 27963, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 27994, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 28023, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 28051, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 28081, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 28098, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 28124, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 28140, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 28175, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 28197, 0x00009112 }, /* GL_OBJECT_TYPE */
+   { 28212, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 28231, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 28261, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 28282, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 28310, 0x00000001 }, /* GL_ONE */
+   { 28317, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 28345, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 28377, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 28405, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 28437, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 28460, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 28483, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 28506, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 28529, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 28547, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 28569, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 28591, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 28607, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 28627, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 28647, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 28665, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 28687, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 28709, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 28725, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 28745, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 28765, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 28783, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 28805, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 28827, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 28843, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 28863, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 28883, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 28904, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 28923, 0x00001507 }, /* GL_OR */
+   { 28929, 0x00000A01 }, /* GL_ORDER */
+   { 28938, 0x0000150D }, /* GL_OR_INVERTED */
+   { 28953, 0x0000150B }, /* GL_OR_REVERSE */
+   { 28967, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 28984, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 29002, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 29023, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 29043, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 29061, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 29080, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 29100, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 29120, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 29138, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 29157, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 29182, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 29206, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 29227, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 29249, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 29271, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 29296, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 29320, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 29341, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 29363, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 29385, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 29407, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 29438, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 29458, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 29483, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 29503, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 29528, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 29548, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 29573, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 29593, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 29618, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 29638, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 29663, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 29683, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 29708, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 29728, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 29753, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 29773, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 29798, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 29818, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 29843, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 29863, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 29888, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 29906, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 29927, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 29956, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 29989, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 30014, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 30037, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 30068, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 30103, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 30130, 0x00001B00 }, /* GL_POINT */
+   { 30139, 0x00000000 }, /* GL_POINTS */
+   { 30149, 0x00000002 }, /* GL_POINT_BIT */
+   { 30162, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 30192, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 30226, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 30260, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 30295, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 30324, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 30357, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 30390, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 30424, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 30438, 0x00008B9F }, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
+   { 30477, 0x00008B9C }, /* GL_POINT_SIZE_ARRAY_OES */
+   { 30501, 0x0000898C }, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
+   { 30533, 0x0000898B }, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
+   { 30564, 0x0000898A }, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
+   { 30593, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 30619, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 30637, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 30659, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 30681, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 30704, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 30722, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 30744, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 30766, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 30789, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 30809, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 30825, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 30846, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 30862, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 30882, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 30911, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 30930, 0x00008861 }, /* GL_POINT_SPRITE_OES */
+   { 30950, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 30976, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 30991, 0x00000009 }, /* GL_POLYGON */
+   { 31002, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 31017, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 31033, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 31056, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 31081, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 31104, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 31127, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 31151, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 31175, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 31193, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 31216, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 31235, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 31258, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 31275, 0x00001203 }, /* GL_POSITION */
+   { 31287, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 31319, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 31355, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 31388, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 31425, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 31456, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 31491, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 31523, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 31559, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 31592, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 31624, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 31660, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 31693, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 31730, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 31760, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 31794, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 31825, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 31860, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 31891, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 31926, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 31958, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 31994, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 32024, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 32058, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 32089, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 32124, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 32156, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 32187, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 32222, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 32254, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 32290, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 32319, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 32352, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 32382, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 32416, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 32455, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 32488, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 32528, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 32562, 0x00008578 }, /* GL_PREVIOUS */
+   { 32574, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 32590, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 32606, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 32623, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 32644, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 32665, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED */
+   { 32689, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */
+   { 32717, 0x00008F9D }, /* GL_PRIMITIVE_RESTART */
+   { 32738, 0x00008F9E }, /* GL_PRIMITIVE_RESTART_INDEX */
+   { 32765, 0x00008559 }, /* GL_PRIMITIVE_RESTART_INDEX_NV */
+   { 32795, 0x00008558 }, /* GL_PRIMITIVE_RESTART_NV */
+   { 32819, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 32852, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 32884, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 32907, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS */
+   { 32933, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
+   { 32963, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH */
+   { 32988, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
+   { 33017, 0x00008257 }, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
+   { 33052, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 33075, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 33105, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 33134, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 33162, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 33184, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 33212, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 33240, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 33262, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 33283, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 33323, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 33362, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 33392, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 33427, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 33460, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 33494, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 33533, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 33572, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 33594, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 33620, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 33644, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE */
+   { 33666, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
+   { 33692, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 33715, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 33737, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 33758, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 33779, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 33806, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 33838, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 33870, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 33905, 0x00001701 }, /* GL_PROJECTION */
+   { 33919, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 33940, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 33983, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 34009, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
+   { 34029, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
+   { 34053, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 34074, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 34093, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 34116, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 34155, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 34193, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 34213, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY */
+   { 34239, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 34269, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 34293, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 34313, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY */
+   { 34339, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 34369, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 34393, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 34413, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 34446, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 34472, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 34502, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE */
+   { 34529, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 34560, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 34590, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
+   { 34609, 0x00002003 }, /* GL_Q */
+   { 34614, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 34639, 0x00000007 }, /* GL_QUADS */
+   { 34648, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+   { 34692, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+   { 34740, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 34757, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 34771, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT */
+   { 34798, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
+   { 34828, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT */
+   { 34852, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
+   { 34879, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 34901, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 34927, 0x00008E14 }, /* GL_QUERY_NO_WAIT */
+   { 34944, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
+   { 34964, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 34980, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 35000, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 35026, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 35056, 0x00008E13 }, /* GL_QUERY_WAIT */
+   { 35070, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
+   { 35087, 0x00002002 }, /* GL_R */
+   { 35092, 0x00008C3A }, /* GL_R11F_G11F_B10F */
+   { 35110, 0x00008F98 }, /* GL_R16_SNORM */
+   { 35123, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 35135, 0x00008F94 }, /* GL_R8_SNORM */
+   { 35147, 0x00008C89 }, /* GL_RASTERIZER_DISCARD */
+   { 35169, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
+   { 35195, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 35228, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 35243, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 35263, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
+   { 35291, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 35323, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 35347, 0x000088B8 }, /* GL_READ_ONLY */
+   { 35360, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 35377, 0x000088BA }, /* GL_READ_WRITE */
+   { 35391, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 35409, 0x00001903 }, /* GL_RED */
+   { 35416, 0x00008016 }, /* GL_REDUCE */
+   { 35426, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 35440, 0x00000D15 }, /* GL_RED_BIAS */
+   { 35452, 0x00000D52 }, /* GL_RED_BITS */
+   { 35464, 0x00008D94 }, /* GL_RED_INTEGER */
+   { 35479, 0x00008D94 }, /* GL_RED_INTEGER_EXT */
+   { 35498, 0x00000D14 }, /* GL_RED_SCALE */
+   { 35511, 0x00008F90 }, /* GL_RED_SNORM */
+   { 35524, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 35542, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 35564, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 35585, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
+   { 35607, 0x00008A19 }, /* GL_RELEASED_APPLE */
+   { 35625, 0x00001C00 }, /* GL_RENDER */
+   { 35635, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 35651, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 35678, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
+   { 35709, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
+   { 35733, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 35761, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
+   { 35789, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 35815, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
+   { 35845, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 35872, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
+   { 35903, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 35923, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 35950, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
+   { 35981, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 36004, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 36031, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
+   { 36058, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 36090, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 36126, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
+   { 36162, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
+   { 36182, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 36207, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
+   { 36236, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 36260, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
+   { 36288, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 36317, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
+   { 36350, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 36372, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 36398, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
+   { 36424, 0x00001F01 }, /* GL_RENDERER */
+   { 36436, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 36451, 0x00002901 }, /* GL_REPEAT */
+   { 36461, 0x00001E01 }, /* GL_REPLACE */
+   { 36472, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 36487, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 36510, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 36528, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 36550, 0x00008256 }, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
+   { 36585, 0x00008A1B }, /* GL_RETAINED_APPLE */
+   { 36603, 0x00000102 }, /* GL_RETURN */
+   { 36613, 0x00008F99 }, /* GL_RG16_SNORM */
+   { 36627, 0x00008F95 }, /* GL_RG8_SNORM */
+   { 36640, 0x00001907 }, /* GL_RGB */
+   { 36647, 0x00008052 }, /* GL_RGB10 */
+   { 36656, 0x00008059 }, /* GL_RGB10_A2 */
+   { 36668, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 36684, 0x00008052 }, /* GL_RGB10_EXT */
+   { 36697, 0x00008053 }, /* GL_RGB12 */
+   { 36706, 0x00008053 }, /* GL_RGB12_EXT */
+   { 36719, 0x00008054 }, /* GL_RGB16 */
+   { 36728, 0x0000881B }, /* GL_RGB16F */
+   { 36738, 0x00008D89 }, /* GL_RGB16I */
+   { 36748, 0x00008D89 }, /* GL_RGB16I_EXT */
+   { 36762, 0x00008D77 }, /* GL_RGB16UI */
+   { 36773, 0x00008D77 }, /* GL_RGB16UI_EXT */
+   { 36788, 0x00008054 }, /* GL_RGB16_EXT */
+   { 36801, 0x00008F9A }, /* GL_RGB16_SNORM */
+   { 36816, 0x0000804E }, /* GL_RGB2_EXT */
+   { 36828, 0x00008815 }, /* GL_RGB32F */
+   { 36838, 0x00008D83 }, /* GL_RGB32I */
+   { 36848, 0x00008D83 }, /* GL_RGB32I_EXT */
+   { 36862, 0x00008D71 }, /* GL_RGB32UI */
+   { 36873, 0x00008D71 }, /* GL_RGB32UI_EXT */
+   { 36888, 0x0000804F }, /* GL_RGB4 */
+   { 36896, 0x0000804F }, /* GL_RGB4_EXT */
+   { 36908, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 36921, 0x00008050 }, /* GL_RGB5 */
+   { 36929, 0x00008D62 }, /* GL_RGB565 */
+   { 36939, 0x00008D62 }, /* GL_RGB565_OES */
+   { 36953, 0x00008057 }, /* GL_RGB5_A1 */
+   { 36964, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 36979, 0x00008057 }, /* GL_RGB5_A1_OES */
+   { 36994, 0x00008050 }, /* GL_RGB5_EXT */
+   { 37006, 0x00008051 }, /* GL_RGB8 */
+   { 37014, 0x00008D8F }, /* GL_RGB8I */
+   { 37023, 0x00008D8F }, /* GL_RGB8I_EXT */
+   { 37036, 0x00008D7D }, /* GL_RGB8UI */
+   { 37046, 0x00008D7D }, /* GL_RGB8UI_EXT */
+   { 37060, 0x00008051 }, /* GL_RGB8_EXT */
+   { 37072, 0x00008051 }, /* GL_RGB8_OES */
+   { 37084, 0x00008F96 }, /* GL_RGB8_SNORM */
+   { 37098, 0x00008C3D }, /* GL_RGB9_E5 */
+   { 37109, 0x00001908 }, /* GL_RGBA */
+   { 37117, 0x0000805A }, /* GL_RGBA12 */
+   { 37127, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 37141, 0x0000805B }, /* GL_RGBA16 */
+   { 37151, 0x0000881A }, /* GL_RGBA16F */
+   { 37162, 0x00008D88 }, /* GL_RGBA16I */
+   { 37173, 0x00008D88 }, /* GL_RGBA16I_EXT */
+   { 37188, 0x00008D76 }, /* GL_RGBA16UI */
+   { 37200, 0x00008D76 }, /* GL_RGBA16UI_EXT */
+   { 37216, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 37230, 0x00008F9B }, /* GL_RGBA16_SNORM */
+   { 37246, 0x00008055 }, /* GL_RGBA2 */
+   { 37255, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 37268, 0x00008814 }, /* GL_RGBA32F */
+   { 37279, 0x00008D82 }, /* GL_RGBA32I */
+   { 37290, 0x00008D82 }, /* GL_RGBA32I_EXT */
+   { 37305, 0x00008D70 }, /* GL_RGBA32UI */
+   { 37317, 0x00008D70 }, /* GL_RGBA32UI_EXT */
+   { 37333, 0x00008056 }, /* GL_RGBA4 */
+   { 37342, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 37361, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 37374, 0x00008056 }, /* GL_RGBA4_OES */
+   { 37387, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 37401, 0x00008058 }, /* GL_RGBA8 */
+   { 37410, 0x00008D8E }, /* GL_RGBA8I */
+   { 37420, 0x00008D8E }, /* GL_RGBA8I_EXT */
+   { 37434, 0x00008D7C }, /* GL_RGBA8UI */
+   { 37445, 0x00008D7C }, /* GL_RGBA8UI_EXT */
+   { 37460, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 37473, 0x00008058 }, /* GL_RGBA8_OES */
+   { 37486, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 37501, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 37519, 0x00008820 }, /* GL_RGBA_FLOAT_MODE_ARB */
+   { 37542, 0x00008D99 }, /* GL_RGBA_INTEGER */
+   { 37558, 0x00008D99 }, /* GL_RGBA_INTEGER_EXT */
+   { 37578, 0x00008D9E }, /* GL_RGBA_INTEGER_MODE_EXT */
+   { 37603, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 37616, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 37629, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 37643, 0x00008D98 }, /* GL_RGB_INTEGER */
+   { 37658, 0x00008D98 }, /* GL_RGB_INTEGER_EXT */
+   { 37677, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 37689, 0x00008573 }, /* GL_RGB_SCALE */
+   { 37702, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 37719, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 37736, 0x00008F92 }, /* GL_RGB_SNORM */
+   { 37749, 0x00008F91 }, /* GL_RG_SNORM */
+   { 37761, 0x00000407 }, /* GL_RIGHT */
+   { 37770, 0x00002000 }, /* GL_S */
+   { 37775, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 37789, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY */
+   { 37809, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY_EXT */
+   { 37833, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW */
+   { 37860, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW_EXT */
+   { 37891, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 37912, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 37926, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY */
+   { 37946, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY_EXT */
+   { 37970, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW */
+   { 37997, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW_EXT */
+   { 38028, 0x00008B63 }, /* GL_SAMPLER_2D_RECT */
+   { 38047, 0x00008B64 }, /* GL_SAMPLER_2D_RECT_SHADOW */
+   { 38073, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 38094, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 38108, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
+   { 38126, 0x00008919 }, /* GL_SAMPLER_BINDING */
+   { 38145, 0x00008DC2 }, /* GL_SAMPLER_BUFFER */
+   { 38163, 0x00008DC2 }, /* GL_SAMPLER_BUFFER_EXT */
+   { 38185, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 38201, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW */
+   { 38224, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW_EXT */
+   { 38251, 0x000080A9 }, /* GL_SAMPLES */
+   { 38262, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 38278, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 38293, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 38311, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 38333, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 38361, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 38393, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 38416, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 38443, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 38461, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 38484, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 38506, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 38525, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 38548, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 38574, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 38604, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 38629, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 38658, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 38673, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 38688, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 38704, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 38729, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 38769, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 38813, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 38846, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 38876, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 38908, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 38938, 0x00001C02 }, /* GL_SELECT */
+   { 38948, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 38976, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 39001, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 39017, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS */
+   { 39037, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
+   { 39061, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 39088, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 39119, 0x0000150F }, /* GL_SET */
+   { 39126, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
+   { 39151, 0x00008DFA }, /* GL_SHADER_COMPILER */
+   { 39170, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 39191, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 39215, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 39230, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 39245, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 39273, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 39296, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 39326, 0x00001601 }, /* GL_SHININESS */
+   { 39339, 0x00001402 }, /* GL_SHORT */
+   { 39348, 0x00009119 }, /* GL_SIGNALED */
+   { 39360, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 39381, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 39397, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 39417, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 39436, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 39450, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 39465, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 39487, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 39507, 0x00001D01 }, /* GL_SMOOTH */
+   { 39517, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 39550, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 39577, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 39610, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 39637, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 39654, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 39675, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 39696, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 39711, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 39730, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 39749, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 39766, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 39787, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 39808, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 39823, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 39842, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 39861, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 39878, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 39899, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 39920, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 39935, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 39954, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 39973, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 39993, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 40011, 0x00001202 }, /* GL_SPECULAR */
+   { 40023, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 40037, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 40052, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 40070, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 40087, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 40101, 0x00008580 }, /* GL_SRC0_RGB */
+   { 40113, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 40127, 0x00008581 }, /* GL_SRC1_RGB */
+   { 40139, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 40153, 0x00008582 }, /* GL_SRC2_RGB */
+   { 40165, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 40178, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 40200, 0x00000300 }, /* GL_SRC_COLOR */
+   { 40213, 0x00008C40 }, /* GL_SRGB */
+   { 40221, 0x00008C41 }, /* GL_SRGB8 */
+   { 40230, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 40246, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 40260, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 40278, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 40297, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 40312, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 40331, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 40346, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 40365, 0x000088E5 }, /* GL_STATIC_READ */
+   { 40380, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 40399, 0x00001802 }, /* GL_STENCIL */
+   { 40410, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 40432, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 40458, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
+   { 40484, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 40505, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 40530, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 40551, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 40576, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 40608, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 40644, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 40676, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 40712, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 40732, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 40759, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 40785, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 40801, 0x00008224 }, /* GL_STENCIL_BUFFER */
+   { 40819, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 40841, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 40864, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 40880, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 40896, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 40913, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
+   { 40931, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
+   { 40950, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 40973, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 40995, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
+   { 41017, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
+   { 41035, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 41057, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
+   { 41079, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
+   { 41097, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 41119, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
+   { 41141, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 41162, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 41189, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 41216, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 41231, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 41247, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 41276, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 41298, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 41319, 0x00000C33 }, /* GL_STEREO */
+   { 41329, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
+   { 41353, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
+   { 41378, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
+   { 41402, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 41417, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 41436, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 41451, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 41470, 0x000088E1 }, /* GL_STREAM_READ */
+   { 41485, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 41504, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 41521, 0x000084E7 }, /* GL_SUBTRACT */
+   { 41533, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 41549, 0x00009113 }, /* GL_SYNC_CONDITION */
+   { 41567, 0x00009116 }, /* GL_SYNC_FENCE */
+   { 41581, 0x00009115 }, /* GL_SYNC_FLAGS */
+   { 41595, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
+   { 41622, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+   { 41652, 0x00009114 }, /* GL_SYNC_STATUS */
+   { 41667, 0x00002001 }, /* GL_T */
+   { 41672, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 41687, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 41706, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 41722, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 41737, 0x00002A27 }, /* GL_T2F_V3F */
+   { 41748, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 41767, 0x00002A28 }, /* GL_T4F_V4F */
+   { 41778, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 41801, 0x00001702 }, /* GL_TEXTURE */
+   { 41812, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 41824, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 41840, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 41852, 0x000084CA }, /* GL_TEXTURE10 */
+   { 41865, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 41882, 0x000084CB }, /* GL_TEXTURE11 */
+   { 41895, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 41912, 0x000084CC }, /* GL_TEXTURE12 */
+   { 41925, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 41942, 0x000084CD }, /* GL_TEXTURE13 */
+   { 41955, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 41972, 0x000084CE }, /* GL_TEXTURE14 */
+   { 41985, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 42002, 0x000084CF }, /* GL_TEXTURE15 */
+   { 42015, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 42032, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 42045, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 42062, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 42075, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 42092, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 42105, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 42122, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 42135, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 42152, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 42168, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 42180, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 42193, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 42210, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 42223, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 42240, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 42253, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 42270, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 42283, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 42300, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 42313, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 42330, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 42343, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 42360, 0x000084DA }, /* GL_TEXTURE26 */
+   { 42373, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 42390, 0x000084DB }, /* GL_TEXTURE27 */
+   { 42403, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 42420, 0x000084DC }, /* GL_TEXTURE28 */
+   { 42433, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 42450, 0x000084DD }, /* GL_TEXTURE29 */
+   { 42463, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 42480, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 42496, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 42508, 0x000084DE }, /* GL_TEXTURE30 */
+   { 42521, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 42538, 0x000084DF }, /* GL_TEXTURE31 */
+   { 42551, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 42568, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 42584, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 42596, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 42612, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 42624, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 42640, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 42652, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 42668, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 42680, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 42696, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 42708, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 42724, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 42736, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 42752, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 42766, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY */
+   { 42786, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 42810, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 42824, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY */
+   { 42844, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 42868, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 42882, 0x0000806F }, /* GL_TEXTURE_3D_OES */
+   { 42900, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 42922, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 42948, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 42970, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 42992, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY */
+   { 43020, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 43052, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 43074, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY */
+   { 43102, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 43134, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 43156, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
+   { 43182, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER */
+   { 43208, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER_ARB */
+   { 43238, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 43266, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 43298, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
+   { 43330, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE */
+   { 43359, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 43392, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 43424, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 43439, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 43460, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 43485, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 43503, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 43527, 0x00008C2A }, /* GL_TEXTURE_BUFFER */
+   { 43545, 0x00008C2A }, /* GL_TEXTURE_BUFFER_ARB */
+   { 43567, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
+   { 43604, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB */
+   { 43645, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT */
+   { 43670, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT_ARB */
+   { 43699, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 43730, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 43760, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 43790, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 43825, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 43856, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 43894, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 43921, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 43953, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 43987, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 44011, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 44039, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 44063, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 44091, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 44124, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 44148, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 44170, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 44192, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 44218, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 44252, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 44285, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 44322, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 44350, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 44382, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 44405, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 44443, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 44485, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 44516, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 44544, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 44574, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 44602, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
+   { 44627, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 44647, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 44671, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 44702, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 44737, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
+   { 44772, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 44803, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 44838, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
+   { 44873, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 44904, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 44939, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
+   { 44974, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
+   { 44998, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 45029, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 45064, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
+   { 45099, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 45130, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 45165, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
+   { 45200, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 45231, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 45266, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
+   { 45301, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+   { 45330, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 45347, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 45369, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 45395, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 45410, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 45431, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 45451, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 45477, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
+   { 45507, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 45527, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
+   { 45551, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 45568, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 45585, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 45602, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
+   { 45625, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 45642, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 45667, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 45689, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 45715, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 45733, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 45759, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 45785, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 45815, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 45842, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 45867, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 45887, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 45911, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 45938, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 45965, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 45992, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 46018, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 46048, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 46070, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 46088, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 46128, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 46158, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 46186, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 46214, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 46242, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 46263, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 46282, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 46304, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 46323, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 46343, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+   { 46373, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+   { 46404, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE */
+   { 46425, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 46450, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 46474, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 46494, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 46518, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 46538, 0x00008C3F }, /* GL_TEXTURE_SHARED_SIZE */
+   { 46561, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 46584, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 46608, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
+   { 46636, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+   { 46666, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 46691, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 46725, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 46742, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 46760, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
+   { 46782, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 46800, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 46818, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
+   { 46837, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 46857, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 46876, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 46905, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 46922, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
+   { 46944, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
+   { 46974, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER */
+   { 47003, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+   { 47039, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
+   { 47076, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
+   { 47117, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
+   { 47150, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
+   { 47184, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
+   { 47222, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+   { 47258, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
+   { 47292, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
+   { 47330, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
+   { 47365, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
+   { 47404, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
+   { 47445, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
+   { 47490, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
+   { 47521, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
+   { 47556, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
+   { 47597, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
+   { 47642, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 47668, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 47698, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 47730, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 47760, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 47794, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 47810, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 47841, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 47876, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 47904, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 47936, 0x00000004 }, /* GL_TRIANGLES */
+   { 47949, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY */
+   { 47972, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
+   { 47999, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 48015, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 48036, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 48054, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY */
+   { 48082, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
+   { 48114, 0x00000001 }, /* GL_TRUE */
+   { 48122, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
+   { 48141, 0x00008255 }, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
+   { 48170, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 48190, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 48213, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 48233, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 48254, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 48276, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 48298, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 48318, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 48339, 0x00009118 }, /* GL_UNSIGNALED */
+   { 48353, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 48370, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 48397, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 48420, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 48436, 0x00008C3B }, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
+   { 48468, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 48495, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+   { 48526, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 48547, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
+   { 48572, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 48596, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
+   { 48621, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 48652, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
+   { 48687, 0x00008C3E }, /* GL_UNSIGNED_INT_5_9_9_9_REV */
+   { 48715, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 48739, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 48767, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D */
+   { 48794, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
+   { 48827, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT */
+   { 48864, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D_EXT */
+   { 48895, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D */
+   { 48922, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
+   { 48955, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT */
+   { 48992, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D_EXT */
+   { 49023, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
+   { 49055, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT */
+   { 49091, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D */
+   { 49118, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D_EXT */
+   { 49149, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
+   { 49180, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT */
+   { 49215, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
+   { 49244, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE_EXT */
+   { 49277, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2 */
+   { 49298, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2_EXT */
+   { 49323, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3 */
+   { 49344, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3_EXT */
+   { 49369, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4 */
+   { 49390, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4_EXT */
+   { 49415, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 49438, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 49456, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 49486, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
+   { 49520, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 49546, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 49576, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
+   { 49610, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 49636, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 49660, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 49688, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 49716, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 49743, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 49775, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 49806, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 49820, 0x00002A20 }, /* GL_V2F */
+   { 49827, 0x00002A21 }, /* GL_V3F */
+   { 49834, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 49853, 0x00001F00 }, /* GL_VENDOR */
+   { 49863, 0x00001F02 }, /* GL_VERSION */
+   { 49874, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 49890, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 49914, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 49944, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 49975, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 50010, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 50034, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 50055, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 50078, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 50099, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 50126, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 50154, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 50182, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 50210, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 50238, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 50266, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 50294, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 50321, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 50348, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 50375, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 50402, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 50429, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 50456, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 50483, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 50510, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 50537, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 50575, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 50617, 0x000088FE }, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
+   { 50652, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 50683, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 50718, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
+   { 50749, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT */
+   { 50784, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 50818, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 50856, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 50887, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 50922, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 50950, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 50982, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 51012, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 51046, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 51074, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 51106, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 51126, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 51148, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 51177, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 51198, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 51227, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 51260, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 51292, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 51319, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 51350, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 51380, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 51397, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 51418, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 51445, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 51457, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 51473, 0x00008A1A }, /* GL_VOLATILE_APPLE */
+   { 51491, 0x0000911D }, /* GL_WAIT_FAILED */
+   { 51506, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 51526, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 51557, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 51592, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
+   { 51627, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
+   { 51647, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 51675, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
+   { 51703, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 51728, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
+   { 51753, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 51780, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
+   { 51807, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 51832, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
+   { 51857, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 51881, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 51900, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 51914, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 51932, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
+   { 51950, 0x00001506 }, /* GL_XOR */
+   { 51957, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 51976, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 51990, 0x00000000 }, /* GL_ZERO */
+   { 51998, 0x00000D16 }, /* GL_ZOOM_X */
+   { 52008, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1562] =
+static const unsigned reduced_enums[1563] =
 {
        539, /* GL_FALSE */
        834, /* GL_LINES */
        838, /* GL_LINE_LOOP */
        845, /* GL_LINE_STRIP */
-      2152, /* GL_TRIANGLES */
-      2157, /* GL_TRIANGLE_STRIP */
-      2155, /* GL_TRIANGLE_FAN */
-      1517, /* GL_QUADS */
-      1521, /* GL_QUAD_STRIP */
-      1388, /* GL_POLYGON */
+      2156, /* GL_TRIANGLES */
+      2161, /* GL_TRIANGLE_STRIP */
+      2159, /* GL_TRIANGLE_FAN */
+      1521, /* GL_QUADS */
+      1525, /* GL_QUAD_STRIP */
+      1389, /* GL_POLYGON */
        835, /* GL_LINES_ADJACENCY */
        846, /* GL_LINE_STRIP_ADJACENCY */
-      2153, /* GL_TRIANGLES_ADJACENCY */
-      2158, /* GL_TRIANGLE_STRIP_ADJACENCY */
-      1400, /* GL_POLYGON_STIPPLE_BIT */
-      1343, /* GL_PIXEL_MODE_BIT */
+      2157, /* GL_TRIANGLES_ADJACENCY */
+      2162, /* GL_TRIANGLE_STRIP_ADJACENCY */
+      1401, /* GL_POLYGON_STIPPLE_BIT */
+      1344, /* GL_PIXEL_MODE_BIT */
        821, /* GL_LIGHTING_BIT */
        573, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
        857, /* GL_LOAD */
-      1607, /* GL_RETURN */
+      1611, /* GL_RETURN */
       1209, /* GL_MULT */
         24, /* GL_ADD */
       1225, /* GL_NEVER */
@@ -4702,15 +4710,15 @@ static const unsigned reduced_enums[1562] =
       1242, /* GL_NOTEQUAL */
        695, /* GL_GEQUAL */
         55, /* GL_ALWAYS */
-      1816, /* GL_SRC_COLOR */
-      1276, /* GL_ONE_MINUS_SRC_COLOR */
-      1814, /* GL_SRC_ALPHA */
-      1275, /* GL_ONE_MINUS_SRC_ALPHA */
+      1820, /* GL_SRC_COLOR */
+      1277, /* GL_ONE_MINUS_SRC_COLOR */
+      1818, /* GL_SRC_ALPHA */
+      1276, /* GL_ONE_MINUS_SRC_ALPHA */
        508, /* GL_DST_ALPHA */
-      1273, /* GL_ONE_MINUS_DST_ALPHA */
+      1274, /* GL_ONE_MINUS_DST_ALPHA */
        509, /* GL_DST_COLOR */
-      1274, /* GL_ONE_MINUS_DST_COLOR */
-      1815, /* GL_SRC_ALPHA_SATURATE */
+      1275, /* GL_ONE_MINUS_DST_COLOR */
+      1819, /* GL_SRC_ALPHA_SATURATE */
        672, /* GL_FRONT_LEFT */
        673, /* GL_FRONT_RIGHT */
         77, /* GL_BACK_LEFT */
@@ -4718,7 +4726,7 @@ static const unsigned reduced_enums[1562] =
        669, /* GL_FRONT */
         76, /* GL_BACK */
        809, /* GL_LEFT */
-      1697, /* GL_RIGHT */
+      1701, /* GL_RIGHT */
        670, /* GL_FRONT_AND_BACK */
         71, /* GL_AUX0 */
         72, /* GL_AUX1 */
@@ -4727,19 +4735,19 @@ static const unsigned reduced_enums[1562] =
        797, /* GL_INVALID_ENUM */
        802, /* GL_INVALID_VALUE */
        801, /* GL_INVALID_OPERATION */
-      1821, /* GL_STACK_OVERFLOW */
-      1822, /* GL_STACK_UNDERFLOW */
-      1301, /* GL_OUT_OF_MEMORY */
+      1825, /* GL_STACK_OVERFLOW */
+      1826, /* GL_STACK_UNDERFLOW */
+      1302, /* GL_OUT_OF_MEMORY */
        798, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1321, /* GL_PASS_THROUGH_TOKEN */
-      1387, /* GL_POINT_TOKEN */
+      1322, /* GL_PASS_THROUGH_TOKEN */
+      1388, /* GL_POINT_TOKEN */
        848, /* GL_LINE_TOKEN */
-      1401, /* GL_POLYGON_TOKEN */
+      1402, /* GL_POLYGON_TOKEN */
         87, /* GL_BITMAP_TOKEN */
        507, /* GL_DRAW_PIXEL_TOKEN */
        353, /* GL_COPY_PIXEL_TOKEN */
@@ -4749,7 +4757,7 @@ static const unsigned reduced_enums[1562] =
        390, /* GL_CW */
        154, /* GL_CCW */
        187, /* GL_COEFF */
-      1298, /* GL_ORDER */
+      1299, /* GL_ORDER */
        444, /* GL_DOMAIN */
        363, /* GL_CURRENT_COLOR */
        366, /* GL_CURRENT_INDEX */
@@ -4761,10 +4769,10 @@ static const unsigned reduced_enums[1562] =
        381, /* GL_CURRENT_RASTER_POSITION */
        382, /* GL_CURRENT_RASTER_POSITION_VALID */
        379, /* GL_CURRENT_RASTER_DISTANCE */
-      1379, /* GL_POINT_SMOOTH */
-      1363, /* GL_POINT_SIZE */
-      1378, /* GL_POINT_SIZE_RANGE */
-      1369, /* GL_POINT_SIZE_GRANULARITY */
+      1380, /* GL_POINT_SMOOTH */
+      1364, /* GL_POINT_SIZE */
+      1379, /* GL_POINT_SIZE_RANGE */
+      1370, /* GL_POINT_SIZE_GRANULARITY */
        840, /* GL_LINE_SMOOTH */
        849, /* GL_LINE_WIDTH */
        851, /* GL_LINE_WIDTH_RANGE */
@@ -4776,9 +4784,9 @@ static const unsigned reduced_enums[1562] =
       1064, /* GL_MAX_LIST_NESTING */
        853, /* GL_LIST_BASE */
        855, /* GL_LIST_INDEX */
-      1390, /* GL_POLYGON_MODE */
-      1397, /* GL_POLYGON_SMOOTH */
-      1399, /* GL_POLYGON_STIPPLE */
+      1391, /* GL_POLYGON_MODE */
+      1398, /* GL_POLYGON_SMOOTH */
+      1400, /* GL_POLYGON_STIPPLE */
        518, /* GL_EDGE_FLAG */
        356, /* GL_CULL_FACE */
        357, /* GL_CULL_FACE_MODE */
@@ -4787,7 +4795,7 @@ static const unsigned reduced_enums[1562] =
        825, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
        826, /* GL_LIGHT_MODEL_TWO_SIDE */
        822, /* GL_LIGHT_MODEL_AMBIENT */
-      1763, /* GL_SHADE_MODEL */
+      1767, /* GL_SHADE_MODEL */
        235, /* GL_COLOR_MATERIAL_FACE */
        236, /* GL_COLOR_MATERIAL_PARAMETER */
        234, /* GL_COLOR_MATERIAL */
@@ -4804,24 +4812,24 @@ static const unsigned reduced_enums[1562] =
        414, /* GL_DEPTH_CLEAR_VALUE */
        428, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1866, /* GL_STENCIL_TEST */
-      1847, /* GL_STENCIL_CLEAR_VALUE */
-      1849, /* GL_STENCIL_FUNC */
-      1868, /* GL_STENCIL_VALUE_MASK */
-      1848, /* GL_STENCIL_FAIL */
-      1863, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1864, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1865, /* GL_STENCIL_REF */
-      1869, /* GL_STENCIL_WRITEMASK */
+      1870, /* GL_STENCIL_TEST */
+      1851, /* GL_STENCIL_CLEAR_VALUE */
+      1853, /* GL_STENCIL_FUNC */
+      1872, /* GL_STENCIL_VALUE_MASK */
+      1852, /* GL_STENCIL_FAIL */
+      1867, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1868, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1869, /* GL_STENCIL_REF */
+      1873, /* GL_STENCIL_WRITEMASK */
       1014, /* GL_MATRIX_MODE */
       1231, /* GL_NORMALIZE */
-      2285, /* GL_VIEWPORT */
+      2289, /* GL_VIEWPORT */
       1204, /* GL_MODELVIEW_STACK_DEPTH */
-      1491, /* GL_PROJECTION_STACK_DEPTH */
-      2106, /* GL_TEXTURE_STACK_DEPTH */
+      1495, /* GL_PROJECTION_STACK_DEPTH */
+      2110, /* GL_TEXTURE_STACK_DEPTH */
       1201, /* GL_MODELVIEW_MATRIX */
-      1489, /* GL_PROJECTION_MATRIX */
-      2086, /* GL_TEXTURE_MATRIX */
+      1493, /* GL_PROJECTION_MATRIX */
+      2090, /* GL_TEXTURE_MATRIX */
         69, /* GL_ATTRIB_STACK_DEPTH */
        169, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         51, /* GL_ALPHA_TEST */
@@ -4836,67 +4844,67 @@ static const unsigned reduced_enums[1562] =
        233, /* GL_COLOR_LOGIC_OP */
         75, /* GL_AUX_BUFFERS */
        454, /* GL_DRAW_BUFFER */
-      1544, /* GL_READ_BUFFER */
-      1740, /* GL_SCISSOR_BOX */
-      1741, /* GL_SCISSOR_TEST */
+      1548, /* GL_READ_BUFFER */
+      1744, /* GL_SCISSOR_BOX */
+      1745, /* GL_SCISSOR_TEST */
        744, /* GL_INDEX_CLEAR_VALUE */
        749, /* GL_INDEX_WRITEMASK */
        230, /* GL_COLOR_CLEAR_VALUE */
        272, /* GL_COLOR_WRITEMASK */
        746, /* GL_INDEX_MODE */
-      1686, /* GL_RGBA_MODE */
+      1690, /* GL_RGBA_MODE */
        453, /* GL_DOUBLEBUFFER */
-      1870, /* GL_STEREO */
-      1598, /* GL_RENDER_MODE */
-      1322, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1380, /* GL_POINT_SMOOTH_HINT */
+      1874, /* GL_STEREO */
+      1602, /* GL_RENDER_MODE */
+      1323, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1381, /* GL_POINT_SMOOTH_HINT */
        841, /* GL_LINE_SMOOTH_HINT */
-      1398, /* GL_POLYGON_SMOOTH_HINT */
+      1399, /* GL_POLYGON_SMOOTH_HINT */
        593, /* GL_FOG_HINT */
-      2066, /* GL_TEXTURE_GEN_S */
-      2068, /* GL_TEXTURE_GEN_T */
-      2065, /* GL_TEXTURE_GEN_R */
-      2064, /* GL_TEXTURE_GEN_Q */
-      1335, /* GL_PIXEL_MAP_I_TO_I */
-      1341, /* GL_PIXEL_MAP_S_TO_S */
-      1337, /* GL_PIXEL_MAP_I_TO_R */
-      1333, /* GL_PIXEL_MAP_I_TO_G */
-      1331, /* GL_PIXEL_MAP_I_TO_B */
-      1329, /* GL_PIXEL_MAP_I_TO_A */
-      1339, /* GL_PIXEL_MAP_R_TO_R */
-      1327, /* GL_PIXEL_MAP_G_TO_G */
-      1325, /* GL_PIXEL_MAP_B_TO_B */
-      1323, /* GL_PIXEL_MAP_A_TO_A */
-      1336, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1342, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1338, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1334, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1332, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1330, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1340, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1328, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1326, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1324, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      2170, /* GL_UNPACK_SWAP_BYTES */
-      2165, /* GL_UNPACK_LSB_FIRST */
-      2166, /* GL_UNPACK_ROW_LENGTH */
-      2169, /* GL_UNPACK_SKIP_ROWS */
-      2168, /* GL_UNPACK_SKIP_PIXELS */
-      2163, /* GL_UNPACK_ALIGNMENT */
-      1310, /* GL_PACK_SWAP_BYTES */
-      1305, /* GL_PACK_LSB_FIRST */
-      1306, /* GL_PACK_ROW_LENGTH */
-      1309, /* GL_PACK_SKIP_ROWS */
-      1308, /* GL_PACK_SKIP_PIXELS */
-      1302, /* GL_PACK_ALIGNMENT */
+      2070, /* GL_TEXTURE_GEN_S */
+      2072, /* GL_TEXTURE_GEN_T */
+      2069, /* GL_TEXTURE_GEN_R */
+      2068, /* GL_TEXTURE_GEN_Q */
+      1336, /* GL_PIXEL_MAP_I_TO_I */
+      1342, /* GL_PIXEL_MAP_S_TO_S */
+      1338, /* GL_PIXEL_MAP_I_TO_R */
+      1334, /* GL_PIXEL_MAP_I_TO_G */
+      1332, /* GL_PIXEL_MAP_I_TO_B */
+      1330, /* GL_PIXEL_MAP_I_TO_A */
+      1340, /* GL_PIXEL_MAP_R_TO_R */
+      1328, /* GL_PIXEL_MAP_G_TO_G */
+      1326, /* GL_PIXEL_MAP_B_TO_B */
+      1324, /* GL_PIXEL_MAP_A_TO_A */
+      1337, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1343, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1339, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1335, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1333, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1331, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1341, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1329, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1327, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1325, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      2174, /* GL_UNPACK_SWAP_BYTES */
+      2169, /* GL_UNPACK_LSB_FIRST */
+      2170, /* GL_UNPACK_ROW_LENGTH */
+      2173, /* GL_UNPACK_SKIP_ROWS */
+      2172, /* GL_UNPACK_SKIP_PIXELS */
+      2167, /* GL_UNPACK_ALIGNMENT */
+      1311, /* GL_PACK_SWAP_BYTES */
+      1306, /* GL_PACK_LSB_FIRST */
+      1307, /* GL_PACK_ROW_LENGTH */
+      1310, /* GL_PACK_SKIP_ROWS */
+      1309, /* GL_PACK_SKIP_PIXELS */
+      1303, /* GL_PACK_ALIGNMENT */
        955, /* GL_MAP_COLOR */
        960, /* GL_MAP_STENCIL */
        748, /* GL_INDEX_SHIFT */
        747, /* GL_INDEX_OFFSET */
-      1560, /* GL_RED_SCALE */
-      1556, /* GL_RED_BIAS */
-      2311, /* GL_ZOOM_X */
-      2312, /* GL_ZOOM_Y */
+      1564, /* GL_RED_SCALE */
+      1560, /* GL_RED_BIAS */
+      2315, /* GL_ZOOM_X */
+      2316, /* GL_ZOOM_Y */
        702, /* GL_GREEN_SCALE */
        698, /* GL_GREEN_BIAS */
        115, /* GL_BLUE_SCALE */
@@ -4917,14 +4925,14 @@ static const unsigned reduced_enums[1562] =
       1120, /* GL_MAX_TEXTURE_STACK_DEPTH */
       1146, /* GL_MAX_VIEWPORT_DIMS */
       1023, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1880, /* GL_SUBPIXEL_BITS */
+      1884, /* GL_SUBPIXEL_BITS */
        743, /* GL_INDEX_BITS */
-      1557, /* GL_RED_BITS */
+      1561, /* GL_RED_BITS */
        699, /* GL_GREEN_BITS */
        112, /* GL_BLUE_BITS */
         48, /* GL_ALPHA_BITS */
        407, /* GL_DEPTH_BITS */
-      1844, /* GL_STENCIL_BITS */
+      1848, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
@@ -4953,39 +4961,39 @@ static const unsigned reduced_enums[1562] =
        903, /* GL_MAP1_GRID_SEGMENTS */
        929, /* GL_MAP2_GRID_DOMAIN */
        930, /* GL_MAP2_GRID_SEGMENTS */
-      1963, /* GL_TEXTURE_1D */
-      1966, /* GL_TEXTURE_2D */
+      1967, /* GL_TEXTURE_1D */
+      1970, /* GL_TEXTURE_2D */
        542, /* GL_FEEDBACK_BUFFER_POINTER */
        543, /* GL_FEEDBACK_BUFFER_SIZE */
        544, /* GL_FEEDBACK_BUFFER_TYPE */
-      1750, /* GL_SELECTION_BUFFER_POINTER */
-      1751, /* GL_SELECTION_BUFFER_SIZE */
-      2112, /* GL_TEXTURE_WIDTH */
-      2072, /* GL_TEXTURE_HEIGHT */
-      2016, /* GL_TEXTURE_COMPONENTS */
-      1994, /* GL_TEXTURE_BORDER_COLOR */
-      1993, /* GL_TEXTURE_BORDER */
+      1754, /* GL_SELECTION_BUFFER_POINTER */
+      1755, /* GL_SELECTION_BUFFER_SIZE */
+      2116, /* GL_TEXTURE_WIDTH */
+      2076, /* GL_TEXTURE_HEIGHT */
+      2020, /* GL_TEXTURE_COMPONENTS */
+      1998, /* GL_TEXTURE_BORDER_COLOR */
+      1997, /* GL_TEXTURE_BORDER */
        445, /* GL_DONT_CARE */
        540, /* GL_FASTEST */
       1226, /* GL_NICEST */
         56, /* GL_AMBIENT */
        442, /* GL_DIFFUSE */
-      1803, /* GL_SPECULAR */
-      1402, /* GL_POSITION */
-      1806, /* GL_SPOT_DIRECTION */
-      1807, /* GL_SPOT_EXPONENT */
-      1805, /* GL_SPOT_CUTOFF */
+      1807, /* GL_SPECULAR */
+      1403, /* GL_POSITION */
+      1810, /* GL_SPOT_DIRECTION */
+      1811, /* GL_SPOT_EXPONENT */
+      1809, /* GL_SPOT_CUTOFF */
        320, /* GL_CONSTANT_ATTENUATION */
        829, /* GL_LINEAR_ATTENUATION */
-      1516, /* GL_QUADRATIC_ATTENUATION */
+      1520, /* GL_QUADRATIC_ATTENUATION */
        287, /* GL_COMPILE */
        288, /* GL_COMPILE_AND_EXECUTE */
        149, /* GL_BYTE */
-      2172, /* GL_UNSIGNED_BYTE */
-      1768, /* GL_SHORT */
-      2211, /* GL_UNSIGNED_SHORT */
+      2176, /* GL_UNSIGNED_BYTE */
+      1772, /* GL_SHORT */
+      2215, /* GL_UNSIGNED_SHORT */
        752, /* GL_INT */
-      2175, /* GL_UNSIGNED_INT */
+      2179, /* GL_UNSIGNED_INT */
        553, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
@@ -4999,68 +5007,68 @@ static const unsigned reduced_enums[1562] =
        351, /* GL_COPY */
         59, /* GL_AND_INVERTED */
       1229, /* GL_NOOP */
-      2307, /* GL_XOR */
-      1297, /* GL_OR */
+      2311, /* GL_XOR */
+      1298, /* GL_OR */
       1230, /* GL_NOR */
        530, /* GL_EQUIV */
        805, /* GL_INVERT */
-      1300, /* GL_OR_REVERSE */
+      1301, /* GL_OR_REVERSE */
        352, /* GL_COPY_INVERTED */
-      1299, /* GL_OR_INVERTED */
+      1300, /* GL_OR_INVERTED */
       1219, /* GL_NAND */
-      1757, /* GL_SET */
+      1761, /* GL_SET */
        527, /* GL_EMISSION */
-      1767, /* GL_SHININESS */
+      1771, /* GL_SHININESS */
         57, /* GL_AMBIENT_AND_DIFFUSE */
        232, /* GL_COLOR_INDEXES */
       1168, /* GL_MODELVIEW */
-      1488, /* GL_PROJECTION */
-      1898, /* GL_TEXTURE */
+      1492, /* GL_PROJECTION */
+      1902, /* GL_TEXTURE */
        188, /* GL_COLOR */
        399, /* GL_DEPTH */
-      1829, /* GL_STENCIL */
+      1833, /* GL_STENCIL */
        231, /* GL_COLOR_INDEX */
-      1850, /* GL_STENCIL_INDEX */
+      1854, /* GL_STENCIL_INDEX */
        415, /* GL_DEPTH_COMPONENT */
-      1553, /* GL_RED */
+      1557, /* GL_RED */
        697, /* GL_GREEN */
        110, /* GL_BLUE */
         32, /* GL_ALPHA */
-      1610, /* GL_RGB */
-      1650, /* GL_RGBA */
+      1614, /* GL_RGB */
+      1654, /* GL_RGBA */
        864, /* GL_LUMINANCE */
        891, /* GL_LUMINANCE_ALPHA */
         86, /* GL_BITMAP */
-      1352, /* GL_POINT */
+      1353, /* GL_POINT */
        827, /* GL_LINE */
        545, /* GL_FILL */
-      1567, /* GL_RENDER */
+      1571, /* GL_RENDER */
        541, /* GL_FEEDBACK */
-      1749, /* GL_SELECT */
+      1753, /* GL_SELECT */
        552, /* GL_FLAT */
-      1778, /* GL_SMOOTH */
+      1782, /* GL_SMOOTH */
        806, /* GL_KEEP */
-      1600, /* GL_REPLACE */
+      1604, /* GL_REPLACE */
        733, /* GL_INCR */
        395, /* GL_DECR */
-      2228, /* GL_VENDOR */
-      1597, /* GL_RENDERER */
-      2229, /* GL_VERSION */
+      2232, /* GL_VENDOR */
+      1601, /* GL_RENDERER */
+      2233, /* GL_VERSION */
        534, /* GL_EXTENSIONS */
-      1698, /* GL_S */
-      1889, /* GL_T */
-      1536, /* GL_R */
-      1515, /* GL_Q */
+      1702, /* GL_S */
+      1893, /* GL_T */
+      1540, /* GL_R */
+      1519, /* GL_Q */
       1205, /* GL_MODULATE */
        394, /* GL_DECAL */
-      2059, /* GL_TEXTURE_ENV_MODE */
-      2058, /* GL_TEXTURE_ENV_COLOR */
-      2057, /* GL_TEXTURE_ENV */
+      2063, /* GL_TEXTURE_ENV_MODE */
+      2062, /* GL_TEXTURE_ENV_COLOR */
+      2061, /* GL_TEXTURE_ENV */
        535, /* GL_EYE_LINEAR */
-      1258, /* GL_OBJECT_LINEAR */
-      1804, /* GL_SPHERE_MAP */
-      2062, /* GL_TEXTURE_GEN_MODE */
-      1260, /* GL_OBJECT_PLANE */
+      1259, /* GL_OBJECT_LINEAR */
+      1808, /* GL_SPHERE_MAP */
+      2066, /* GL_TEXTURE_GEN_MODE */
+      1261, /* GL_OBJECT_PLANE */
        536, /* GL_EYE_PLANE */
       1220, /* GL_NEAREST */
        828, /* GL_LINEAR */
@@ -5068,30 +5076,30 @@ static const unsigned reduced_enums[1562] =
        833, /* GL_LINEAR_MIPMAP_NEAREST */
       1223, /* GL_NEAREST_MIPMAP_LINEAR */
        832, /* GL_LINEAR_MIPMAP_LINEAR */
-      2085, /* GL_TEXTURE_MAG_FILTER */
-      2094, /* GL_TEXTURE_MIN_FILTER */
-      2115, /* GL_TEXTURE_WRAP_S */
-      2116, /* GL_TEXTURE_WRAP_T */
+      2089, /* GL_TEXTURE_MAG_FILTER */
+      2098, /* GL_TEXTURE_MIN_FILTER */
+      2119, /* GL_TEXTURE_WRAP_S */
+      2120, /* GL_TEXTURE_WRAP_T */
        155, /* GL_CLAMP */
-      1599, /* GL_REPEAT */
-      1396, /* GL_POLYGON_OFFSET_UNITS */
-      1395, /* GL_POLYGON_OFFSET_POINT */
-      1394, /* GL_POLYGON_OFFSET_LINE */
-      1539, /* GL_R3_G3_B2 */
-      2225, /* GL_V2F */
-      2226, /* GL_V3F */
+      1603, /* GL_REPEAT */
+      1397, /* GL_POLYGON_OFFSET_UNITS */
+      1396, /* GL_POLYGON_OFFSET_POINT */
+      1395, /* GL_POLYGON_OFFSET_LINE */
+      1543, /* GL_R3_G3_B2 */
+      2229, /* GL_V2F */
+      2230, /* GL_V3F */
        152, /* GL_C4UB_V2F */
        153, /* GL_C4UB_V3F */
        150, /* GL_C3F_V3F */
       1217, /* GL_N3F_V3F */
        151, /* GL_C4F_N3F_V3F */
-      1894, /* GL_T2F_V3F */
-      1896, /* GL_T4F_V4F */
-      1892, /* GL_T2F_C4UB_V3F */
-      1890, /* GL_T2F_C3F_V3F */
-      1893, /* GL_T2F_N3F_V3F */
-      1891, /* GL_T2F_C4F_N3F_V3F */
-      1895, /* GL_T4F_C4F_N3F_V4F */
+      1898, /* GL_T2F_V3F */
+      1900, /* GL_T4F_V4F */
+      1896, /* GL_T2F_C4UB_V3F */
+      1894, /* GL_T2F_C3F_V3F */
+      1897, /* GL_T2F_N3F_V3F */
+      1895, /* GL_T2F_C4F_N3F_V3F */
+      1899, /* GL_T4F_C4F_N3F_V4F */
        172, /* GL_CLIP_DISTANCE0 */
        173, /* GL_CLIP_DISTANCE1 */
        174, /* GL_CLIP_DISTANCE2 */
@@ -5110,9 +5118,9 @@ static const unsigned reduced_enums[1562] =
        819, /* GL_LIGHT7 */
        708, /* GL_HINT_BIT */
        322, /* GL_CONSTANT_COLOR */
-      1271, /* GL_ONE_MINUS_CONSTANT_COLOR */
+      1272, /* GL_ONE_MINUS_CONSTANT_COLOR */
        317, /* GL_CONSTANT_ALPHA */
-      1269, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+      1270, /* GL_ONE_MINUS_CONSTANT_ALPHA */
         89, /* GL_BLEND_COLOR */
        674, /* GL_FUNC_ADD */
       1149, /* GL_MIN */
@@ -5122,26 +5130,26 @@ static const unsigned reduced_enums[1562] =
        677, /* GL_FUNC_REVERSE_SUBTRACT */
        331, /* GL_CONVOLUTION_1D */
        332, /* GL_CONVOLUTION_2D */
-      1752, /* GL_SEPARABLE_2D */
+      1756, /* GL_SEPARABLE_2D */
        335, /* GL_CONVOLUTION_BORDER_MODE */
        339, /* GL_CONVOLUTION_FILTER_SCALE */
        337, /* GL_CONVOLUTION_FILTER_BIAS */
-      1554, /* GL_REDUCE */
+      1558, /* GL_REDUCE */
        341, /* GL_CONVOLUTION_FORMAT */
        345, /* GL_CONVOLUTION_WIDTH */
        343, /* GL_CONVOLUTION_HEIGHT */
       1036, /* GL_MAX_CONVOLUTION_WIDTH */
       1034, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1435, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1431, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1426, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1422, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1433, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1429, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1424, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1420, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+      1436, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1432, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1427, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1423, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1434, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1430, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1425, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1421, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
        709, /* GL_HISTOGRAM */
-      1495, /* GL_PROXY_HISTOGRAM */
+      1499, /* GL_PROXY_HISTOGRAM */
        725, /* GL_HISTOGRAM_WIDTH */
        715, /* GL_HISTOGRAM_FORMAT */
        721, /* GL_HISTOGRAM_RED_SIZE */
@@ -5153,16 +5161,16 @@ static const unsigned reduced_enums[1562] =
       1150, /* GL_MINMAX */
       1152, /* GL_MINMAX_FORMAT */
       1154, /* GL_MINMAX_SINK */
-      1897, /* GL_TABLE_TOO_LARGE_EXT */
-      2174, /* GL_UNSIGNED_BYTE_3_3_2 */
-      2214, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      2217, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      2186, /* GL_UNSIGNED_INT_8_8_8_8 */
-      2177, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1393, /* GL_POLYGON_OFFSET_FILL */
-      1392, /* GL_POLYGON_OFFSET_FACTOR */
-      1391, /* GL_POLYGON_OFFSET_BIAS */
-      1603, /* GL_RESCALE_NORMAL */
+      1901, /* GL_TABLE_TOO_LARGE_EXT */
+      2178, /* GL_UNSIGNED_BYTE_3_3_2 */
+      2218, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      2221, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      2190, /* GL_UNSIGNED_INT_8_8_8_8 */
+      2181, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1394, /* GL_POLYGON_OFFSET_FILL */
+      1393, /* GL_POLYGON_OFFSET_FACTOR */
+      1392, /* GL_POLYGON_OFFSET_BIAS */
+      1607, /* GL_RESCALE_NORMAL */
         41, /* GL_ALPHA4 */
         43, /* GL_ALPHA8 */
         33, /* GL_ALPHA12 */
@@ -5182,53 +5190,53 @@ static const unsigned reduced_enums[1562] =
        764, /* GL_INTENSITY8 */
        754, /* GL_INTENSITY12 */
        756, /* GL_INTENSITY16 */
-      1625, /* GL_RGB2_EXT */
-      1631, /* GL_RGB4 */
-      1634, /* GL_RGB5 */
-      1641, /* GL_RGB8 */
-      1611, /* GL_RGB10 */
-      1615, /* GL_RGB12 */
-      1617, /* GL_RGB16 */
-      1661, /* GL_RGBA2 */
-      1668, /* GL_RGBA4 */
-      1637, /* GL_RGB5_A1 */
-      1673, /* GL_RGBA8 */
-      1612, /* GL_RGB10_A2 */
-      1651, /* GL_RGBA12 */
-      1653, /* GL_RGBA16 */
-      2102, /* GL_TEXTURE_RED_SIZE */
-      2070, /* GL_TEXTURE_GREEN_SIZE */
-      1991, /* GL_TEXTURE_BLUE_SIZE */
-      1971, /* GL_TEXTURE_ALPHA_SIZE */
-      2083, /* GL_TEXTURE_LUMINANCE_SIZE */
-      2074, /* GL_TEXTURE_INTENSITY_SIZE */
-      1601, /* GL_REPLACE_EXT */
-      1499, /* GL_PROXY_TEXTURE_1D */
-      1503, /* GL_PROXY_TEXTURE_2D */
-      2110, /* GL_TEXTURE_TOO_LARGE_EXT */
-      2096, /* GL_TEXTURE_PRIORITY */
-      2104, /* GL_TEXTURE_RESIDENT */
-      1974, /* GL_TEXTURE_BINDING_1D */
-      1977, /* GL_TEXTURE_BINDING_2D */
-      1980, /* GL_TEXTURE_BINDING_3D */
-      1307, /* GL_PACK_SKIP_IMAGES */
-      1303, /* GL_PACK_IMAGE_HEIGHT */
-      2167, /* GL_UNPACK_SKIP_IMAGES */
-      2164, /* GL_UNPACK_IMAGE_HEIGHT */
-      1969, /* GL_TEXTURE_3D */
-      1507, /* GL_PROXY_TEXTURE_3D */
-      2054, /* GL_TEXTURE_DEPTH */
-      2113, /* GL_TEXTURE_WRAP_R */
+      1629, /* GL_RGB2_EXT */
+      1635, /* GL_RGB4 */
+      1638, /* GL_RGB5 */
+      1645, /* GL_RGB8 */
+      1615, /* GL_RGB10 */
+      1619, /* GL_RGB12 */
+      1621, /* GL_RGB16 */
+      1665, /* GL_RGBA2 */
+      1672, /* GL_RGBA4 */
+      1641, /* GL_RGB5_A1 */
+      1677, /* GL_RGBA8 */
+      1616, /* GL_RGB10_A2 */
+      1655, /* GL_RGBA12 */
+      1657, /* GL_RGBA16 */
+      2106, /* GL_TEXTURE_RED_SIZE */
+      2074, /* GL_TEXTURE_GREEN_SIZE */
+      1995, /* GL_TEXTURE_BLUE_SIZE */
+      1975, /* GL_TEXTURE_ALPHA_SIZE */
+      2087, /* GL_TEXTURE_LUMINANCE_SIZE */
+      2078, /* GL_TEXTURE_INTENSITY_SIZE */
+      1605, /* GL_REPLACE_EXT */
+      1503, /* GL_PROXY_TEXTURE_1D */
+      1507, /* GL_PROXY_TEXTURE_2D */
+      2114, /* GL_TEXTURE_TOO_LARGE_EXT */
+      2100, /* GL_TEXTURE_PRIORITY */
+      2108, /* GL_TEXTURE_RESIDENT */
+      1978, /* GL_TEXTURE_BINDING_1D */
+      1981, /* GL_TEXTURE_BINDING_2D */
+      1984, /* GL_TEXTURE_BINDING_3D */
+      1308, /* GL_PACK_SKIP_IMAGES */
+      1304, /* GL_PACK_IMAGE_HEIGHT */
+      2171, /* GL_UNPACK_SKIP_IMAGES */
+      2168, /* GL_UNPACK_IMAGE_HEIGHT */
+      1973, /* GL_TEXTURE_3D */
+      1511, /* GL_PROXY_TEXTURE_3D */
+      2058, /* GL_TEXTURE_DEPTH */
+      2117, /* GL_TEXTURE_WRAP_R */
       1018, /* GL_MAX_3D_TEXTURE_SIZE */
-      2230, /* GL_VERTEX_ARRAY */
+      2234, /* GL_VERTEX_ARRAY */
       1232, /* GL_NORMAL_ARRAY */
        189, /* GL_COLOR_ARRAY */
        737, /* GL_INDEX_ARRAY */
-      2024, /* GL_TEXTURE_COORD_ARRAY */
+      2028, /* GL_TEXTURE_COORD_ARRAY */
        519, /* GL_EDGE_FLAG_ARRAY */
-      2236, /* GL_VERTEX_ARRAY_SIZE */
-      2238, /* GL_VERTEX_ARRAY_TYPE */
-      2237, /* GL_VERTEX_ARRAY_STRIDE */
+      2240, /* GL_VERTEX_ARRAY_SIZE */
+      2242, /* GL_VERTEX_ARRAY_TYPE */
+      2241, /* GL_VERTEX_ARRAY_STRIDE */
       1237, /* GL_NORMAL_ARRAY_TYPE */
       1236, /* GL_NORMAL_ARRAY_STRIDE */
        193, /* GL_COLOR_ARRAY_SIZE */
@@ -5236,48 +5244,48 @@ static const unsigned reduced_enums[1562] =
        194, /* GL_COLOR_ARRAY_STRIDE */
        742, /* GL_INDEX_ARRAY_TYPE */
        741, /* GL_INDEX_ARRAY_STRIDE */
-      2028, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      2030, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      2029, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+      2032, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      2034, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      2033, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
        523, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      2235, /* GL_VERTEX_ARRAY_POINTER */
+      2239, /* GL_VERTEX_ARRAY_POINTER */
       1235, /* GL_NORMAL_ARRAY_POINTER */
        192, /* GL_COLOR_ARRAY_POINTER */
        740, /* GL_INDEX_ARRAY_POINTER */
-      2027, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+      2031, /* GL_TEXTURE_COORD_ARRAY_POINTER */
        522, /* GL_EDGE_FLAG_ARRAY_POINTER */
       1210, /* GL_MULTISAMPLE */
-      1726, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1728, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1733, /* GL_SAMPLE_COVERAGE */
-      1730, /* GL_SAMPLE_BUFFERS */
-      1721, /* GL_SAMPLES */
-      1737, /* GL_SAMPLE_COVERAGE_VALUE */
-      1735, /* GL_SAMPLE_COVERAGE_INVERT */
+      1730, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1732, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1737, /* GL_SAMPLE_COVERAGE */
+      1734, /* GL_SAMPLE_BUFFERS */
+      1725, /* GL_SAMPLES */
+      1741, /* GL_SAMPLE_COVERAGE_VALUE */
+      1739, /* GL_SAMPLE_COVERAGE_INVERT */
        237, /* GL_COLOR_MATRIX */
        239, /* GL_COLOR_MATRIX_STACK_DEPTH */
       1030, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1418, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1414, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1409, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1405, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1416, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1412, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1407, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1403, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      2007, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1508, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      2009, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+      1419, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1415, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1410, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1406, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1417, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1413, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1408, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1404, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      2011, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1512, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      2013, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
         94, /* GL_BLEND_DST_RGB */
        108, /* GL_BLEND_SRC_RGB */
         92, /* GL_BLEND_DST_ALPHA */
        106, /* GL_BLEND_SRC_ALPHA */
        243, /* GL_COLOR_TABLE */
-      1428, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1411, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1494, /* GL_PROXY_COLOR_TABLE */
-      1498, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1497, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+      1429, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1412, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1498, /* GL_PROXY_COLOR_TABLE */
+      1502, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1501, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
        267, /* GL_COLOR_TABLE_SCALE */
        247, /* GL_COLOR_TABLE_BIAS */
        252, /* GL_COLOR_TABLE_FORMAT */
@@ -5292,60 +5300,60 @@ static const unsigned reduced_enums[1562] =
         80, /* GL_BGRA */
       1045, /* GL_MAX_ELEMENTS_VERTICES */
       1044, /* GL_MAX_ELEMENTS_INDICES */
-      2073, /* GL_TEXTURE_INDEX_SIZE_EXT */
+      2077, /* GL_TEXTURE_INDEX_SIZE_EXT */
        186, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1374, /* GL_POINT_SIZE_MIN */
-      1370, /* GL_POINT_SIZE_MAX */
-      1359, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1355, /* GL_POINT_DISTANCE_ATTENUATION */
+      1375, /* GL_POINT_SIZE_MIN */
+      1371, /* GL_POINT_SIZE_MAX */
+      1360, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1356, /* GL_POINT_DISTANCE_ATTENUATION */
        159, /* GL_CLAMP_TO_BORDER */
        162, /* GL_CLAMP_TO_EDGE */
-      2095, /* GL_TEXTURE_MIN_LOD */
-      2093, /* GL_TEXTURE_MAX_LOD */
-      1973, /* GL_TEXTURE_BASE_LEVEL */
-      2092, /* GL_TEXTURE_MAX_LEVEL */
+      2099, /* GL_TEXTURE_MIN_LOD */
+      2097, /* GL_TEXTURE_MAX_LOD */
+      1977, /* GL_TEXTURE_BASE_LEVEL */
+      2096, /* GL_TEXTURE_MAX_LEVEL */
        728, /* GL_IGNORE_BORDER_HP */
        321, /* GL_CONSTANT_BORDER_HP */
-      1602, /* GL_REPLICATE_BORDER_HP */
+      1606, /* GL_REPLICATE_BORDER_HP */
        333, /* GL_CONVOLUTION_BORDER_COLOR */
-      1266, /* GL_OCCLUSION_TEST_HP */
-      1267, /* GL_OCCLUSION_TEST_RESULT_HP */
+      1267, /* GL_OCCLUSION_TEST_HP */
+      1268, /* GL_OCCLUSION_TEST_RESULT_HP */
        830, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      2001, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      2003, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      2005, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      2006, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      2004, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      2002, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+      2005, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      2007, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      2009, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      2010, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      2008, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      2006, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
       1024, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
       1025, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1438, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1440, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1437, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1439, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      2081, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      2082, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      2080, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+      1439, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1441, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1438, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1440, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      2085, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      2086, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      2084, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
        683, /* GL_GENERATE_MIPMAP */
        684, /* GL_GENERATE_MIPMAP_HINT */
        596, /* GL_FOG_OFFSET_SGIX */
        597, /* GL_FOG_OFFSET_VALUE_SGIX */
-      2015, /* GL_TEXTURE_COMPARE_SGIX */
-      2014, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      2077, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      2069, /* GL_TEXTURE_GEQUAL_R_SGIX */
+      2019, /* GL_TEXTURE_COMPARE_SGIX */
+      2018, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      2081, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      2073, /* GL_TEXTURE_GEQUAL_R_SGIX */
        416, /* GL_DEPTH_COMPONENT16 */
        420, /* GL_DEPTH_COMPONENT24 */
        424, /* GL_DEPTH_COMPONENT32 */
        358, /* GL_CULL_VERTEX_EXT */
        360, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
        359, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      2303, /* GL_WRAP_BORDER_SUN */
-      2008, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+      2307, /* GL_WRAP_BORDER_SUN */
+      2012, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
        823, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1771, /* GL_SINGLE_COLOR */
-      1755, /* GL_SEPARATE_SPECULAR_COLOR */
-      1766, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+      1775, /* GL_SINGLE_COLOR */
+      1759, /* GL_SEPARATE_SPECULAR_COLOR */
+      1770, /* GL_SHARED_TEXTURE_PALETTE_EXT */
        608, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
        609, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
        620, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
@@ -5363,32 +5371,33 @@ static const unsigned reduced_enums[1562] =
        327, /* GL_CONTEXT_FLAGS */
        736, /* GL_INDEX */
        410, /* GL_DEPTH_BUFFER */
-      1845, /* GL_STENCIL_BUFFER */
+      1849, /* GL_STENCIL_BUFFER */
        298, /* GL_COMPRESSED_RED */
        299, /* GL_COMPRESSED_RG */
        860, /* GL_LOSE_CONTEXT_ON_RESET_ARB */
        703, /* GL_GUILTY_CONTEXT_RESET_ARB */
        751, /* GL_INNOCENT_CONTEXT_RESET_ARB */
-      2162, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
-      1605, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
+      2166, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
+      1609, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
+      1461, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
       1244, /* GL_NO_RESET_NOTIFICATION_ARB */
-      2173, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      2218, /* GL_UNSIGNED_SHORT_5_6_5 */
-      2219, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      2215, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      2212, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      2187, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      2183, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      2090, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      2091, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      2089, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+      2177, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      2222, /* GL_UNSIGNED_SHORT_5_6_5 */
+      2223, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      2219, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      2216, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      2191, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      2187, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      2094, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      2095, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      2093, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
       1160, /* GL_MIRRORED_REPEAT */
-      1691, /* GL_RGB_S3TC */
-      1633, /* GL_RGB4_S3TC */
-      1687, /* GL_RGBA_S3TC */
-      1672, /* GL_RGBA4_S3TC */
-      1681, /* GL_RGBA_DXT5_S3TC */
-      1669, /* GL_RGBA4_DXT5_S3TC */
+      1695, /* GL_RGB_S3TC */
+      1637, /* GL_RGB4_S3TC */
+      1691, /* GL_RGBA_S3TC */
+      1676, /* GL_RGBA4_S3TC */
+      1685, /* GL_RGBA_DXT5_S3TC */
+      1673, /* GL_RGBA4_DXT5_S3TC */
        309, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
        304, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
        305, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
@@ -5406,54 +5415,54 @@ static const unsigned reduced_enums[1562] =
        577, /* GL_FOG_COORDINATE_ARRAY */
        241, /* GL_COLOR_SUM */
        385, /* GL_CURRENT_SECONDARY_COLOR */
-      1746, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1748, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1747, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1745, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1742, /* GL_SECONDARY_COLOR_ARRAY */
+      1750, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1752, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1751, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1749, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1746, /* GL_SECONDARY_COLOR_ARRAY */
        383, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         29, /* GL_ALIASED_POINT_SIZE_RANGE */
         28, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1899, /* GL_TEXTURE0 */
-      1901, /* GL_TEXTURE1 */
-      1923, /* GL_TEXTURE2 */
-      1945, /* GL_TEXTURE3 */
-      1951, /* GL_TEXTURE4 */
-      1953, /* GL_TEXTURE5 */
-      1955, /* GL_TEXTURE6 */
-      1957, /* GL_TEXTURE7 */
-      1959, /* GL_TEXTURE8 */
-      1961, /* GL_TEXTURE9 */
-      1902, /* GL_TEXTURE10 */
-      1904, /* GL_TEXTURE11 */
-      1906, /* GL_TEXTURE12 */
-      1908, /* GL_TEXTURE13 */
-      1910, /* GL_TEXTURE14 */
-      1912, /* GL_TEXTURE15 */
-      1914, /* GL_TEXTURE16 */
-      1916, /* GL_TEXTURE17 */
-      1918, /* GL_TEXTURE18 */
-      1920, /* GL_TEXTURE19 */
-      1924, /* GL_TEXTURE20 */
-      1926, /* GL_TEXTURE21 */
-      1928, /* GL_TEXTURE22 */
-      1930, /* GL_TEXTURE23 */
-      1932, /* GL_TEXTURE24 */
-      1934, /* GL_TEXTURE25 */
-      1936, /* GL_TEXTURE26 */
-      1938, /* GL_TEXTURE27 */
-      1940, /* GL_TEXTURE28 */
-      1942, /* GL_TEXTURE29 */
-      1946, /* GL_TEXTURE30 */
-      1948, /* GL_TEXTURE31 */
+      1903, /* GL_TEXTURE0 */
+      1905, /* GL_TEXTURE1 */
+      1927, /* GL_TEXTURE2 */
+      1949, /* GL_TEXTURE3 */
+      1955, /* GL_TEXTURE4 */
+      1957, /* GL_TEXTURE5 */
+      1959, /* GL_TEXTURE6 */
+      1961, /* GL_TEXTURE7 */
+      1963, /* GL_TEXTURE8 */
+      1965, /* GL_TEXTURE9 */
+      1906, /* GL_TEXTURE10 */
+      1908, /* GL_TEXTURE11 */
+      1910, /* GL_TEXTURE12 */
+      1912, /* GL_TEXTURE13 */
+      1914, /* GL_TEXTURE14 */
+      1916, /* GL_TEXTURE15 */
+      1918, /* GL_TEXTURE16 */
+      1920, /* GL_TEXTURE17 */
+      1922, /* GL_TEXTURE18 */
+      1924, /* GL_TEXTURE19 */
+      1928, /* GL_TEXTURE20 */
+      1930, /* GL_TEXTURE21 */
+      1932, /* GL_TEXTURE22 */
+      1934, /* GL_TEXTURE23 */
+      1936, /* GL_TEXTURE24 */
+      1938, /* GL_TEXTURE25 */
+      1940, /* GL_TEXTURE26 */
+      1942, /* GL_TEXTURE27 */
+      1944, /* GL_TEXTURE28 */
+      1946, /* GL_TEXTURE29 */
+      1950, /* GL_TEXTURE30 */
+      1952, /* GL_TEXTURE31 */
         19, /* GL_ACTIVE_TEXTURE */
        166, /* GL_CLIENT_ACTIVE_TEXTURE */
       1121, /* GL_MAX_TEXTURE_UNITS */
-      2145, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      2148, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      2150, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      2142, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1881, /* GL_SUBTRACT */
+      2149, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      2152, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      2154, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      2146, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1885, /* GL_SUBTRACT */
       1102, /* GL_MAX_RENDERBUFFER_SIZE */
        290, /* GL_COMPRESSED_ALPHA */
        294, /* GL_COMPRESSED_LUMINANCE */
@@ -5461,18 +5470,18 @@ static const unsigned reduced_enums[1562] =
        292, /* GL_COMPRESSED_INTENSITY */
        300, /* GL_COMPRESSED_RGB */
        301, /* GL_COMPRESSED_RGBA */
-      2022, /* GL_TEXTURE_COMPRESSION_HINT */
-      2099, /* GL_TEXTURE_RECTANGLE */
-      1987, /* GL_TEXTURE_BINDING_RECTANGLE */
-      1511, /* GL_PROXY_TEXTURE_RECTANGLE */
+      2026, /* GL_TEXTURE_COMPRESSION_HINT */
+      2103, /* GL_TEXTURE_RECTANGLE */
+      1991, /* GL_TEXTURE_BINDING_RECTANGLE */
+      1515, /* GL_PROXY_TEXTURE_RECTANGLE */
       1099, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
        431, /* GL_DEPTH_STENCIL */
-      2179, /* GL_UNSIGNED_INT_24_8 */
+      2183, /* GL_UNSIGNED_INT_24_8 */
       1116, /* GL_MAX_TEXTURE_LOD_BIAS */
-      2088, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+      2092, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
       1118, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      2060, /* GL_TEXTURE_FILTER_CONTROL */
-      2078, /* GL_TEXTURE_LOD_BIAS */
+      2064, /* GL_TEXTURE_FILTER_CONTROL */
+      2082, /* GL_TEXTURE_LOD_BIAS */
        274, /* GL_COMBINE4 */
       1108, /* GL_MAX_SHININESS_NV */
       1109, /* GL_MAX_SPOT_EXPONENT_NV */
@@ -5480,75 +5489,75 @@ static const unsigned reduced_enums[1562] =
        396, /* GL_DECR_WRAP */
       1180, /* GL_MODELVIEW1_ARB */
       1238, /* GL_NORMAL_MAP */
-      1562, /* GL_REFLECTION_MAP */
-      2032, /* GL_TEXTURE_CUBE_MAP */
-      1984, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      2044, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      2034, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      2047, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      2037, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      2050, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      2040, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1509, /* GL_PROXY_TEXTURE_CUBE_MAP */
+      1566, /* GL_REFLECTION_MAP */
+      2036, /* GL_TEXTURE_CUBE_MAP */
+      1988, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      2048, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      2038, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      2051, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      2041, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      2054, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      2044, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1513, /* GL_PROXY_TEXTURE_CUBE_MAP */
       1038, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
       1216, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-      1452, /* GL_PRIMITIVE_RESTART_NV */
-      1451, /* GL_PRIMITIVE_RESTART_INDEX_NV */
+      1453, /* GL_PRIMITIVE_RESTART_NV */
+      1452, /* GL_PRIMITIVE_RESTART_INDEX_NV */
        591, /* GL_FOG_DISTANCE_MODE_NV */
        538, /* GL_EYE_RADIAL_NV */
        537, /* GL_EYE_PLANE_ABSOLUTE_NV */
        273, /* GL_COMBINE */
        280, /* GL_COMBINE_RGB */
        275, /* GL_COMBINE_ALPHA */
-      1692, /* GL_RGB_SCALE */
+      1696, /* GL_RGB_SCALE */
         25, /* GL_ADD_SIGNED */
        771, /* GL_INTERPOLATE */
        316, /* GL_CONSTANT */
-      1444, /* GL_PRIMARY_COLOR */
-      1441, /* GL_PREVIOUS */
-      1786, /* GL_SOURCE0_RGB */
-      1792, /* GL_SOURCE1_RGB */
-      1798, /* GL_SOURCE2_RGB */
-      1802, /* GL_SOURCE3_RGB_NV */
-      1783, /* GL_SOURCE0_ALPHA */
-      1789, /* GL_SOURCE1_ALPHA */
-      1795, /* GL_SOURCE2_ALPHA */
-      1801, /* GL_SOURCE3_ALPHA_NV */
-      1280, /* GL_OPERAND0_RGB */
-      1286, /* GL_OPERAND1_RGB */
-      1292, /* GL_OPERAND2_RGB */
-      1296, /* GL_OPERAND3_RGB_NV */
-      1277, /* GL_OPERAND0_ALPHA */
-      1283, /* GL_OPERAND1_ALPHA */
-      1289, /* GL_OPERAND2_ALPHA */
-      1295, /* GL_OPERAND3_ALPHA_NV */
+      1445, /* GL_PRIMARY_COLOR */
+      1442, /* GL_PREVIOUS */
+      1790, /* GL_SOURCE0_RGB */
+      1796, /* GL_SOURCE1_RGB */
+      1802, /* GL_SOURCE2_RGB */
+      1806, /* GL_SOURCE3_RGB_NV */
+      1787, /* GL_SOURCE0_ALPHA */
+      1793, /* GL_SOURCE1_ALPHA */
+      1799, /* GL_SOURCE2_ALPHA */
+      1805, /* GL_SOURCE3_ALPHA_NV */
+      1281, /* GL_OPERAND0_RGB */
+      1287, /* GL_OPERAND1_RGB */
+      1293, /* GL_OPERAND2_RGB */
+      1297, /* GL_OPERAND3_RGB_NV */
+      1278, /* GL_OPERAND0_ALPHA */
+      1284, /* GL_OPERAND1_ALPHA */
+      1290, /* GL_OPERAND2_ALPHA */
+      1296, /* GL_OPERAND3_ALPHA_NV */
        137, /* GL_BUFFER_OBJECT_APPLE */
-      2231, /* GL_VERTEX_ARRAY_BINDING */
-      2097, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-      2098, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-      2308, /* GL_YCBCR_422_APPLE */
-      2220, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      2222, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      2109, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-      1872, /* GL_STORAGE_PRIVATE_APPLE */
-      1871, /* GL_STORAGE_CACHED_APPLE */
-      1873, /* GL_STORAGE_SHARED_APPLE */
-      1773, /* GL_SLICE_ACCUM_SUN */
-      1520, /* GL_QUAD_MESH_SUN */
-      2156, /* GL_TRIANGLE_MESH_SUN */
-      2273, /* GL_VERTEX_PROGRAM_ARB */
-      2284, /* GL_VERTEX_STATE_PROGRAM_NV */
-      2258, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      2266, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      2268, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      2270, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+      2235, /* GL_VERTEX_ARRAY_BINDING */
+      2101, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+      2102, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+      2312, /* GL_YCBCR_422_APPLE */
+      2224, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      2226, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      2113, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+      1876, /* GL_STORAGE_PRIVATE_APPLE */
+      1875, /* GL_STORAGE_CACHED_APPLE */
+      1877, /* GL_STORAGE_SHARED_APPLE */
+      1777, /* GL_SLICE_ACCUM_SUN */
+      1524, /* GL_QUAD_MESH_SUN */
+      2160, /* GL_TRIANGLE_MESH_SUN */
+      2277, /* GL_VERTEX_PROGRAM_ARB */
+      2288, /* GL_VERTEX_STATE_PROGRAM_NV */
+      2262, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      2270, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      2272, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      2274, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
        387, /* GL_CURRENT_VERTEX_ATTRIB */
-      1465, /* GL_PROGRAM_LENGTH_ARB */
-      1481, /* GL_PROGRAM_STRING_ARB */
+      1469, /* GL_PROGRAM_LENGTH_ARB */
+      1485, /* GL_PROGRAM_STRING_ARB */
       1203, /* GL_MODELVIEW_PROJECTION_NV */
        727, /* GL_IDENTITY_NV */
        803, /* GL_INVERSE_NV */
-      2147, /* GL_TRANSPOSE_NV */
+      2151, /* GL_TRANSPOSE_NV */
        804, /* GL_INVERSE_TRANSPOSE_NV */
       1083, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
       1082, /* GL_MAX_PROGRAM_MATRICES_ARB */
@@ -5562,33 +5571,33 @@ static const unsigned reduced_enums[1562] =
       1000, /* GL_MATRIX7_NV */
        370, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
        367, /* GL_CURRENT_MATRIX_ARB */
-      1478, /* GL_PROGRAM_POINT_SIZE */
-      2279, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1477, /* GL_PROGRAM_PARAMETER_NV */
-      2264, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1483, /* GL_PROGRAM_TARGET_NV */
-      1480, /* GL_PROGRAM_RESIDENT_NV */
-      2119, /* GL_TRACK_MATRIX_NV */
-      2120, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      2274, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1459, /* GL_PROGRAM_ERROR_POSITION_ARB */
+      1482, /* GL_PROGRAM_POINT_SIZE */
+      2283, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1481, /* GL_PROGRAM_PARAMETER_NV */
+      2268, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1487, /* GL_PROGRAM_TARGET_NV */
+      1484, /* GL_PROGRAM_RESIDENT_NV */
+      2123, /* GL_TRACK_MATRIX_NV */
+      2124, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      2278, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1463, /* GL_PROGRAM_ERROR_POSITION_ARB */
        412, /* GL_DEPTH_CLAMP */
-      2239, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      2246, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      2247, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      2248, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      2249, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      2250, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      2251, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      2252, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      2253, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      2254, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      2240, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      2241, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      2242, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      2243, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      2244, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      2245, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+      2243, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      2250, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      2251, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      2252, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      2253, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      2254, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      2255, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      2256, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      2257, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      2258, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      2244, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      2245, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      2246, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      2247, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      2248, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      2249, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
        912, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
        919, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
        920, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
@@ -5612,7 +5621,7 @@ static const unsigned reduced_enums[1562] =
        949, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
        950, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
        951, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1458, /* GL_PROGRAM_BINDING_ARB */
+      1462, /* GL_PROGRAM_BINDING_ARB */
        953, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
        954, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
        940, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
@@ -5621,27 +5630,27 @@ static const unsigned reduced_enums[1562] =
        943, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
        944, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
        945, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      2020, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      2017, /* GL_TEXTURE_COMPRESSED */
+      2024, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      2021, /* GL_TEXTURE_COMPRESSED */
       1245, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
        314, /* GL_COMPRESSED_TEXTURE_FORMATS */
       1143, /* GL_MAX_VERTEX_UNITS_ARB */
         23, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      2302, /* GL_WEIGHT_SUM_UNITY_ARB */
-      2272, /* GL_VERTEX_BLEND_ARB */
+      2306, /* GL_WEIGHT_SUM_UNITY_ARB */
+      2276, /* GL_VERTEX_BLEND_ARB */
        389, /* GL_CURRENT_WEIGHT_ARB */
-      2300, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      2298, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      2296, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      2294, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      2289, /* GL_WEIGHT_ARRAY_ARB */
+      2304, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      2302, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      2300, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      2298, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      2293, /* GL_WEIGHT_ARRAY_ARB */
        446, /* GL_DOT3_RGB */
        447, /* GL_DOT3_RGBA */
        308, /* GL_COMPRESSED_RGB_FXT1_3DFX */
        303, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
       1211, /* GL_MULTISAMPLE_3DFX */
-      1731, /* GL_SAMPLE_BUFFERS_3DFX */
-      1722, /* GL_SAMPLES_3DFX */
+      1735, /* GL_SAMPLE_BUFFERS_3DFX */
+      1726, /* GL_SAMPLES_3DFX */
       1191, /* GL_MODELVIEW2_ARB */
       1194, /* GL_MODELVIEW3_ARB */
       1195, /* GL_MODELVIEW4_ARB */
@@ -5673,14 +5682,14 @@ static const unsigned reduced_enums[1562] =
       1192, /* GL_MODELVIEW30_ARB */
       1193, /* GL_MODELVIEW31_ARB */
        451, /* GL_DOT3_RGB_EXT */
-       449, /* GL_DOT3_RGBA_EXT */
+      1459, /* GL_PROGRAM_BINARY_LENGTH */
       1164, /* GL_MIRROR_CLAMP_EXT */
       1167, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
       1206, /* GL_MODULATE_ADD_ATI */
       1207, /* GL_MODULATE_SIGNED_ADD_ATI */
       1208, /* GL_MODULATE_SUBTRACT_ATI */
-      2309, /* GL_YCBCR_MESA */
-      1304, /* GL_PACK_INVERT_MESA */
+      2313, /* GL_YCBCR_MESA */
+      1305, /* GL_PACK_INVERT_MESA */
        392, /* GL_DEBUG_OBJECT_MESA */
        393, /* GL_DEBUG_PRINT_MESA */
        391, /* GL_DEBUG_ASSERT_MESA */
@@ -5694,30 +5703,30 @@ static const unsigned reduced_enums[1562] =
        510, /* GL_DU8DV8_ATI */
        143, /* GL_BUMP_ENVMAP_ATI */
        147, /* GL_BUMP_TARGET_ATI */
-      1248, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
-      1456, /* GL_PROGRAM_BINARY_FORMATS_OES */
-      1835, /* GL_STENCIL_BACK_FUNC */
-      1833, /* GL_STENCIL_BACK_FAIL */
-      1837, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1839, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+      1248, /* GL_NUM_PROGRAM_BINARY_FORMATS */
+      1457, /* GL_PROGRAM_BINARY_FORMATS */
+      1839, /* GL_STENCIL_BACK_FUNC */
+      1837, /* GL_STENCIL_BACK_FAIL */
+      1841, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1843, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
        600, /* GL_FRAGMENT_PROGRAM_ARB */
-      1454, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1486, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1485, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1468, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1474, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1473, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+      1455, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1490, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1489, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1472, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1478, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1477, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
       1072, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
       1097, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
       1096, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
       1085, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
       1091, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
       1090, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-      1663, /* GL_RGBA32F */
-      1626, /* GL_RGB32F */
-      1654, /* GL_RGBA16F */
-      1618, /* GL_RGB16F */
-      1682, /* GL_RGBA_FLOAT_MODE_ARB */
+      1667, /* GL_RGBA32F */
+      1630, /* GL_RGB32F */
+      1658, /* GL_RGBA16F */
+      1622, /* GL_RGB16F */
+      1686, /* GL_RGBA_FLOAT_MODE_ARB */
       1041, /* GL_MAX_DRAW_BUFFERS */
        455, /* GL_DRAW_BUFFER0 */
        458, /* GL_DRAW_BUFFER1 */
@@ -5746,75 +5755,75 @@ static const unsigned reduced_enums[1562] =
       1012, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
       1010, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
       1006, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      2055, /* GL_TEXTURE_DEPTH_SIZE */
+      2059, /* GL_TEXTURE_DEPTH_SIZE */
        439, /* GL_DEPTH_TEXTURE_MODE */
-      2012, /* GL_TEXTURE_COMPARE_MODE */
-      2010, /* GL_TEXTURE_COMPARE_FUNC */
+      2016, /* GL_TEXTURE_COMPARE_MODE */
+      2014, /* GL_TEXTURE_COMPARE_FUNC */
        284, /* GL_COMPARE_REF_TO_TEXTURE */
-      1381, /* GL_POINT_SPRITE */
+      1382, /* GL_POINT_SPRITE */
        347, /* GL_COORD_REPLACE */
-      1386, /* GL_POINT_SPRITE_R_MODE_NV */
-      1526, /* GL_QUERY_COUNTER_BITS */
+      1387, /* GL_POINT_SPRITE_R_MODE_NV */
+      1530, /* GL_QUERY_COUNTER_BITS */
        376, /* GL_CURRENT_QUERY */
-      1530, /* GL_QUERY_RESULT */
-      1532, /* GL_QUERY_RESULT_AVAILABLE */
+      1534, /* GL_QUERY_RESULT */
+      1536, /* GL_QUERY_RESULT_AVAILABLE */
       1135, /* GL_MAX_VERTEX_ATTRIBS */
-      2262, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+      2266, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
        437, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
        436, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
       1112, /* GL_MAX_TEXTURE_COORDS */
       1114, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1461, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1463, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1462, /* GL_PROGRAM_FORMAT_ARB */
-      2111, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+      1465, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1467, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1466, /* GL_PROGRAM_FORMAT_ARB */
+      2115, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
        409, /* GL_DEPTH_BOUNDS_TEST_EXT */
        408, /* GL_DEPTH_BOUNDS_EXT */
         61, /* GL_ARRAY_BUFFER */
        524, /* GL_ELEMENT_ARRAY_BUFFER */
         62, /* GL_ARRAY_BUFFER_BINDING */
        525, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      2233, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      2237, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
       1233, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        190, /* GL_COLOR_ARRAY_BUFFER_BINDING */
        738, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      2025, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+      2029, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
        520, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1743, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+      1747, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
        578, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      2290, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      2255, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1464, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+      2294, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      2259, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1468, /* GL_PROGRAM_INSTRUCTIONS_ARB */
       1078, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1470, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1474, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
       1087, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1484, /* GL_PROGRAM_TEMPORARIES_ARB */
+      1488, /* GL_PROGRAM_TEMPORARIES_ARB */
       1093, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1472, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1476, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
       1089, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1476, /* GL_PROGRAM_PARAMETERS_ARB */
+      1480, /* GL_PROGRAM_PARAMETERS_ARB */
       1092, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1471, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1475, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
       1088, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1455, /* GL_PROGRAM_ATTRIBS_ARB */
+      1456, /* GL_PROGRAM_ATTRIBS_ARB */
       1073, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1469, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1473, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
       1086, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1453, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1454, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
       1071, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1467, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+      1471, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
       1084, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
       1079, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
       1075, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1487, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      2144, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1549, /* GL_READ_ONLY */
-      2304, /* GL_WRITE_ONLY */
-      1551, /* GL_READ_WRITE */
+      1491, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      2148, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1553, /* GL_READ_ONLY */
+      2308, /* GL_WRITE_ONLY */
+      1555, /* GL_READ_WRITE */
        124, /* GL_BUFFER_ACCESS */
        129, /* GL_BUFFER_MAPPED */
        134, /* GL_BUFFER_MAP_POINTER */
-      2118, /* GL_TIME_ELAPSED_EXT */
+      2122, /* GL_TIME_ELAPSED_EXT */
        963, /* GL_MATRIX0_ARB */
        975, /* GL_MATRIX1_ARB */
        987, /* GL_MATRIX2_ARB */
@@ -5847,67 +5856,67 @@ static const unsigned reduced_enums[1562] =
        986, /* GL_MATRIX29_ARB */
        989, /* GL_MATRIX30_ARB */
        990, /* GL_MATRIX31_ARB */
-      1876, /* GL_STREAM_DRAW */
-      1878, /* GL_STREAM_READ */
-      1874, /* GL_STREAM_COPY */
-      1825, /* GL_STATIC_DRAW */
-      1827, /* GL_STATIC_READ */
-      1823, /* GL_STATIC_COPY */
+      1880, /* GL_STREAM_DRAW */
+      1882, /* GL_STREAM_READ */
+      1878, /* GL_STREAM_COPY */
+      1829, /* GL_STATIC_DRAW */
+      1831, /* GL_STATIC_READ */
+      1827, /* GL_STATIC_COPY */
        514, /* GL_DYNAMIC_DRAW */
        516, /* GL_DYNAMIC_READ */
        512, /* GL_DYNAMIC_COPY */
-      1344, /* GL_PIXEL_PACK_BUFFER */
-      1348, /* GL_PIXEL_UNPACK_BUFFER */
-      1345, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1349, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+      1345, /* GL_PIXEL_PACK_BUFFER */
+      1349, /* GL_PIXEL_UNPACK_BUFFER */
+      1346, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1350, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
        400, /* GL_DEPTH24_STENCIL8 */
-      2107, /* GL_TEXTURE_STENCIL_SIZE */
-      2053, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+      2111, /* GL_TEXTURE_STENCIL_SIZE */
+      2057, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
       1074, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
       1077, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
       1081, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
       1080, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-      2260, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
-      2257, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
+      2264, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
+      2261, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
       1020, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
       1158, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
       1094, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
-      1867, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      1871, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         18, /* GL_ACTIVE_STENCIL_FACE_EXT */
       1165, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1724, /* GL_SAMPLES_PASSED */
+      1728, /* GL_SAMPLES_PASSED */
        693, /* GL_GEOMETRY_VERTICES_OUT */
        687, /* GL_GEOMETRY_INPUT_TYPE */
        689, /* GL_GEOMETRY_OUTPUT_TYPE */
-      1715, /* GL_SAMPLER_BINDING */
+      1719, /* GL_SAMPLER_BINDING */
        164, /* GL_CLAMP_VERTEX_COLOR_ARB */
        156, /* GL_CLAMP_FRAGMENT_COLOR_ARB */
        157, /* GL_CLAMP_READ_COLOR */
        550, /* GL_FIXED_ONLY */
-      1368, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
-      1367, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
-      1366, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
+      1369, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
+      1368, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
+      1367, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
       1202, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
-      1490, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-      2087, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+      1494, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+      2091, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
        138, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
        128, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-      1566, /* GL_RELEASED_APPLE */
-      2287, /* GL_VOLATILE_APPLE */
-      1606, /* GL_RETAINED_APPLE */
-      2161, /* GL_UNDEFINED_APPLE */
-      1514, /* GL_PURGEABLE_APPLE */
+      1570, /* GL_RELEASED_APPLE */
+      2291, /* GL_VOLATILE_APPLE */
+      1610, /* GL_RETAINED_APPLE */
+      2165, /* GL_UNDEFINED_APPLE */
+      1518, /* GL_PURGEABLE_APPLE */
        601, /* GL_FRAGMENT_SHADER */
-      2282, /* GL_VERTEX_SHADER */
-      1475, /* GL_PROGRAM_OBJECT_ARB */
-      1760, /* GL_SHADER_OBJECT_ARB */
+      2286, /* GL_VERTEX_SHADER */
+      1479, /* GL_PROGRAM_OBJECT_ARB */
+      1764, /* GL_SHADER_OBJECT_ARB */
       1049, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
       1140, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
       1131, /* GL_MAX_VARYING_COMPONENTS */
       1138, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
       1032, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1264, /* GL_OBJECT_TYPE_ARB */
-      1762, /* GL_SHADER_TYPE */
+      1265, /* GL_OBJECT_TYPE_ARB */
+      1766, /* GL_SHADER_TYPE */
        566, /* GL_FLOAT_VEC2 */
        568, /* GL_FLOAT_VEC3 */
        570, /* GL_FLOAT_VEC4 */
@@ -5921,14 +5930,14 @@ static const unsigned reduced_enums[1562] =
        554, /* GL_FLOAT_MAT2 */
        558, /* GL_FLOAT_MAT3 */
        562, /* GL_FLOAT_MAT4 */
-      1699, /* GL_SAMPLER_1D */
-      1705, /* GL_SAMPLER_2D */
-      1713, /* GL_SAMPLER_3D */
-      1718, /* GL_SAMPLER_CUBE */
-      1704, /* GL_SAMPLER_1D_SHADOW */
-      1712, /* GL_SAMPLER_2D_SHADOW */
-      1710, /* GL_SAMPLER_2D_RECT */
-      1711, /* GL_SAMPLER_2D_RECT_SHADOW */
+      1703, /* GL_SAMPLER_1D */
+      1709, /* GL_SAMPLER_2D */
+      1717, /* GL_SAMPLER_3D */
+      1722, /* GL_SAMPLER_CUBE */
+      1708, /* GL_SAMPLER_1D_SHADOW */
+      1716, /* GL_SAMPLER_2D_SHADOW */
+      1714, /* GL_SAMPLER_2D_RECT */
+      1715, /* GL_SAMPLER_2D_RECT_SHADOW */
        556, /* GL_FLOAT_MAT2x3 */
        557, /* GL_FLOAT_MAT2x4 */
        560, /* GL_FLOAT_MAT3x2 */
@@ -5938,90 +5947,90 @@ static const unsigned reduced_enums[1562] =
        398, /* GL_DELETE_STATUS */
        289, /* GL_COMPILE_STATUS */
        852, /* GL_LINK_STATUS */
-      2227, /* GL_VALIDATE_STATUS */
+      2231, /* GL_VALIDATE_STATUS */
        750, /* GL_INFO_LOG_LENGTH */
         64, /* GL_ATTACHED_SHADERS */
         21, /* GL_ACTIVE_UNIFORMS */
         22, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1761, /* GL_SHADER_SOURCE_LENGTH */
+      1765, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
        603, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1764, /* GL_SHADING_LANGUAGE_VERSION */
+      1768, /* GL_SHADING_LANGUAGE_VERSION */
        375, /* GL_CURRENT_PROGRAM */
-      1313, /* GL_PALETTE4_RGB8_OES */
-      1315, /* GL_PALETTE4_RGBA8_OES */
-      1311, /* GL_PALETTE4_R5_G6_B5_OES */
-      1314, /* GL_PALETTE4_RGBA4_OES */
-      1312, /* GL_PALETTE4_RGB5_A1_OES */
-      1318, /* GL_PALETTE8_RGB8_OES */
-      1320, /* GL_PALETTE8_RGBA8_OES */
-      1316, /* GL_PALETTE8_R5_G6_B5_OES */
-      1319, /* GL_PALETTE8_RGBA4_OES */
-      1317, /* GL_PALETTE8_RGB5_A1_OES */
+      1314, /* GL_PALETTE4_RGB8_OES */
+      1316, /* GL_PALETTE4_RGBA8_OES */
+      1312, /* GL_PALETTE4_R5_G6_B5_OES */
+      1315, /* GL_PALETTE4_RGBA4_OES */
+      1313, /* GL_PALETTE4_RGB5_A1_OES */
+      1319, /* GL_PALETTE8_RGB8_OES */
+      1321, /* GL_PALETTE8_RGBA8_OES */
+      1317, /* GL_PALETTE8_R5_G6_B5_OES */
+      1320, /* GL_PALETTE8_RGBA4_OES */
+      1318, /* GL_PALETTE8_RGB5_A1_OES */
        731, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
        729, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
-      1365, /* GL_POINT_SIZE_ARRAY_OES */
-      2031, /* GL_TEXTURE_CROP_RECT_OES */
+      1366, /* GL_POINT_SIZE_ARRAY_OES */
+      2035, /* GL_TEXTURE_CROP_RECT_OES */
       1004, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
-      1364, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-      2210, /* GL_UNSIGNED_NORMALIZED */
-      1964, /* GL_TEXTURE_1D_ARRAY */
-      1500, /* GL_PROXY_TEXTURE_1D_ARRAY */
-      1967, /* GL_TEXTURE_2D_ARRAY */
-      1504, /* GL_PROXY_TEXTURE_2D_ARRAY */
-      1975, /* GL_TEXTURE_BINDING_1D_ARRAY */
-      1978, /* GL_TEXTURE_BINDING_2D_ARRAY */
+      1365, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
+      2214, /* GL_UNSIGNED_NORMALIZED */
+      1968, /* GL_TEXTURE_1D_ARRAY */
+      1504, /* GL_PROXY_TEXTURE_1D_ARRAY */
+      1971, /* GL_TEXTURE_2D_ARRAY */
+      1508, /* GL_PROXY_TEXTURE_2D_ARRAY */
+      1979, /* GL_TEXTURE_BINDING_1D_ARRAY */
+      1982, /* GL_TEXTURE_BINDING_2D_ARRAY */
       1056, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
-      1995, /* GL_TEXTURE_BUFFER */
+      1999, /* GL_TEXTURE_BUFFER */
       1110, /* GL_MAX_TEXTURE_BUFFER_SIZE */
-      1982, /* GL_TEXTURE_BINDING_BUFFER */
-      1997, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
-      1999, /* GL_TEXTURE_BUFFER_FORMAT */
-      1537, /* GL_R11F_G11F_B10F */
-      2176, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
-      1649, /* GL_RGB9_E5 */
-      2185, /* GL_UNSIGNED_INT_5_9_9_9_REV */
-      2105, /* GL_TEXTURE_SHARED_SIZE */
-      1817, /* GL_SRGB */
-      1818, /* GL_SRGB8 */
-      1820, /* GL_SRGB_ALPHA */
-      1819, /* GL_SRGB8_ALPHA8 */
-      1777, /* GL_SLUMINANCE_ALPHA */
-      1776, /* GL_SLUMINANCE8_ALPHA8 */
-      1774, /* GL_SLUMINANCE */
-      1775, /* GL_SLUMINANCE8 */
+      1986, /* GL_TEXTURE_BINDING_BUFFER */
+      2001, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
+      2003, /* GL_TEXTURE_BUFFER_FORMAT */
+      1541, /* GL_R11F_G11F_B10F */
+      2180, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
+      1653, /* GL_RGB9_E5 */
+      2189, /* GL_UNSIGNED_INT_5_9_9_9_REV */
+      2109, /* GL_TEXTURE_SHARED_SIZE */
+      1821, /* GL_SRGB */
+      1822, /* GL_SRGB8 */
+      1824, /* GL_SRGB_ALPHA */
+      1823, /* GL_SRGB8_ALPHA8 */
+      1781, /* GL_SLUMINANCE_ALPHA */
+      1780, /* GL_SLUMINANCE8_ALPHA8 */
+      1778, /* GL_SLUMINANCE */
+      1779, /* GL_SLUMINANCE8 */
        312, /* GL_COMPRESSED_SRGB */
        313, /* GL_COMPRESSED_SRGB_ALPHA */
        310, /* GL_COMPRESSED_SLUMINANCE */
        311, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      2140, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
-      2129, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
+      2144, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
+      2133, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
       1129, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
-      2138, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
-      2134, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
-      2132, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
-      1447, /* GL_PRIMITIVES_GENERATED */
-      2136, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
-      1541, /* GL_RASTERIZER_DISCARD */
+      2142, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
+      2138, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
+      2136, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
+      1448, /* GL_PRIMITIVES_GENERATED */
+      2140, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
+      1545, /* GL_RASTERIZER_DISCARD */
       1125, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
       1127, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
        769, /* GL_INTERLEAVED_ATTRIBS */
-      1753, /* GL_SEPARATE_ATTRIBS */
-      2124, /* GL_TRANSFORM_FEEDBACK_BUFFER */
-      2126, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
-      1383, /* GL_POINT_SPRITE_COORD_ORIGIN */
+      1757, /* GL_SEPARATE_ATTRIBS */
+      2128, /* GL_TRANSFORM_FEEDBACK_BUFFER */
+      2130, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
+      1384, /* GL_POINT_SPRITE_COORD_ORIGIN */
        861, /* GL_LOWER_LEFT */
-      2224, /* GL_UPPER_LEFT */
-      1841, /* GL_STENCIL_BACK_REF */
-      1842, /* GL_STENCIL_BACK_VALUE_MASK */
-      1843, /* GL_STENCIL_BACK_WRITEMASK */
+      2228, /* GL_UPPER_LEFT */
+      1845, /* GL_STENCIL_BACK_REF */
+      1846, /* GL_STENCIL_BACK_VALUE_MASK */
+      1847, /* GL_STENCIL_BACK_WRITEMASK */
        504, /* GL_DRAW_FRAMEBUFFER_BINDING */
-      1571, /* GL_RENDERBUFFER_BINDING */
-      1545, /* GL_READ_FRAMEBUFFER */
+      1575, /* GL_RENDERBUFFER_BINDING */
+      1549, /* GL_READ_FRAMEBUFFER */
        503, /* GL_DRAW_FRAMEBUFFER */
-      1546, /* GL_READ_FRAMEBUFFER_BINDING */
-      1590, /* GL_RENDERBUFFER_SAMPLES */
+      1550, /* GL_READ_FRAMEBUFFER_BINDING */
+      1594, /* GL_RENDERBUFFER_SAMPLES */
        617, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
        614, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
        629, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
@@ -6055,87 +6064,87 @@ static const unsigned reduced_enums[1562] =
        208, /* GL_COLOR_ATTACHMENT14 */
        210, /* GL_COLOR_ATTACHMENT15 */
        403, /* GL_DEPTH_ATTACHMENT */
-      1830, /* GL_STENCIL_ATTACHMENT */
+      1834, /* GL_STENCIL_ATTACHMENT */
        605, /* GL_FRAMEBUFFER */
-      1568, /* GL_RENDERBUFFER */
-      1594, /* GL_RENDERBUFFER_WIDTH */
-      1581, /* GL_RENDERBUFFER_HEIGHT */
-      1584, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1862, /* GL_STENCIL_INDEX_EXT */
-      1851, /* GL_STENCIL_INDEX1 */
-      1856, /* GL_STENCIL_INDEX4 */
-      1859, /* GL_STENCIL_INDEX8 */
-      1852, /* GL_STENCIL_INDEX16 */
-      1588, /* GL_RENDERBUFFER_RED_SIZE */
-      1579, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1574, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1569, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1576, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1592, /* GL_RENDERBUFFER_STENCIL_SIZE */
+      1572, /* GL_RENDERBUFFER */
+      1598, /* GL_RENDERBUFFER_WIDTH */
+      1585, /* GL_RENDERBUFFER_HEIGHT */
+      1588, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1866, /* GL_STENCIL_INDEX_EXT */
+      1855, /* GL_STENCIL_INDEX1 */
+      1860, /* GL_STENCIL_INDEX4 */
+      1863, /* GL_STENCIL_INDEX8 */
+      1856, /* GL_STENCIL_INDEX16 */
+      1592, /* GL_RENDERBUFFER_RED_SIZE */
+      1583, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1578, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1573, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1580, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1596, /* GL_RENDERBUFFER_STENCIL_SIZE */
        658, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
       1105, /* GL_MAX_SAMPLES */
-      2067, /* GL_TEXTURE_GEN_STR_OES */
+      2071, /* GL_TEXTURE_GEN_STR_OES */
        705, /* GL_HALF_FLOAT_OES */
-      1636, /* GL_RGB565_OES */
-      1666, /* GL_RGBA32UI */
-      1629, /* GL_RGB32UI */
+      1639, /* GL_RGB565 */
+      1670, /* GL_RGBA32UI */
+      1633, /* GL_RGB32UI */
         40, /* GL_ALPHA32UI_EXT */
        761, /* GL_INTENSITY32UI_EXT */
        878, /* GL_LUMINANCE32UI_EXT */
        895, /* GL_LUMINANCE_ALPHA32UI_EXT */
-      1657, /* GL_RGBA16UI */
-      1621, /* GL_RGB16UI */
+      1661, /* GL_RGBA16UI */
+      1625, /* GL_RGB16UI */
         37, /* GL_ALPHA16UI_EXT */
        758, /* GL_INTENSITY16UI_EXT */
        873, /* GL_LUMINANCE16UI_EXT */
        893, /* GL_LUMINANCE_ALPHA16UI_EXT */
-      1676, /* GL_RGBA8UI */
-      1644, /* GL_RGB8UI */
+      1680, /* GL_RGBA8UI */
+      1648, /* GL_RGB8UI */
         45, /* GL_ALPHA8UI_EXT */
        766, /* GL_INTENSITY8UI_EXT */
        887, /* GL_LUMINANCE8UI_EXT */
        897, /* GL_LUMINANCE_ALPHA8UI_EXT */
-      1664, /* GL_RGBA32I */
-      1627, /* GL_RGB32I */
+      1668, /* GL_RGBA32I */
+      1631, /* GL_RGB32I */
         39, /* GL_ALPHA32I_EXT */
        760, /* GL_INTENSITY32I_EXT */
        877, /* GL_LUMINANCE32I_EXT */
        894, /* GL_LUMINANCE_ALPHA32I_EXT */
-      1655, /* GL_RGBA16I */
-      1619, /* GL_RGB16I */
+      1659, /* GL_RGBA16I */
+      1623, /* GL_RGB16I */
         36, /* GL_ALPHA16I_EXT */
        757, /* GL_INTENSITY16I_EXT */
        872, /* GL_LUMINANCE16I_EXT */
        892, /* GL_LUMINANCE_ALPHA16I_EXT */
-      1674, /* GL_RGBA8I */
-      1642, /* GL_RGB8I */
+      1678, /* GL_RGBA8I */
+      1646, /* GL_RGB8I */
         44, /* GL_ALPHA8I_EXT */
        765, /* GL_INTENSITY8I_EXT */
        886, /* GL_LUMINANCE8I_EXT */
        896, /* GL_LUMINANCE_ALPHA8I_EXT */
-      1558, /* GL_RED_INTEGER */
+      1562, /* GL_RED_INTEGER */
        700, /* GL_GREEN_INTEGER */
        113, /* GL_BLUE_INTEGER */
         49, /* GL_ALPHA_INTEGER_EXT */
-      1689, /* GL_RGB_INTEGER */
-      1683, /* GL_RGBA_INTEGER */
+      1693, /* GL_RGB_INTEGER */
+      1687, /* GL_RGBA_INTEGER */
         84, /* GL_BGR_INTEGER */
         82, /* GL_BGRA_INTEGER */
        899, /* GL_LUMINANCE_INTEGER_EXT */
        898, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */
-      1685, /* GL_RGBA_INTEGER_MODE_EXT */
+      1689, /* GL_RGBA_INTEGER_MODE_EXT */
        612, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */
        653, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */
        652, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
-      1700, /* GL_SAMPLER_1D_ARRAY */
-      1706, /* GL_SAMPLER_2D_ARRAY */
-      1716, /* GL_SAMPLER_BUFFER */
-      1702, /* GL_SAMPLER_1D_ARRAY_SHADOW */
-      1708, /* GL_SAMPLER_2D_ARRAY_SHADOW */
-      1719, /* GL_SAMPLER_CUBE_SHADOW */
-      2204, /* GL_UNSIGNED_INT_VEC2 */
-      2206, /* GL_UNSIGNED_INT_VEC3 */
-      2208, /* GL_UNSIGNED_INT_VEC4 */
+      1704, /* GL_SAMPLER_1D_ARRAY */
+      1710, /* GL_SAMPLER_2D_ARRAY */
+      1720, /* GL_SAMPLER_BUFFER */
+      1706, /* GL_SAMPLER_1D_ARRAY_SHADOW */
+      1712, /* GL_SAMPLER_2D_ARRAY_SHADOW */
+      1723, /* GL_SAMPLER_CUBE_SHADOW */
+      2208, /* GL_UNSIGNED_INT_VEC2 */
+      2210, /* GL_UNSIGNED_INT_VEC3 */
+      2212, /* GL_UNSIGNED_INT_VEC4 */
        775, /* GL_INT_SAMPLER_1D */
        779, /* GL_INT_SAMPLER_2D */
        785, /* GL_INT_SAMPLER_3D */
@@ -6144,14 +6153,14 @@ static const unsigned reduced_enums[1562] =
        776, /* GL_INT_SAMPLER_1D_ARRAY */
        780, /* GL_INT_SAMPLER_2D_ARRAY */
        787, /* GL_INT_SAMPLER_BUFFER */
-      2188, /* GL_UNSIGNED_INT_SAMPLER_1D */
-      2192, /* GL_UNSIGNED_INT_SAMPLER_2D */
-      2198, /* GL_UNSIGNED_INT_SAMPLER_3D */
-      2202, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
-      2196, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
-      2189, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
-      2193, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
-      2200, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
+      2192, /* GL_UNSIGNED_INT_SAMPLER_1D */
+      2196, /* GL_UNSIGNED_INT_SAMPLER_2D */
+      2202, /* GL_UNSIGNED_INT_SAMPLER_3D */
+      2206, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
+      2200, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
+      2193, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
+      2197, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
+      2204, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
        691, /* GL_GEOMETRY_SHADER */
        694, /* GL_GEOMETRY_VERTICES_OUT_ARB */
        688, /* GL_GEOMETRY_INPUT_TYPE_ARB */
@@ -6167,56 +6176,56 @@ static const unsigned reduced_enums[1562] =
        863, /* GL_LOW_INT */
       1148, /* GL_MEDIUM_INT */
        707, /* GL_HIGH_INT */
-      2178, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+      2182, /* GL_UNSIGNED_INT_10_10_10_2_OES */
        774, /* GL_INT_10_10_10_2_OES */
-      1758, /* GL_SHADER_BINARY_FORMATS */
-      1249, /* GL_NUM_SHADER_BINARY_FORMATS */
-      1759, /* GL_SHADER_COMPILER */
+      1762, /* GL_SHADER_BINARY_FORMATS */
+      1250, /* GL_NUM_SHADER_BINARY_FORMATS */
+      1763, /* GL_SHADER_COMPILER */
       1142, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
       1134, /* GL_MAX_VARYING_VECTORS */
       1051, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
-      1534, /* GL_QUERY_WAIT */
-      1528, /* GL_QUERY_NO_WAIT */
-      1524, /* GL_QUERY_BY_REGION_WAIT */
-      1522, /* GL_QUERY_BY_REGION_NO_WAIT */
-      2122, /* GL_TRANSFORM_FEEDBACK */
-      2131, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-      2125, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-      2123, /* GL_TRANSFORM_FEEDBACK_BINDING */
-      1518, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+      1538, /* GL_QUERY_WAIT */
+      1532, /* GL_QUERY_NO_WAIT */
+      1528, /* GL_QUERY_BY_REGION_WAIT */
+      1526, /* GL_QUERY_BY_REGION_NO_WAIT */
+      2126, /* GL_TRANSFORM_FEEDBACK */
+      2135, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+      2129, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+      2127, /* GL_TRANSFORM_FEEDBACK_BINDING */
+      1522, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
        546, /* GL_FIRST_VERTEX_CONVENTION */
        807, /* GL_LAST_VERTEX_CONVENTION */
-      1492, /* GL_PROVOKING_VERTEX */
+      1496, /* GL_PROVOKING_VERTEX */
        354, /* GL_COPY_READ_BUFFER */
        355, /* GL_COPY_WRITE_BUFFER */
-      1561, /* GL_RED_SNORM */
-      1696, /* GL_RG_SNORM */
-      1695, /* GL_RGB_SNORM */
-      1688, /* GL_RGBA_SNORM */
-      1540, /* GL_R8_SNORM */
-      1609, /* GL_RG8_SNORM */
-      1648, /* GL_RGB8_SNORM */
-      1680, /* GL_RGBA8_SNORM */
-      1538, /* GL_R16_SNORM */
-      1608, /* GL_RG16_SNORM */
-      1624, /* GL_RGB16_SNORM */
-      1660, /* GL_RGBA16_SNORM */
-      1770, /* GL_SIGNED_NORMALIZED */
-      1449, /* GL_PRIMITIVE_RESTART */
-      1450, /* GL_PRIMITIVE_RESTART_INDEX */
+      1565, /* GL_RED_SNORM */
+      1700, /* GL_RG_SNORM */
+      1699, /* GL_RGB_SNORM */
+      1692, /* GL_RGBA_SNORM */
+      1544, /* GL_R8_SNORM */
+      1613, /* GL_RG8_SNORM */
+      1652, /* GL_RGB8_SNORM */
+      1684, /* GL_RGBA8_SNORM */
+      1542, /* GL_R16_SNORM */
+      1612, /* GL_RG16_SNORM */
+      1628, /* GL_RGB16_SNORM */
+      1664, /* GL_RGBA16_SNORM */
+      1774, /* GL_SIGNED_NORMALIZED */
+      1450, /* GL_PRIMITIVE_RESTART */
+      1451, /* GL_PRIMITIVE_RESTART_INDEX */
       1107, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-      1263, /* GL_OBJECT_TYPE */
-      1883, /* GL_SYNC_CONDITION */
-      1888, /* GL_SYNC_STATUS */
-      1885, /* GL_SYNC_FLAGS */
-      1884, /* GL_SYNC_FENCE */
-      1887, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-      2171, /* GL_UNSIGNALED */
-      1769, /* GL_SIGNALED */
+      1264, /* GL_OBJECT_TYPE */
+      1887, /* GL_SYNC_CONDITION */
+      1892, /* GL_SYNC_STATUS */
+      1889, /* GL_SYNC_FLAGS */
+      1888, /* GL_SYNC_FENCE */
+      1891, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+      2175, /* GL_UNSIGNALED */
+      1773, /* GL_SIGNALED */
         54, /* GL_ALREADY_SIGNALED */
-      2117, /* GL_TIMEOUT_EXPIRED */
+      2121, /* GL_TIMEOUT_EXPIRED */
        315, /* GL_CONDITION_SATISFIED */
-      2288, /* GL_WAIT_FAILED */
+      2292, /* GL_WAIT_FAILED */
        126, /* GL_BUFFER_ACCESS_FLAGS */
        132, /* GL_BUFFER_MAP_LENGTH */
        133, /* GL_BUFFER_MAP_OFFSET */
@@ -6226,10 +6235,10 @@ static const unsigned reduced_enums[1562] =
       1048, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */
        330, /* GL_CONTEXT_PROFILE_MASK */
        531, /* GL_EVAL_BIT */
-      1543, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+      1547, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
        854, /* GL_LIST_BIT */
-      1990, /* GL_TEXTURE_BIT */
-      1739, /* GL_SCISSOR_BIT */
+      1994, /* GL_TEXTURE_BIT */
+      1743, /* GL_SCISSOR_BIT */
         30, /* GL_ALL_ATTRIB_BITS */
       1213, /* GL_MULTISAMPLE_BIT */
         31, /* GL_ALL_CLIENT_ATTRIB_BITS */
diff --git a/mesalib/src/mesa/main/es_generator.py b/mesalib/src/mesa/main/es_generator.py
index c0b0a4458..cad3deaef 100644
--- a/mesalib/src/mesa/main/es_generator.py
+++ b/mesalib/src/mesa/main/es_generator.py
@@ -681,10 +681,10 @@ print """
 #if FEATURE_remap_table
 
 /* define esLocalRemapTable */
-#include "%sapi/main/dispatch.h"
+#include "main/api_exec_%s_dispatch.h"
 
 #define need_MESA_remap_table
-#include "%sapi/main/remap_helper.h"
+#include "main/api_exec_%s_remap_helper.h"
 
 static void
 init_remap_table(void)
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index 267620a20..14b0cf9ac 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -1,1004 +1,1005 @@
-/*

- * Mesa 3-D graphics library

- * Version:  7.6

- *

- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

- * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.

- *

- * 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 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

- * BRIAN PAUL 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

- * \brief Extension handling

- */

-

-

-#include "glheader.h"

-#include "imports.h"

-#include "context.h"

-#include "extensions.h"

-#include "mfeatures.h"

-#include "mtypes.h"

-

-enum {

-   DISABLE = 0,

-   GL  = 1 << API_OPENGL,

-   ES1 = 1 << API_OPENGLES,

-   ES2 = 1 << API_OPENGLES2,

-};

-

-/**

- * \brief An element of the \c extension_table.

- */

-struct extension {

-   /** Name of extension, such as "GL_ARB_depth_clamp". */

-   const char *name;

-

-   /** Offset (in bytes) of the corresponding member in struct gl_extensions. */

-   size_t offset;

-

-   /** Set of API's in which the extension exists, as a bitset. */

-   uint8_t api_set;

-

-   /** Year the extension was proposed or approved.  Used to sort the 

-    * extension string chronologically. */

-   uint16_t year;

-};

-

-

-/**

- * Given a member \c x of struct gl_extensions, return offset of

- * \c x in bytes.

- */

-#define o(x) offsetof(struct gl_extensions, x)

-

-

-/**

- * \brief Table of supported OpenGL extensions for all API's.

- *

- * Note: The GL_MESAX_* extensions are placeholders for future ARB extensions.

- */

-static const struct extension extension_table[] = {

-   /* ARB Extensions */

-   { "GL_ARB_ES2_compatibility",                   o(ARB_ES2_compatibility),                   GL,             2009 },

-   { "GL_ARB_blend_func_extended",                 o(ARB_blend_func_extended),                 GL,             2009 },

-   { "GL_ARB_color_buffer_float",                  o(ARB_color_buffer_float),                  GL,             2004 },

-   { "GL_ARB_copy_buffer",                         o(ARB_copy_buffer),                         GL,             2008 },

-   { "GL_ARB_depth_buffer_float",                  o(ARB_depth_buffer_float),                  GL,             2008 },

-   { "GL_ARB_depth_clamp",                         o(ARB_depth_clamp),                         GL,             2003 },

-   { "GL_ARB_depth_texture",                       o(ARB_depth_texture),                       GL,             2001 },

-   { "GL_ARB_draw_buffers",                        o(ARB_draw_buffers),                        GL,             2002 },

-   { "GL_ARB_draw_buffers_blend",                  o(ARB_draw_buffers_blend),                  GL,             2009 },

-   { "GL_ARB_draw_elements_base_vertex",           o(ARB_draw_elements_base_vertex),           GL,             2009 },

-   { "GL_ARB_draw_instanced",                      o(ARB_draw_instanced),                      GL,             2008 },

-   { "GL_ARB_explicit_attrib_location",            o(ARB_explicit_attrib_location),            GL,             2009 },

-   { "GL_ARB_fragment_coord_conventions",          o(ARB_fragment_coord_conventions),          GL,             2009 },

-   { "GL_ARB_fragment_program",                    o(ARB_fragment_program),                    GL,             2002 },

-   { "GL_ARB_fragment_program_shadow",             o(ARB_fragment_program_shadow),             GL,             2003 },

-   { "GL_ARB_fragment_shader",                     o(ARB_fragment_shader),                     GL,             2002 },

-   { "GL_ARB_framebuffer_object",                  o(ARB_framebuffer_object),                  GL,             2005 },

-   { "GL_ARB_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL,             1998 },

-   { "GL_ARB_half_float_pixel",                    o(ARB_half_float_pixel),                    GL,             2003 },

-   { "GL_ARB_half_float_vertex",                   o(ARB_half_float_vertex),                   GL,             2008 },

-   { "GL_ARB_instanced_arrays",                    o(ARB_instanced_arrays),                    GL,             2008 },

-   { "GL_ARB_map_buffer_range",                    o(ARB_map_buffer_range),                    GL,             2008 },

-   { "GL_ARB_multisample",                         o(ARB_multisample),                         GL,             1994 },

-   { "GL_ARB_multitexture",                        o(ARB_multitexture),                        GL,             1998 },

-   { "GL_ARB_occlusion_query2",                    o(ARB_occlusion_query2),                    GL,             2003 },

-   { "GL_ARB_occlusion_query",                     o(ARB_occlusion_query),                     GL,             2001 },

-   { "GL_ARB_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL,             2004 },

-   { "GL_ARB_point_parameters",                    o(EXT_point_parameters),                    GL,             1997 },

-   { "GL_ARB_point_sprite",                        o(ARB_point_sprite),                        GL,             2003 },

-   { "GL_ARB_provoking_vertex",                    o(EXT_provoking_vertex),                    GL,             2009 },

-   { "GL_ARB_robustness",                          o(dummy_true),                              GL,             2010 },

-   { "GL_ARB_sampler_objects",                     o(ARB_sampler_objects),                     GL,             2009 },

-   { "GL_ARB_seamless_cube_map",                   o(ARB_seamless_cube_map),                   GL,             2009 },

-   { "GL_ARB_shader_objects",                      o(ARB_shader_objects),                      GL,             2002 },

-   { "GL_ARB_shader_stencil_export",               o(ARB_shader_stencil_export),               GL,             2009 },

-   { "GL_ARB_shader_texture_lod",                  o(ARB_shader_texture_lod),                  GL,             2009 },

-   { "GL_ARB_shading_language_100",                o(ARB_shading_language_100),                GL,             2003 },

-   { "GL_ARB_shadow_ambient",                      o(ARB_shadow_ambient),                      GL,             2001 },

-   { "GL_ARB_shadow",                              o(ARB_shadow),                              GL,             2001 },

-   { "GL_ARB_sync",                                o(ARB_sync),                                GL,             2003 },

-   { "GL_ARB_texture_border_clamp",                o(ARB_texture_border_clamp),                GL,             2000 },

-   { "GL_ARB_texture_buffer_object",               o(ARB_texture_buffer_object),               GL,             2008 },

-   { "GL_ARB_texture_compression",                 o(ARB_texture_compression),                 GL,             2000 },

-   { "GL_ARB_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL,             2004 },

-   { "GL_ARB_texture_cube_map",                    o(ARB_texture_cube_map),                    GL,             1999 },

-   { "GL_ARB_texture_env_add",                     o(EXT_texture_env_add),                     GL,             1999 },

-   { "GL_ARB_texture_env_combine",                 o(ARB_texture_env_combine),                 GL,             2001 },

-   { "GL_ARB_texture_env_crossbar",                o(ARB_texture_env_crossbar),                GL,             2001 },

-   { "GL_ARB_texture_env_dot3",                    o(ARB_texture_env_dot3),                    GL,             2001 },

-   { "GL_ARB_texture_float",                       o(ARB_texture_float),                       GL,             2004 },

-   { "GL_ARB_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL,             2001 },

-   { "GL_ARB_texture_multisample",                 o(ARB_texture_multisample),                 GL,             2009 },

-   { "GL_ARB_texture_non_power_of_two",            o(ARB_texture_non_power_of_two),            GL,             2003 },

-   { "GL_ARB_texture_rectangle",                   o(NV_texture_rectangle),                    GL,             2004 },

-   { "GL_ARB_texture_rgb10_a2ui",                  o(ARB_texture_rgb10_a2ui),                  GL,             2009 },

-   { "GL_ARB_texture_rg",                          o(ARB_texture_rg),                          GL,             2008 },

-   { "GL_ARB_texture_swizzle",                     o(EXT_texture_swizzle),                     GL,             2008 },

-   { "GL_ARB_transform_feedback2",                 o(ARB_transform_feedback2),                 GL,             2010 },

-   { "GL_ARB_transpose_matrix",                    o(ARB_transpose_matrix),                    GL,             1999 },

-   { "GL_ARB_uniform_buffer_object",               o(ARB_uniform_buffer_object),               GL,             2002 },

-   { "GL_ARB_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL,             2008 },

-   { "GL_ARB_vertex_array_object",                 o(ARB_vertex_array_object),                 GL,             2006 },

-   { "GL_ARB_vertex_buffer_object",                o(ARB_vertex_buffer_object),                GL,             2003 },

-   { "GL_ARB_vertex_program",                      o(ARB_vertex_program),                      GL,             2002 },

-   { "GL_ARB_vertex_shader",                       o(ARB_vertex_shader),                       GL,             2002 },

-   { "GL_ARB_vertex_type_2_10_10_10_rev",          o(ARB_vertex_type_2_10_10_10_rev),          GL,             2009 },

-   { "GL_ARB_window_pos",                          o(ARB_window_pos),                          GL,             2001 },

-   /* EXT extensions */

-   { "GL_EXT_abgr",                                o(EXT_abgr),                                GL,             1995 },

-   { "GL_EXT_bgra",                                o(EXT_bgra),                                GL,             1995 },

-   { "GL_EXT_blend_color",                         o(EXT_blend_color),                         GL,             1995 },

-   { "GL_EXT_blend_equation_separate",             o(EXT_blend_equation_separate),             GL,             2003 },

-   { "GL_EXT_blend_func_separate",                 o(EXT_blend_func_separate),                 GL,             1999 },

-   { "GL_EXT_blend_logic_op",                      o(EXT_blend_logic_op),                      GL,             1995 },

-   { "GL_EXT_blend_minmax",                        o(EXT_blend_minmax),                        GL | ES1 | ES2, 1995 },

-   { "GL_EXT_blend_subtract",                      o(EXT_blend_subtract),                      GL,             1995 },

-   { "GL_EXT_clip_volume_hint",                    o(EXT_clip_volume_hint),                    GL,             1996 },

-   { "GL_EXT_compiled_vertex_array",               o(EXT_compiled_vertex_array),               GL,             1996 },

-   { "GL_EXT_copy_texture",                        o(EXT_copy_texture),                        GL,             1995 },

-   { "GL_EXT_depth_bounds_test",                   o(EXT_depth_bounds_test),                   GL,             2002 },

-   { "GL_EXT_draw_buffers2",                       o(EXT_draw_buffers2),                       GL,             2006 },

-   { "GL_EXT_draw_instanced",                      o(ARB_draw_instanced),                      GL,             2006 },

-   { "GL_EXT_draw_range_elements",                 o(EXT_draw_range_elements),                 GL,             1997 },

-   { "GL_EXT_fog_coord",                           o(EXT_fog_coord),                           GL,             1999 },

-   { "GL_EXT_framebuffer_blit",                    o(EXT_framebuffer_blit),                    GL,             2005 },

-   { "GL_EXT_framebuffer_multisample",             o(EXT_framebuffer_multisample),             GL,             2005 },

-   { "GL_EXT_framebuffer_object",                  o(EXT_framebuffer_object),                  GL,             2000 },

-   { "GL_EXT_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL,             1998 },

-   { "GL_EXT_gpu_program_parameters",              o(EXT_gpu_program_parameters),              GL,             2006 },

-   { "GL_EXT_gpu_shader4",                         o(EXT_gpu_shader4),                         GL,             2006 },

-   { "GL_EXT_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL | ES1 | ES2, 1999 },

-   { "GL_EXT_packed_depth_stencil",                o(EXT_packed_depth_stencil),                GL,             2005 },

-   { "GL_EXT_packed_float",                        o(EXT_packed_float),                        GL,             2004 },

-   { "GL_EXT_packed_pixels",                       o(EXT_packed_pixels),                       GL,             1997 },

-   { "GL_EXT_paletted_texture",                    o(EXT_paletted_texture),                    GL,             1995 },

-   { "GL_EXT_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL,             2004 },

-   { "GL_EXT_point_parameters",                    o(EXT_point_parameters),                    GL,             1997 },

-   { "GL_EXT_polygon_offset",                      o(EXT_polygon_offset),                      GL,             1995 },

-   { "GL_EXT_provoking_vertex",                    o(EXT_provoking_vertex),                    GL,             2009 },

-   { "GL_EXT_rescale_normal",                      o(EXT_rescale_normal),                      GL,             1997 },

-   { "GL_EXT_secondary_color",                     o(EXT_secondary_color),                     GL,             1999 },

-   { "GL_EXT_separate_shader_objects",             o(EXT_separate_shader_objects),             GL,             2008 },

-   { "GL_EXT_separate_specular_color",             o(EXT_separate_specular_color),             GL,             1997 },

-   { "GL_EXT_shadow_funcs",                        o(EXT_shadow_funcs),                        GL,             2002 },

-   { "GL_EXT_shared_texture_palette",              o(EXT_shared_texture_palette),              GL,             2000 },

-   { "GL_EXT_stencil_two_side",                    o(EXT_stencil_two_side),                    GL,             2001 },

-   { "GL_EXT_stencil_wrap",                        o(EXT_stencil_wrap),                        GL,             2002 },

-   { "GL_EXT_subtexture",                          o(EXT_subtexture),                          GL,             1995 },

-   { "GL_EXT_texture3D",                           o(EXT_texture3D),                           GL,             1996 },

-   { "GL_EXT_texture_array",                       o(EXT_texture_array),                       GL,             2006 },

-   { "GL_EXT_texture_compression_dxt1",            o(EXT_texture_compression_s3tc),            GL | ES1 | ES2, 2004 },

-   { "GL_EXT_texture_compression_latc",            o(EXT_texture_compression_latc),            GL,             2006 },

-   { "GL_EXT_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL,             2004 },

-   { "GL_EXT_texture_compression_s3tc",            o(EXT_texture_compression_s3tc),            GL,             2000 },

-   { "GL_EXT_texture_cube_map",                    o(ARB_texture_cube_map),                    GL,             2001 },

-   { "GL_EXT_texture_edge_clamp",                  o(SGIS_texture_edge_clamp),                 GL,             1997 },

-   { "GL_EXT_texture_env_add",                     o(EXT_texture_env_add),                     GL,             1999 },

-   { "GL_EXT_texture_env_combine",                 o(EXT_texture_env_combine),                 GL,             2006 },

-   { "GL_EXT_texture_env_dot3",                    o(EXT_texture_env_dot3),                    GL,             2000 },

-   { "GL_EXT_texture_filter_anisotropic",          o(EXT_texture_filter_anisotropic),          GL | ES1 | ES2, 1999 },

-   { "GL_EXT_texture_format_BGRA8888",             o(EXT_texture_format_BGRA8888),                  ES1 | ES2, 2009 },

-   { "GL_EXT_texture_integer",                     o(EXT_texture_integer),                     GL,             2006 },

-   { "GL_EXT_texture_lod_bias",                    o(EXT_texture_lod_bias),                    GL | ES1,       1999 },

-   { "GL_EXT_texture_mirror_clamp",                o(EXT_texture_mirror_clamp),                GL,             2004 },

-   { "GL_EXT_texture_object",                      o(EXT_texture_object),                      GL,             1995 },

-   { "GL_EXT_texture",                             o(EXT_texture),                             GL,             1996 },

-   { "GL_EXT_texture_rectangle",                   o(NV_texture_rectangle),                    GL,             2004 },

-   { "GL_EXT_texture_shared_exponent",             o(EXT_texture_shared_exponent),             GL,             2004 },

-   { "GL_EXT_texture_snorm",                       o(EXT_texture_snorm),                       GL,             2009 },

-   { "GL_EXT_texture_sRGB",                        o(EXT_texture_sRGB),                        GL,             2004 },

-   { "GL_EXT_texture_sRGB_decode",                 o(EXT_texture_sRGB_decode),                        GL,      2006 },

-   { "GL_EXT_texture_swizzle",                     o(EXT_texture_swizzle),                     GL,             2008 },

-   { "GL_EXT_texture_type_2_10_10_10_REV",         o(dummy_true),                                         ES2, 2008 },

-   { "GL_EXT_timer_query",                         o(EXT_timer_query),                         GL,             2006 },

-   { "GL_EXT_transform_feedback",                  o(EXT_transform_feedback),                  GL,             2011 },

-   { "GL_EXT_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL,             2008 },

-   { "GL_EXT_vertex_array",                        o(EXT_vertex_array),                        GL,             1995 },

-   { "GL_EXT_vertex_array_set",                    o(EXT_vertex_array_set),                    GL,             1997 },

-

-   /* OES extensions */

-   { "GL_OES_blend_equation_separate",             o(EXT_blend_equation_separate),                  ES1,       2009 },

-   { "GL_OES_blend_func_separate",                 o(EXT_blend_func_separate),                      ES1,       2009 },

-   { "GL_OES_blend_subtract",                      o(EXT_blend_subtract),                           ES1,       2009 },

-   { "GL_OES_byte_coordinates",                    o(dummy_true),                                   ES1,       2002 },

-   { "GL_OES_compressed_paletted_texture",         o(dummy_false),                     DISABLE,                2003 },

-   { "GL_OES_depth24",                             o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

-   { "GL_OES_depth32",                             o(dummy_false),                     DISABLE,                2005 },

-   { "GL_OES_depth_texture",                       o(ARB_depth_texture),                                  ES2, 2006 },

-#if FEATURE_OES_draw_texture

-   { "GL_OES_draw_texture",                        o(OES_draw_texture),                             ES1 | ES2, 2004 },

-#endif

-#if FEATURE_OES_EGL_image

-   /*  FIXME: Mesa expects GL_OES_EGL_image to be available in OpenGL contexts. */

-   { "GL_OES_EGL_image",                           o(OES_EGL_image),                           GL | ES1 | ES2, 2006 },

-#endif

-   { "GL_OES_element_index_uint",                  o(EXT_vertex_array),                             ES1 | ES2, 2005 },

-   { "GL_OES_fbo_render_mipmap",                   o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

-   { "GL_OES_fixed_point",                         o(dummy_true),                                   ES1,       2002 },

-   { "GL_OES_framebuffer_object",                  o(EXT_framebuffer_object),                       ES1,       2005 },

-   { "GL_OES_mapbuffer",                           o(ARB_vertex_buffer_object),                     ES1 | ES2, 2005 },

-   { "GL_OES_matrix_get",                          o(dummy_true),                                   ES1,       2004 },

-   { "GL_OES_packed_depth_stencil",                o(EXT_packed_depth_stencil),                     ES1 | ES2, 2007 },

-   { "GL_OES_point_size_array",                    o(dummy_true),                                   ES1,       2004 },

-   { "GL_OES_point_sprite",                        o(ARB_point_sprite),                             ES1,       2004 },

-   { "GL_OES_query_matrix",                        o(dummy_true),                                   ES1,       2003 },

-   { "GL_OES_read_format",                         o(OES_read_format),                         GL | ES1,       2003 },

-   { "GL_OES_rgb8_rgba8",                          o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

-   { "GL_OES_single_precision",                    o(dummy_true),                                   ES1,       2003 },

-   { "GL_OES_standard_derivatives",                o(OES_standard_derivatives),                           ES2, 2005 },

-   { "GL_OES_stencil1",                            o(dummy_false),                     DISABLE,                2005 },

-   { "GL_OES_stencil4",                            o(dummy_false),                     DISABLE,                2005 },

-   { "GL_OES_stencil8",                            o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },

-   { "GL_OES_stencil_wrap",                        o(EXT_stencil_wrap),                             ES1,       2002 },

-   { "GL_OES_texture_3D",                          o(EXT_texture3D),                                      ES2, 2005 },

-   { "GL_OES_texture_cube_map",                    o(ARB_texture_cube_map),                         ES1,       2007 },

-   { "GL_OES_texture_env_crossbar",                o(ARB_texture_env_crossbar),                     ES1,       2005 },

-   { "GL_OES_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),                  ES1,       2005 },

-   { "GL_OES_texture_npot",                        o(ARB_texture_non_power_of_two),                       ES2, 2005 },

-

-   /* Vendor extensions */

-   { "GL_3DFX_texture_compression_FXT1",           o(TDFX_texture_compression_FXT1),           GL,             1999 },

-   { "GL_AMD_conservative_depth",                  o(AMD_conservative_depth),                  GL,             2009 },

-   { "GL_AMD_draw_buffers_blend",                  o(ARB_draw_buffers_blend),                  GL,             2009 },

-   { "GL_AMD_seamless_cubemap_per_texture",        o(AMD_seamless_cubemap_per_texture),        GL,             2009 },

-   { "GL_AMD_shader_stencil_export",               o(ARB_shader_stencil_export),               GL,             2009 },

-   { "GL_APPLE_client_storage",                    o(APPLE_client_storage),                    GL,             2002 },

-   { "GL_APPLE_object_purgeable",                  o(APPLE_object_purgeable),                  GL,             2006 },

-   { "GL_APPLE_packed_pixels",                     o(APPLE_packed_pixels),                     GL,             2002 },

-   { "GL_APPLE_vertex_array_object",               o(APPLE_vertex_array_object),               GL,             2002 },

-   { "GL_ATI_blend_equation_separate",             o(EXT_blend_equation_separate),             GL,             2003 },

-   { "GL_ATI_draw_buffers",                        o(ARB_draw_buffers),                        GL,             2002 },

-   { "GL_ATI_envmap_bumpmap",                      o(ATI_envmap_bumpmap),                      GL,             2001 },

-   { "GL_ATI_fragment_shader",                     o(ATI_fragment_shader),                     GL,             2001 },

-   { "GL_ATI_separate_stencil",                    o(ATI_separate_stencil),                    GL,             2006 },

-   { "GL_ATI_texture_compression_3dc",             o(ATI_texture_compression_3dc),             GL,             2004 },

-   { "GL_ATI_texture_env_combine3",                o(ATI_texture_env_combine3),                GL,             2002 },

-   { "GL_ATI_texture_float",                       o(ARB_texture_float),                       GL,             2002 },

-   { "GL_ATI_texture_mirror_once",                 o(ATI_texture_mirror_once),                 GL,             2006 },

-   { "GL_IBM_multimode_draw_arrays",               o(IBM_multimode_draw_arrays),               GL,             1998 },

-   { "GL_IBM_rasterpos_clip",                      o(IBM_rasterpos_clip),                      GL,             1996 },

-   { "GL_IBM_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL,             1998 },

-   { "GL_INGR_blend_func_separate",                o(EXT_blend_func_separate),                 GL,             1999 },

-   { "GL_MESA_pack_invert",                        o(MESA_pack_invert),                        GL,             2002 },

-   { "GL_MESA_resize_buffers",                     o(MESA_resize_buffers),                     GL,             1999 },

-   { "GL_MESA_texture_array",                      o(MESA_texture_array),                      GL,             2007 },

-   { "GL_MESA_texture_signed_rgba",                o(EXT_texture_snorm),                       GL,             2009 },

-   { "GL_MESA_window_pos",                         o(ARB_window_pos),                          GL,             2000 },

-   { "GL_MESA_ycbcr_texture",                      o(MESA_ycbcr_texture),                      GL,             2002 },

-   { "GL_NV_blend_square",                         o(NV_blend_square),                         GL,             1999 },

-   { "GL_NV_conditional_render",                   o(NV_conditional_render),                   GL,             2008 },

-   { "GL_NV_depth_clamp",                          o(ARB_depth_clamp),                         GL,             2001 },

-   { "GL_NV_fragment_program",                     o(NV_fragment_program),                     GL,             2001 },

-   { "GL_NV_fragment_program_option",              o(NV_fragment_program_option),              GL,             2005 },

-   { "GL_NV_light_max_exponent",                   o(NV_light_max_exponent),                   GL,             1999 },

-   { "GL_NV_packed_depth_stencil",                 o(EXT_packed_depth_stencil),                GL,             2000 },

-   { "GL_NV_point_sprite",                         o(NV_point_sprite),                         GL,             2001 },

-   { "GL_NV_primitive_restart",                    o(NV_primitive_restart),                    GL,             2002 },

-   { "GL_NV_texgen_reflection",                    o(NV_texgen_reflection),                    GL,             1999 },

-   { "GL_NV_texture_barrier",                      o(NV_texture_barrier),                      GL,             2009 },

-   { "GL_NV_texture_env_combine4",                 o(NV_texture_env_combine4),                 GL,             1999 },

-   { "GL_NV_texture_rectangle",                    o(NV_texture_rectangle),                    GL,             2000 },

-   { "GL_NV_vertex_program1_1",                    o(NV_vertex_program1_1),                    GL,             2001 },

-   { "GL_NV_vertex_program",                       o(NV_vertex_program),                       GL,             2000 },

-   { "GL_S3_s3tc",                                 o(S3_s3tc),                                 GL,             1999 },

-   { "GL_SGIS_generate_mipmap",                    o(SGIS_generate_mipmap),                    GL,             1997 },

-   { "GL_SGIS_texture_border_clamp",               o(ARB_texture_border_clamp),                GL,             1997 },

-   { "GL_SGIS_texture_edge_clamp",                 o(SGIS_texture_edge_clamp),                 GL,             1997 },

-   { "GL_SGIS_texture_lod",                        o(SGIS_texture_lod),                        GL,             1997 },

-   { "GL_SUN_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL,             1999 },

-

-   { 0, 0, 0, 0 },

-};

-

-

-/**

- * Given an extension name, lookup up the corresponding member of struct

- * gl_extensions and return that member's offset (in bytes).  If the name is

- * not found in the \c extension_table, return 0.

- *

- * \param name Name of extension.

- * \return Offset of member in struct gl_extensions.

- */

-static size_t

-name_to_offset(const char* name)

-{

-   const struct extension *i;

-

-   if (name == 0)

-      return 0;

-

-   for (i = extension_table; i->name != 0; ++i) {

-      if (strcmp(name, i->name) == 0)

-	 return i->offset;

-   }

-

-   return 0;

-}

-

-

-/**

- * \brief Extensions enabled by default.

- *

- * These extensions are enabled by _mesa_init_extensions().

- *

- * XXX: Should these defaults also apply to GLES?

- */

-static const size_t default_extensions[] = {

-   o(ARB_copy_buffer),

-   o(ARB_draw_buffers),

-   o(ARB_multisample),

-   o(ARB_texture_compression),

-   o(ARB_transpose_matrix),

-   o(ARB_vertex_buffer_object),

-   o(ARB_window_pos),

-

-   o(EXT_abgr),

-   o(EXT_bgra),

-   o(EXT_compiled_vertex_array),

-   o(EXT_copy_texture),

-   o(EXT_draw_range_elements),

-   o(EXT_multi_draw_arrays),

-   o(EXT_packed_pixels),

-   o(EXT_polygon_offset),

-   o(EXT_rescale_normal),

-   o(EXT_separate_specular_color),

-   o(EXT_subtexture),

-   o(EXT_texture),

-   o(EXT_texture3D),

-   o(EXT_texture_object),

-   o(EXT_vertex_array),

-

-   o(OES_read_format),

-   o(OES_standard_derivatives),

-

-   /* Vendor Extensions */

-   o(APPLE_packed_pixels),

-   o(IBM_multimode_draw_arrays),

-   o(IBM_rasterpos_clip),

-   o(NV_light_max_exponent),

-   o(NV_texgen_reflection),

-   o(SGIS_generate_mipmap),

-   o(SGIS_texture_edge_clamp),

-   o(SGIS_texture_lod),

-

-   0,

-};

-

-

-/**

- * Enable all extensions suitable for a software-only renderer.

- * This is a convenience function used by the XMesa, OSMesa, GGI drivers, etc.

- */

-void

-_mesa_enable_sw_extensions(struct gl_context *ctx)

-{

-   /*ctx->Extensions.ARB_copy_buffer = GL_TRUE;*/

-   ctx->Extensions.ARB_depth_clamp = GL_TRUE;

-   ctx->Extensions.ARB_depth_texture = GL_TRUE;

-   /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/

-   ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE;

-   ctx->Extensions.ARB_draw_instanced = GL_TRUE;

-   ctx->Extensions.ARB_explicit_attrib_location = GL_TRUE;

-   ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;

-#if FEATURE_ARB_fragment_program

-   ctx->Extensions.ARB_fragment_program = GL_TRUE;

-   ctx->Extensions.ARB_fragment_program_shadow = GL_TRUE;

-#endif

-#if FEATURE_ARB_fragment_shader

-   ctx->Extensions.ARB_fragment_shader = GL_TRUE;

-#endif

-#if FEATURE_ARB_framebuffer_object

-   ctx->Extensions.ARB_framebuffer_object = GL_TRUE;

-#endif

-#if FEATURE_ARB_geometry_shader4 && 0

-   /* XXX re-enable when GLSL compiler again supports geometry shaders */

-   ctx->Extensions.ARB_geometry_shader4 = GL_TRUE;

-#endif

-   ctx->Extensions.ARB_half_float_pixel = GL_TRUE;

-   ctx->Extensions.ARB_half_float_vertex = GL_TRUE;

-   ctx->Extensions.ARB_map_buffer_range = GL_TRUE;

-   ctx->Extensions.ARB_multitexture = GL_TRUE;

-#if FEATURE_queryobj

-   ctx->Extensions.ARB_occlusion_query = GL_TRUE;

-   ctx->Extensions.ARB_occlusion_query2 = GL_TRUE;

-#endif

-   ctx->Extensions.ARB_point_sprite = GL_TRUE;

-#if FEATURE_ARB_shader_objects

-   ctx->Extensions.ARB_shader_objects = GL_TRUE;

-   ctx->Extensions.EXT_separate_shader_objects = GL_TRUE;

-#endif

-#if FEATURE_ARB_shading_language_100

-   ctx->Extensions.ARB_shading_language_100 = GL_TRUE;

-#endif

-   ctx->Extensions.ARB_shadow = GL_TRUE;

-   ctx->Extensions.ARB_shadow_ambient = GL_TRUE;

-   ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;

-   ctx->Extensions.ARB_texture_cube_map = GL_TRUE;

-   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;

-   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;

-   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;

-   /*ctx->Extensions.ARB_texture_float = GL_TRUE;*/

-   ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;

-   ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;

-   ctx->Extensions.ARB_texture_rg = GL_TRUE;

-   ctx->Extensions.ARB_texture_compression_rgtc = GL_TRUE;

-   ctx->Extensions.ARB_vertex_array_object = GL_TRUE;

-#if FEATURE_ARB_vertex_program

-   ctx->Extensions.ARB_vertex_program = GL_TRUE;

-#endif

-#if FEATURE_ARB_vertex_shader

-   ctx->Extensions.ARB_vertex_shader = GL_TRUE;

-#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;

-#if FEATURE_APPLE_object_purgeable

-   ctx->Extensions.APPLE_object_purgeable = GL_TRUE;

-#endif

-   ctx->Extensions.ATI_envmap_bumpmap = GL_TRUE;

-#if FEATURE_ATI_fragment_shader

-   ctx->Extensions.ATI_fragment_shader = GL_TRUE;

-#endif

-   ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE;

-   ctx->Extensions.ATI_texture_env_combine3 = GL_TRUE;

-   ctx->Extensions.ATI_texture_mirror_once = GL_TRUE;

-   ctx->Extensions.ATI_separate_stencil = GL_TRUE;

-   ctx->Extensions.EXT_blend_color = GL_TRUE;

-   ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;

-   ctx->Extensions.EXT_blend_func_separate = GL_TRUE;

-   ctx->Extensions.EXT_blend_logic_op = GL_TRUE;

-   ctx->Extensions.EXT_blend_minmax = GL_TRUE;

-   ctx->Extensions.EXT_blend_subtract = GL_TRUE;

-   ctx->Extensions.EXT_depth_bounds_test = GL_TRUE;

-   ctx->Extensions.EXT_draw_buffers2 = GL_TRUE;

-   ctx->Extensions.EXT_fog_coord = GL_TRUE;

-#if FEATURE_EXT_framebuffer_object

-   ctx->Extensions.EXT_framebuffer_object = GL_TRUE;

-#endif

-#if FEATURE_EXT_framebuffer_blit

-   ctx->Extensions.EXT_framebuffer_blit = GL_TRUE;

-#endif

-#if FEATURE_ARB_framebuffer_object

-   ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;

-#endif

-   /*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/

-   ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;

-   ctx->Extensions.EXT_paletted_texture = GL_TRUE;

-#if FEATURE_EXT_pixel_buffer_object

-   ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;

-#endif

-   ctx->Extensions.EXT_point_parameters = GL_TRUE;

-   ctx->Extensions.EXT_provoking_vertex = GL_TRUE;

-   ctx->Extensions.EXT_shadow_funcs = GL_TRUE;

-   ctx->Extensions.EXT_secondary_color = GL_TRUE;

-   ctx->Extensions.EXT_shared_texture_palette = GL_TRUE;

-   ctx->Extensions.EXT_stencil_wrap = GL_TRUE;

-   ctx->Extensions.EXT_stencil_two_side = GL_TRUE;

-   ctx->Extensions.EXT_texture_array = GL_TRUE;

-   ctx->Extensions.EXT_texture_compression_latc = GL_TRUE;

-   ctx->Extensions.EXT_texture_env_add = GL_TRUE;

-   ctx->Extensions.EXT_texture_env_combine = GL_TRUE;

-   ctx->Extensions.EXT_texture_env_dot3 = GL_TRUE;

-   ctx->Extensions.EXT_texture_filter_anisotropic = GL_TRUE;

-   ctx->Extensions.EXT_texture_mirror_clamp = GL_TRUE;

-   ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;

-   ctx->Extensions.EXT_texture_shared_exponent = GL_TRUE;

-#if FEATURE_EXT_texture_sRGB

-   ctx->Extensions.EXT_texture_sRGB = GL_TRUE;

-   ctx->Extensions.EXT_texture_sRGB_decode = GL_TRUE;

-#endif

-   ctx->Extensions.EXT_texture_swizzle = GL_TRUE;

-#if FEATURE_EXT_transform_feedback

-   /*ctx->Extensions.EXT_transform_feedback = GL_TRUE;*/

-#endif

-   ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE;

-   /*ctx->Extensions.IBM_multimode_draw_arrays = GL_TRUE;*/

-   ctx->Extensions.MESA_pack_invert = GL_TRUE;

-   ctx->Extensions.MESA_resize_buffers = GL_TRUE;

-   ctx->Extensions.MESA_texture_array = GL_TRUE;

-   ctx->Extensions.MESA_ycbcr_texture = GL_TRUE;

-   ctx->Extensions.NV_blend_square = GL_TRUE;

-   ctx->Extensions.NV_conditional_render = GL_TRUE;

-   /*ctx->Extensions.NV_light_max_exponent = GL_TRUE;*/

-   ctx->Extensions.NV_point_sprite = GL_TRUE;

-   ctx->Extensions.NV_texture_env_combine4 = GL_TRUE;

-   ctx->Extensions.NV_texture_rectangle = GL_TRUE;

-   /*ctx->Extensions.NV_texgen_reflection = GL_TRUE;*/

-#if FEATURE_NV_vertex_program

-   ctx->Extensions.NV_vertex_program = GL_TRUE;

-   ctx->Extensions.NV_vertex_program1_1 = GL_TRUE;

-#endif

-#if FEATURE_NV_fragment_program

-   ctx->Extensions.NV_fragment_program = GL_TRUE;

-#endif

-#if FEATURE_NV_fragment_program && FEATURE_ARB_fragment_program

-   ctx->Extensions.NV_fragment_program_option = GL_TRUE;

-#endif

-   /*ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;*/

-   ctx->Extensions.SGIS_texture_edge_clamp = GL_TRUE;

-#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program

-   ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;

-#endif

-#if FEATURE_texture_fxt1

-   _mesa_enable_extension(ctx, "GL_3DFX_texture_compression_FXT1");

-#endif

-#if FEATURE_texture_s3tc

-   if (ctx->Mesa_DXTn) {

-      _mesa_enable_extension(ctx, "GL_EXT_texture_compression_s3tc");

-      _mesa_enable_extension(ctx, "GL_S3_s3tc");

-   }

-#endif

-}

-

-

-/**

- * Enable common EXT extensions in the ARB_imaging subset.

- */

-void

-_mesa_enable_imaging_extensions(struct gl_context *ctx)

-{

-   ctx->Extensions.EXT_blend_color = GL_TRUE;

-   ctx->Extensions.EXT_blend_logic_op = GL_TRUE;

-   ctx->Extensions.EXT_blend_minmax = GL_TRUE;

-   ctx->Extensions.EXT_blend_subtract = GL_TRUE;

-}

-

-

-

-/**

- * Enable all OpenGL 1.3 features and extensions.

- * A convenience function to be called by drivers.

- */

-void

-_mesa_enable_1_3_extensions(struct gl_context *ctx)

-{

-   /*ctx->Extensions.ARB_multisample = GL_TRUE;*/

-   ctx->Extensions.ARB_multitexture = GL_TRUE;

-   ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;

-   /*ctx->Extensions.ARB_texture_compression = GL_TRUE;*/

-   ctx->Extensions.ARB_texture_cube_map = GL_TRUE;

-   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;

-   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;

-   ctx->Extensions.EXT_texture_env_add = GL_TRUE;

-   /*ctx->Extensions.ARB_transpose_matrix = GL_TRUE;*/

-}

-

-

-

-/**

- * Enable all OpenGL 1.4 features and extensions.

- * A convenience function to be called by drivers.

- */

-void

-_mesa_enable_1_4_extensions(struct gl_context *ctx)

-{

-   ctx->Extensions.ARB_depth_texture = GL_TRUE;

-   ctx->Extensions.ARB_shadow = GL_TRUE;

-   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;

-   ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;

-   ctx->Extensions.ARB_window_pos = GL_TRUE;

-   ctx->Extensions.EXT_blend_color = GL_TRUE;

-   ctx->Extensions.EXT_blend_func_separate = GL_TRUE;

-   ctx->Extensions.EXT_blend_minmax = GL_TRUE;

-   ctx->Extensions.EXT_blend_subtract = GL_TRUE;

-   ctx->Extensions.EXT_fog_coord = GL_TRUE;

-   /*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/

-   ctx->Extensions.EXT_point_parameters = GL_TRUE;

-   ctx->Extensions.EXT_secondary_color = GL_TRUE;

-   ctx->Extensions.EXT_stencil_wrap = GL_TRUE;

-   ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;

-   /*ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;*/

-}

-

-

-/**

- * Enable all OpenGL 1.5 features and extensions.

- * A convenience function to be called by drivers.

- */

-void

-_mesa_enable_1_5_extensions(struct gl_context *ctx)

-{

-   ctx->Extensions.ARB_occlusion_query = GL_TRUE;

-   /*ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;*/

-   ctx->Extensions.EXT_shadow_funcs = GL_TRUE;

-}

-

-

-/**

- * Enable all OpenGL 2.0 features and extensions.

- * A convenience function to be called by drivers.

- */

-void

-_mesa_enable_2_0_extensions(struct gl_context *ctx)

-{

-   /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/

-#if FEATURE_ARB_fragment_shader

-   ctx->Extensions.ARB_fragment_shader = GL_TRUE;

-#endif

-   ctx->Extensions.ARB_point_sprite = GL_TRUE;

-   ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;

-   ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;

-#if FEATURE_ARB_shader_objects

-   ctx->Extensions.ARB_shader_objects = GL_TRUE;

-#endif

-#if FEATURE_ARB_shading_language_100

-   ctx->Extensions.ARB_shading_language_100 = GL_TRUE;

-#endif

-   ctx->Extensions.EXT_stencil_two_side = GL_TRUE;

-#if FEATURE_ARB_vertex_shader

-   ctx->Extensions.ARB_vertex_shader = GL_TRUE;

-#endif

-}

-

-

-/**

- * Enable all OpenGL 2.1 features and extensions.

- * A convenience function to be called by drivers.

- */

-void

-_mesa_enable_2_1_extensions(struct gl_context *ctx)

-{

-#if FEATURE_EXT_pixel_buffer_object

-   ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;

-#endif

-#if FEATURE_EXT_texture_sRGB

-   ctx->Extensions.EXT_texture_sRGB = GL_TRUE;

-#endif

-}

-

-

-/**

- * Either enable or disable the named extension.

- * \return GL_TRUE for success, GL_FALSE if invalid extension name

- */

-static GLboolean

-set_extension( struct gl_context *ctx, const char *name, GLboolean state )

-{

-   size_t offset;

-

-   if (ctx->Extensions.String) {

-      /* The string was already queried - can't change it now! */

-      _mesa_problem(ctx, "Trying to enable/disable extension after glGetString(GL_EXTENSIONS): %s", name);

-      return GL_FALSE;

-   }

-

-   offset = name_to_offset(name);

-   if (offset == 0) {

-      _mesa_problem(ctx, "Trying to enable/disable unknown extension %s",

-	            name);

-      return GL_FALSE;

-   } else if (offset == o(dummy_true) && state == GL_FALSE) {

-      _mesa_problem(ctx, "Trying to disable a permanently enabled extension: "

-	                  "%s", name);

-      return GL_FALSE;

-   } else {

-      GLboolean *base = (GLboolean *) &ctx->Extensions;

-      base[offset] = state;

-      return GL_TRUE;

-   }

-}

-

-

-/**

- * Enable the named extension.

- * Typically called by drivers.

- */

-void

-_mesa_enable_extension( struct gl_context *ctx, const char *name )

-{

-   if (!set_extension(ctx, name, GL_TRUE))

-      _mesa_problem(ctx, "Trying to enable unknown extension: %s", name);

-}

-

-

-/**

- * Disable the named extension.

- * XXX is this really needed???

- */

-void

-_mesa_disable_extension( struct gl_context *ctx, const char *name )

-{

-   if (!set_extension(ctx, name, GL_FALSE))

-      _mesa_problem(ctx, "Trying to disable unknown extension: %s", name);

-}

-

-

-/**

- * Test if the named extension is enabled in this context.

- */

-GLboolean

-_mesa_extension_is_enabled( struct gl_context *ctx, const char *name )

-{

-   size_t offset;

-   GLboolean *base;

-

-   if (name == 0)

-      return GL_FALSE;

-

-   offset = name_to_offset(name);

-   if (offset == 0)

-      return GL_FALSE;

-   base = (GLboolean *) &ctx->Extensions;

-   return base[offset];

-}

-

-

-/**

- * \brief Apply the \c MESA_EXTENSION_OVERRIDE environment variable.

- *

- * \c MESA_EXTENSION_OVERRIDE is a space-separated list of extensions to

- * enable or disable. The list is processed thus:

- *    - Enable recognized extension names that are prefixed with '+'.

- *    - Disable recognized extension names that are prefixed with '-'.

- *    - Enable recognized extension names that are not prefixed.

- *    - Collect unrecognized extension names in a new string.

- *

- * \return Space-separated list of unrecognized extension names (which must

- *    be freed). Does not return \c NULL.

- */

-static char *

-get_extension_override( struct gl_context *ctx )

-{

-   const char *env_const = _mesa_getenv("MESA_EXTENSION_OVERRIDE");

-   char *env;

-   char *ext;

-   char *extra_exts;

-   int len;

-

-   if (env_const == NULL) {

-      /* Return the empty string rather than NULL. This simplifies the logic

-       * of client functions. */

-      return calloc(1, sizeof(char));

-   }

-

-   /* extra_exts: List of unrecognized extensions. */

-   extra_exts = calloc(strlen(env_const), sizeof(char));

-

-   /* Copy env_const because strtok() is destructive. */

-   env = strdup(env_const);

-   for (ext = strtok(env, " "); ext != NULL; ext = strtok(NULL, " ")) {

-      int enable;

-      int recognized;

-      switch (ext[0]) {

-      case '+':

-         enable = 1;

-         ++ext;

-         break;

-      case '-':

-         enable = 0;

-         ++ext;

-         break;

-      default:

-         enable = 1;

-         break;

-      }

-      recognized = set_extension(ctx, ext, enable);

-      if (!recognized) {

-         strcat(extra_exts, ext);

-         strcat(extra_exts, " ");

-      }

-   }

-

-   /* Remove trailing space. */

-   len = strlen(extra_exts);

-   if (extra_exts[len - 1] == ' ')

-      extra_exts[len - 1] = '\0';

-

-   return extra_exts;

-}

-

-

-/**

- * \brief Initialize extension tables and enable default extensions.

- *

- * This should be called during context initialization.

- * Note: Sets gl_extensions.dummy_true to true.

- */

-void

-_mesa_init_extensions( struct gl_context *ctx )

-{

-   GLboolean *base = (GLboolean *) &ctx->Extensions;

-   GLboolean *sentinel = base + o(extension_sentinel);

-   GLboolean *i;

-   const size_t *j;

-

-   /* First, turn all extensions off. */

-   for (i = base; i != sentinel; ++i)

-      *i = GL_FALSE;

-

-   /* Then, selectively turn default extensions on. */

-   ctx->Extensions.dummy_true = GL_TRUE;

-   for (j = default_extensions; *j != 0; ++j)

-      base[*j] = GL_TRUE;

-}

-

-

-typedef unsigned short extension_index;

-

-

-/**

- * Compare two entries of the extensions table.  Sorts first by year,

- * then by name.

- *

- * Arguments are indices into extension_table.

- */

-static int

-extension_compare(const void *p1, const void *p2)

-{

-   extension_index i1 = * (const extension_index *) p1;

-   extension_index i2 = * (const extension_index *) p2;

-   const struct extension *e1 = &extension_table[i1];

-   const struct extension *e2 = &extension_table[i2];

-   int res;

-

-   res = (int)e1->year - (int)e2->year;

-

-   if (res == 0) {

-      res = strcmp(e1->name, e2->name);

-   }

-

-   return res;

-}

-

-

-/**

- * Construct the GL_EXTENSIONS string.  Called the first time that

- * glGetString(GL_EXTENSIONS) is called.

- */

-GLubyte*

-_mesa_make_extension_string(struct gl_context *ctx)

-{

-   /* The extension string. */

-   char *exts = 0;

-   /* Length of extension string. */

-   size_t length = 0;

-   /* Number of extensions */

-   unsigned count;

-   /* Indices of the extensions sorted by year */

-   extension_index *extension_indices;

-   /* String of extra extensions. */

-   char *extra_extensions = get_extension_override(ctx);

-   GLboolean *base = (GLboolean *) &ctx->Extensions;

-   const struct extension *i;

-   unsigned j;

-   unsigned maxYear = ~0;

-

-   /* Check if the MESA_EXTENSION_MAX_YEAR env var is set */

-   {

-      const char *env = getenv("MESA_EXTENSION_MAX_YEAR");

-      if (env) {

-         maxYear = atoi(env);

-         _mesa_debug(ctx, "Note: limiting GL extensions to %u or earlier\n",

-                     maxYear);

-      }

-   }

-

-   /* Compute length of the extension string. */

-   count = 0;

-   for (i = extension_table; i->name != 0; ++i) {

-      if (base[i->offset] &&

-          i->year <= maxYear &&

-          (i->api_set & (1 << ctx->API))) {

-	 length += strlen(i->name) + 1; /* +1 for space */

-	 ++count;

-      }

-   }

-   if (extra_extensions != NULL)

-      length += 1 + strlen(extra_extensions); /* +1 for space */

-

-   exts = (char *) calloc(length + 1, sizeof(char));

-   if (exts == NULL) {

-      free(extra_extensions);

-      return NULL;

-   }

-

-   extension_indices = malloc(count * sizeof(extension_index));

-   if (extension_indices == NULL) {

-      free(exts);

-      free(extra_extensions);

-      return NULL;

-   }

-

-   /* Sort extensions in chronological order because certain old applications (e.g.,

-    * Quake3 demo) store the extension list in a static size buffer so chronologically

-    * order ensure that the extensions that such applications expect will fit into

-    * that buffer.

-    */

-   j = 0;

-   for (i = extension_table; i->name != 0; ++i) {

-      if (base[i->offset] &&

-          i->year <= maxYear &&

-          (i->api_set & (1 << ctx->API))) {

-         extension_indices[j++] = i - extension_table;

-      }

-   }

-   assert(j == count);

-   qsort(extension_indices, count, sizeof *extension_indices, extension_compare);

-

-   /* Build the extension string.*/

-   for (j = 0; j < count; ++j) {

-      i = &extension_table[extension_indices[j]];

-      assert(base[i->offset] && (i->api_set & (1 << ctx->API)));

-      strcat(exts, i->name);

-      strcat(exts, " ");

-   }

-   free(extension_indices);

-   if (extra_extensions != 0) {

-      strcat(exts, extra_extensions);

-      free(extra_extensions);

-   }

-

-   return (GLubyte *) exts;

-}

-

-/**

- * Return number of enabled extensions.

- */

-GLuint

-_mesa_get_extension_count(struct gl_context *ctx)

-{

-   GLboolean *base;

-   const struct extension *i;

-

-   /* only count once */

-   if (ctx->Extensions.Count != 0)

-      return ctx->Extensions.Count;

-

-   base = (GLboolean *) &ctx->Extensions;

-   for (i = extension_table; i->name != 0; ++i) {

-      if (base[i->offset]) {

-	 ctx->Extensions.Count++;

-      }

-   }

-   return ctx->Extensions.Count;

-}

-

-/**

- * Return name of i-th enabled extension

- */

-const GLubyte *

-_mesa_get_enabled_extension(struct gl_context *ctx, GLuint index)

-{

-   const GLboolean *base;

-   size_t n;

-   const struct extension *i;

-

-   if (index < 0)

-      return NULL;

-

-   base = (GLboolean*) &ctx->Extensions;

-   n = 0;

-   for (i = extension_table; i->name != 0; ++i) {

-      if (n == index && base[i->offset]) {

-	 return (GLubyte*) i->name;

-      } else if (base[i->offset]) {

-	 ++n;

-      }

-   }

-

-   return NULL;

-}

+/*
+ * Mesa 3-D graphics library
+ * Version:  7.6
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
+ *
+ * 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 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
+ * BRIAN PAUL 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
+ * \brief Extension handling
+ */
+
+
+#include "glheader.h"
+#include "imports.h"
+#include "context.h"
+#include "extensions.h"
+#include "mfeatures.h"
+#include "mtypes.h"
+
+enum {
+   DISABLE = 0,
+   GL  = 1 << API_OPENGL,
+   ES1 = 1 << API_OPENGLES,
+   ES2 = 1 << API_OPENGLES2,
+};
+
+/**
+ * \brief An element of the \c extension_table.
+ */
+struct extension {
+   /** Name of extension, such as "GL_ARB_depth_clamp". */
+   const char *name;
+
+   /** Offset (in bytes) of the corresponding member in struct gl_extensions. */
+   size_t offset;
+
+   /** Set of API's in which the extension exists, as a bitset. */
+   uint8_t api_set;
+
+   /** Year the extension was proposed or approved.  Used to sort the 
+    * extension string chronologically. */
+   uint16_t year;
+};
+
+
+/**
+ * Given a member \c x of struct gl_extensions, return offset of
+ * \c x in bytes.
+ */
+#define o(x) offsetof(struct gl_extensions, x)
+
+
+/**
+ * \brief Table of supported OpenGL extensions for all API's.
+ *
+ * Note: The GL_MESAX_* extensions are placeholders for future ARB extensions.
+ */
+static const struct extension extension_table[] = {
+   /* ARB Extensions */
+   { "GL_ARB_ES2_compatibility",                   o(ARB_ES2_compatibility),                   GL,             2009 },
+   { "GL_ARB_blend_func_extended",                 o(ARB_blend_func_extended),                 GL,             2009 },
+   { "GL_ARB_color_buffer_float",                  o(ARB_color_buffer_float),                  GL,             2004 },
+   { "GL_ARB_copy_buffer",                         o(ARB_copy_buffer),                         GL,             2008 },
+   { "GL_ARB_conservative_depth",                  o(AMD_conservative_depth),                  GL,             2011 },
+   { "GL_ARB_depth_buffer_float",                  o(ARB_depth_buffer_float),                  GL,             2008 },
+   { "GL_ARB_depth_clamp",                         o(ARB_depth_clamp),                         GL,             2003 },
+   { "GL_ARB_depth_texture",                       o(ARB_depth_texture),                       GL,             2001 },
+   { "GL_ARB_draw_buffers",                        o(ARB_draw_buffers),                        GL,             2002 },
+   { "GL_ARB_draw_buffers_blend",                  o(ARB_draw_buffers_blend),                  GL,             2009 },
+   { "GL_ARB_draw_elements_base_vertex",           o(ARB_draw_elements_base_vertex),           GL,             2009 },
+   { "GL_ARB_draw_instanced",                      o(ARB_draw_instanced),                      GL,             2008 },
+   { "GL_ARB_explicit_attrib_location",            o(ARB_explicit_attrib_location),            GL,             2009 },
+   { "GL_ARB_fragment_coord_conventions",          o(ARB_fragment_coord_conventions),          GL,             2009 },
+   { "GL_ARB_fragment_program",                    o(ARB_fragment_program),                    GL,             2002 },
+   { "GL_ARB_fragment_program_shadow",             o(ARB_fragment_program_shadow),             GL,             2003 },
+   { "GL_ARB_fragment_shader",                     o(ARB_fragment_shader),                     GL,             2002 },
+   { "GL_ARB_framebuffer_object",                  o(ARB_framebuffer_object),                  GL,             2005 },
+   { "GL_ARB_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL,             1998 },
+   { "GL_ARB_half_float_pixel",                    o(ARB_half_float_pixel),                    GL,             2003 },
+   { "GL_ARB_half_float_vertex",                   o(ARB_half_float_vertex),                   GL,             2008 },
+   { "GL_ARB_instanced_arrays",                    o(ARB_instanced_arrays),                    GL,             2008 },
+   { "GL_ARB_map_buffer_range",                    o(ARB_map_buffer_range),                    GL,             2008 },
+   { "GL_ARB_multisample",                         o(ARB_multisample),                         GL,             1994 },
+   { "GL_ARB_multitexture",                        o(ARB_multitexture),                        GL,             1998 },
+   { "GL_ARB_occlusion_query2",                    o(ARB_occlusion_query2),                    GL,             2003 },
+   { "GL_ARB_occlusion_query",                     o(ARB_occlusion_query),                     GL,             2001 },
+   { "GL_ARB_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL,             2004 },
+   { "GL_ARB_point_parameters",                    o(EXT_point_parameters),                    GL,             1997 },
+   { "GL_ARB_point_sprite",                        o(ARB_point_sprite),                        GL,             2003 },
+   { "GL_ARB_provoking_vertex",                    o(EXT_provoking_vertex),                    GL,             2009 },
+   { "GL_ARB_robustness",                          o(dummy_true),                              GL,             2010 },
+   { "GL_ARB_sampler_objects",                     o(ARB_sampler_objects),                     GL,             2009 },
+   { "GL_ARB_seamless_cube_map",                   o(ARB_seamless_cube_map),                   GL,             2009 },
+   { "GL_ARB_shader_objects",                      o(ARB_shader_objects),                      GL,             2002 },
+   { "GL_ARB_shader_stencil_export",               o(ARB_shader_stencil_export),               GL,             2009 },
+   { "GL_ARB_shader_texture_lod",                  o(ARB_shader_texture_lod),                  GL,             2009 },
+   { "GL_ARB_shading_language_100",                o(ARB_shading_language_100),                GL,             2003 },
+   { "GL_ARB_shadow_ambient",                      o(ARB_shadow_ambient),                      GL,             2001 },
+   { "GL_ARB_shadow",                              o(ARB_shadow),                              GL,             2001 },
+   { "GL_ARB_sync",                                o(ARB_sync),                                GL,             2003 },
+   { "GL_ARB_texture_border_clamp",                o(ARB_texture_border_clamp),                GL,             2000 },
+   { "GL_ARB_texture_buffer_object",               o(ARB_texture_buffer_object),               GL,             2008 },
+   { "GL_ARB_texture_compression",                 o(ARB_texture_compression),                 GL,             2000 },
+   { "GL_ARB_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL,             2004 },
+   { "GL_ARB_texture_cube_map",                    o(ARB_texture_cube_map),                    GL,             1999 },
+   { "GL_ARB_texture_env_add",                     o(EXT_texture_env_add),                     GL,             1999 },
+   { "GL_ARB_texture_env_combine",                 o(ARB_texture_env_combine),                 GL,             2001 },
+   { "GL_ARB_texture_env_crossbar",                o(ARB_texture_env_crossbar),                GL,             2001 },
+   { "GL_ARB_texture_env_dot3",                    o(ARB_texture_env_dot3),                    GL,             2001 },
+   { "GL_ARB_texture_float",                       o(ARB_texture_float),                       GL,             2004 },
+   { "GL_ARB_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL,             2001 },
+   { "GL_ARB_texture_multisample",                 o(ARB_texture_multisample),                 GL,             2009 },
+   { "GL_ARB_texture_non_power_of_two",            o(ARB_texture_non_power_of_two),            GL,             2003 },
+   { "GL_ARB_texture_rectangle",                   o(NV_texture_rectangle),                    GL,             2004 },
+   { "GL_ARB_texture_rgb10_a2ui",                  o(ARB_texture_rgb10_a2ui),                  GL,             2009 },
+   { "GL_ARB_texture_rg",                          o(ARB_texture_rg),                          GL,             2008 },
+   { "GL_ARB_texture_swizzle",                     o(EXT_texture_swizzle),                     GL,             2008 },
+   { "GL_ARB_transform_feedback2",                 o(ARB_transform_feedback2),                 GL,             2010 },
+   { "GL_ARB_transpose_matrix",                    o(ARB_transpose_matrix),                    GL,             1999 },
+   { "GL_ARB_uniform_buffer_object",               o(ARB_uniform_buffer_object),               GL,             2002 },
+   { "GL_ARB_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL,             2008 },
+   { "GL_ARB_vertex_array_object",                 o(ARB_vertex_array_object),                 GL,             2006 },
+   { "GL_ARB_vertex_buffer_object",                o(ARB_vertex_buffer_object),                GL,             2003 },
+   { "GL_ARB_vertex_program",                      o(ARB_vertex_program),                      GL,             2002 },
+   { "GL_ARB_vertex_shader",                       o(ARB_vertex_shader),                       GL,             2002 },
+   { "GL_ARB_vertex_type_2_10_10_10_rev",          o(ARB_vertex_type_2_10_10_10_rev),          GL,             2009 },
+   { "GL_ARB_window_pos",                          o(ARB_window_pos),                          GL,             2001 },
+   /* EXT extensions */
+   { "GL_EXT_abgr",                                o(EXT_abgr),                                GL,             1995 },
+   { "GL_EXT_bgra",                                o(EXT_bgra),                                GL,             1995 },
+   { "GL_EXT_blend_color",                         o(EXT_blend_color),                         GL,             1995 },
+   { "GL_EXT_blend_equation_separate",             o(EXT_blend_equation_separate),             GL,             2003 },
+   { "GL_EXT_blend_func_separate",                 o(EXT_blend_func_separate),                 GL,             1999 },
+   { "GL_EXT_blend_logic_op",                      o(EXT_blend_logic_op),                      GL,             1995 },
+   { "GL_EXT_blend_minmax",                        o(EXT_blend_minmax),                        GL | ES1 | ES2, 1995 },
+   { "GL_EXT_blend_subtract",                      o(EXT_blend_subtract),                      GL,             1995 },
+   { "GL_EXT_clip_volume_hint",                    o(EXT_clip_volume_hint),                    GL,             1996 },
+   { "GL_EXT_compiled_vertex_array",               o(EXT_compiled_vertex_array),               GL,             1996 },
+   { "GL_EXT_copy_texture",                        o(EXT_copy_texture),                        GL,             1995 },
+   { "GL_EXT_depth_bounds_test",                   o(EXT_depth_bounds_test),                   GL,             2002 },
+   { "GL_EXT_draw_buffers2",                       o(EXT_draw_buffers2),                       GL,             2006 },
+   { "GL_EXT_draw_instanced",                      o(ARB_draw_instanced),                      GL,             2006 },
+   { "GL_EXT_draw_range_elements",                 o(EXT_draw_range_elements),                 GL,             1997 },
+   { "GL_EXT_fog_coord",                           o(EXT_fog_coord),                           GL,             1999 },
+   { "GL_EXT_framebuffer_blit",                    o(EXT_framebuffer_blit),                    GL,             2005 },
+   { "GL_EXT_framebuffer_multisample",             o(EXT_framebuffer_multisample),             GL,             2005 },
+   { "GL_EXT_framebuffer_object",                  o(EXT_framebuffer_object),                  GL,             2000 },
+   { "GL_EXT_framebuffer_sRGB",                    o(EXT_framebuffer_sRGB),                    GL,             1998 },
+   { "GL_EXT_gpu_program_parameters",              o(EXT_gpu_program_parameters),              GL,             2006 },
+   { "GL_EXT_gpu_shader4",                         o(EXT_gpu_shader4),                         GL,             2006 },
+   { "GL_EXT_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL | ES1 | ES2, 1999 },
+   { "GL_EXT_packed_depth_stencil",                o(EXT_packed_depth_stencil),                GL,             2005 },
+   { "GL_EXT_packed_float",                        o(EXT_packed_float),                        GL,             2004 },
+   { "GL_EXT_packed_pixels",                       o(EXT_packed_pixels),                       GL,             1997 },
+   { "GL_EXT_paletted_texture",                    o(EXT_paletted_texture),                    GL,             1995 },
+   { "GL_EXT_pixel_buffer_object",                 o(EXT_pixel_buffer_object),                 GL,             2004 },
+   { "GL_EXT_point_parameters",                    o(EXT_point_parameters),                    GL,             1997 },
+   { "GL_EXT_polygon_offset",                      o(EXT_polygon_offset),                      GL,             1995 },
+   { "GL_EXT_provoking_vertex",                    o(EXT_provoking_vertex),                    GL,             2009 },
+   { "GL_EXT_rescale_normal",                      o(EXT_rescale_normal),                      GL,             1997 },
+   { "GL_EXT_secondary_color",                     o(EXT_secondary_color),                     GL,             1999 },
+   { "GL_EXT_separate_shader_objects",             o(EXT_separate_shader_objects),             GL,             2008 },
+   { "GL_EXT_separate_specular_color",             o(EXT_separate_specular_color),             GL,             1997 },
+   { "GL_EXT_shadow_funcs",                        o(EXT_shadow_funcs),                        GL,             2002 },
+   { "GL_EXT_shared_texture_palette",              o(EXT_shared_texture_palette),              GL,             2000 },
+   { "GL_EXT_stencil_two_side",                    o(EXT_stencil_two_side),                    GL,             2001 },
+   { "GL_EXT_stencil_wrap",                        o(EXT_stencil_wrap),                        GL,             2002 },
+   { "GL_EXT_subtexture",                          o(EXT_subtexture),                          GL,             1995 },
+   { "GL_EXT_texture3D",                           o(EXT_texture3D),                           GL,             1996 },
+   { "GL_EXT_texture_array",                       o(EXT_texture_array),                       GL,             2006 },
+   { "GL_EXT_texture_compression_dxt1",            o(EXT_texture_compression_s3tc),            GL | ES1 | ES2, 2004 },
+   { "GL_EXT_texture_compression_latc",            o(EXT_texture_compression_latc),            GL,             2006 },
+   { "GL_EXT_texture_compression_rgtc",            o(ARB_texture_compression_rgtc),            GL,             2004 },
+   { "GL_EXT_texture_compression_s3tc",            o(EXT_texture_compression_s3tc),            GL,             2000 },
+   { "GL_EXT_texture_cube_map",                    o(ARB_texture_cube_map),                    GL,             2001 },
+   { "GL_EXT_texture_edge_clamp",                  o(SGIS_texture_edge_clamp),                 GL,             1997 },
+   { "GL_EXT_texture_env_add",                     o(EXT_texture_env_add),                     GL,             1999 },
+   { "GL_EXT_texture_env_combine",                 o(EXT_texture_env_combine),                 GL,             2006 },
+   { "GL_EXT_texture_env_dot3",                    o(EXT_texture_env_dot3),                    GL,             2000 },
+   { "GL_EXT_texture_filter_anisotropic",          o(EXT_texture_filter_anisotropic),          GL | ES1 | ES2, 1999 },
+   { "GL_EXT_texture_format_BGRA8888",             o(EXT_texture_format_BGRA8888),                  ES1 | ES2, 2009 },
+   { "GL_EXT_texture_integer",                     o(EXT_texture_integer),                     GL,             2006 },
+   { "GL_EXT_texture_lod_bias",                    o(EXT_texture_lod_bias),                    GL | ES1,       1999 },
+   { "GL_EXT_texture_mirror_clamp",                o(EXT_texture_mirror_clamp),                GL,             2004 },
+   { "GL_EXT_texture_object",                      o(EXT_texture_object),                      GL,             1995 },
+   { "GL_EXT_texture",                             o(EXT_texture),                             GL,             1996 },
+   { "GL_EXT_texture_rectangle",                   o(NV_texture_rectangle),                    GL,             2004 },
+   { "GL_EXT_texture_shared_exponent",             o(EXT_texture_shared_exponent),             GL,             2004 },
+   { "GL_EXT_texture_snorm",                       o(EXT_texture_snorm),                       GL,             2009 },
+   { "GL_EXT_texture_sRGB",                        o(EXT_texture_sRGB),                        GL,             2004 },
+   { "GL_EXT_texture_sRGB_decode",                 o(EXT_texture_sRGB_decode),                        GL,      2006 },
+   { "GL_EXT_texture_swizzle",                     o(EXT_texture_swizzle),                     GL,             2008 },
+   { "GL_EXT_texture_type_2_10_10_10_REV",         o(dummy_true),                                         ES2, 2008 },
+   { "GL_EXT_timer_query",                         o(EXT_timer_query),                         GL,             2006 },
+   { "GL_EXT_transform_feedback",                  o(EXT_transform_feedback),                  GL,             2011 },
+   { "GL_EXT_vertex_array_bgra",                   o(EXT_vertex_array_bgra),                   GL,             2008 },
+   { "GL_EXT_vertex_array",                        o(EXT_vertex_array),                        GL,             1995 },
+   { "GL_EXT_vertex_array_set",                    o(EXT_vertex_array_set),                    GL,             1997 },
+
+   /* OES extensions */
+   { "GL_OES_blend_equation_separate",             o(EXT_blend_equation_separate),                  ES1,       2009 },
+   { "GL_OES_blend_func_separate",                 o(EXT_blend_func_separate),                      ES1,       2009 },
+   { "GL_OES_blend_subtract",                      o(EXT_blend_subtract),                           ES1,       2009 },
+   { "GL_OES_byte_coordinates",                    o(dummy_true),                                   ES1,       2002 },
+   { "GL_OES_compressed_paletted_texture",         o(dummy_false),                     DISABLE,                2003 },
+   { "GL_OES_depth24",                             o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },
+   { "GL_OES_depth32",                             o(dummy_false),                     DISABLE,                2005 },
+   { "GL_OES_depth_texture",                       o(ARB_depth_texture),                                  ES2, 2006 },
+#if FEATURE_OES_draw_texture
+   { "GL_OES_draw_texture",                        o(OES_draw_texture),                             ES1 | ES2, 2004 },
+#endif
+#if FEATURE_OES_EGL_image
+   /*  FIXME: Mesa expects GL_OES_EGL_image to be available in OpenGL contexts. */
+   { "GL_OES_EGL_image",                           o(OES_EGL_image),                           GL | ES1 | ES2, 2006 },
+#endif
+   { "GL_OES_element_index_uint",                  o(EXT_vertex_array),                             ES1 | ES2, 2005 },
+   { "GL_OES_fbo_render_mipmap",                   o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },
+   { "GL_OES_fixed_point",                         o(dummy_true),                                   ES1,       2002 },
+   { "GL_OES_framebuffer_object",                  o(EXT_framebuffer_object),                       ES1,       2005 },
+   { "GL_OES_mapbuffer",                           o(ARB_vertex_buffer_object),                     ES1 | ES2, 2005 },
+   { "GL_OES_matrix_get",                          o(dummy_true),                                   ES1,       2004 },
+   { "GL_OES_packed_depth_stencil",                o(EXT_packed_depth_stencil),                     ES1 | ES2, 2007 },
+   { "GL_OES_point_size_array",                    o(dummy_true),                                   ES1,       2004 },
+   { "GL_OES_point_sprite",                        o(ARB_point_sprite),                             ES1,       2004 },
+   { "GL_OES_query_matrix",                        o(dummy_true),                                   ES1,       2003 },
+   { "GL_OES_read_format",                         o(OES_read_format),                         GL | ES1,       2003 },
+   { "GL_OES_rgb8_rgba8",                          o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },
+   { "GL_OES_single_precision",                    o(dummy_true),                                   ES1,       2003 },
+   { "GL_OES_standard_derivatives",                o(OES_standard_derivatives),                           ES2, 2005 },
+   { "GL_OES_stencil1",                            o(dummy_false),                     DISABLE,                2005 },
+   { "GL_OES_stencil4",                            o(dummy_false),                     DISABLE,                2005 },
+   { "GL_OES_stencil8",                            o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },
+   { "GL_OES_stencil_wrap",                        o(EXT_stencil_wrap),                             ES1,       2002 },
+   { "GL_OES_texture_3D",                          o(EXT_texture3D),                                      ES2, 2005 },
+   { "GL_OES_texture_cube_map",                    o(ARB_texture_cube_map),                         ES1,       2007 },
+   { "GL_OES_texture_env_crossbar",                o(ARB_texture_env_crossbar),                     ES1,       2005 },
+   { "GL_OES_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),                  ES1,       2005 },
+   { "GL_OES_texture_npot",                        o(ARB_texture_non_power_of_two),                       ES2, 2005 },
+
+   /* Vendor extensions */
+   { "GL_3DFX_texture_compression_FXT1",           o(TDFX_texture_compression_FXT1),           GL,             1999 },
+   { "GL_AMD_conservative_depth",                  o(AMD_conservative_depth),                  GL,             2009 },
+   { "GL_AMD_draw_buffers_blend",                  o(ARB_draw_buffers_blend),                  GL,             2009 },
+   { "GL_AMD_seamless_cubemap_per_texture",        o(AMD_seamless_cubemap_per_texture),        GL,             2009 },
+   { "GL_AMD_shader_stencil_export",               o(ARB_shader_stencil_export),               GL,             2009 },
+   { "GL_APPLE_client_storage",                    o(APPLE_client_storage),                    GL,             2002 },
+   { "GL_APPLE_object_purgeable",                  o(APPLE_object_purgeable),                  GL,             2006 },
+   { "GL_APPLE_packed_pixels",                     o(APPLE_packed_pixels),                     GL,             2002 },
+   { "GL_APPLE_vertex_array_object",               o(APPLE_vertex_array_object),               GL,             2002 },
+   { "GL_ATI_blend_equation_separate",             o(EXT_blend_equation_separate),             GL,             2003 },
+   { "GL_ATI_draw_buffers",                        o(ARB_draw_buffers),                        GL,             2002 },
+   { "GL_ATI_envmap_bumpmap",                      o(ATI_envmap_bumpmap),                      GL,             2001 },
+   { "GL_ATI_fragment_shader",                     o(ATI_fragment_shader),                     GL,             2001 },
+   { "GL_ATI_separate_stencil",                    o(ATI_separate_stencil),                    GL,             2006 },
+   { "GL_ATI_texture_compression_3dc",             o(ATI_texture_compression_3dc),             GL,             2004 },
+   { "GL_ATI_texture_env_combine3",                o(ATI_texture_env_combine3),                GL,             2002 },
+   { "GL_ATI_texture_float",                       o(ARB_texture_float),                       GL,             2002 },
+   { "GL_ATI_texture_mirror_once",                 o(ATI_texture_mirror_once),                 GL,             2006 },
+   { "GL_IBM_multimode_draw_arrays",               o(IBM_multimode_draw_arrays),               GL,             1998 },
+   { "GL_IBM_rasterpos_clip",                      o(IBM_rasterpos_clip),                      GL,             1996 },
+   { "GL_IBM_texture_mirrored_repeat",             o(ARB_texture_mirrored_repeat),             GL,             1998 },
+   { "GL_INGR_blend_func_separate",                o(EXT_blend_func_separate),                 GL,             1999 },
+   { "GL_MESA_pack_invert",                        o(MESA_pack_invert),                        GL,             2002 },
+   { "GL_MESA_resize_buffers",                     o(MESA_resize_buffers),                     GL,             1999 },
+   { "GL_MESA_texture_array",                      o(MESA_texture_array),                      GL,             2007 },
+   { "GL_MESA_texture_signed_rgba",                o(EXT_texture_snorm),                       GL,             2009 },
+   { "GL_MESA_window_pos",                         o(ARB_window_pos),                          GL,             2000 },
+   { "GL_MESA_ycbcr_texture",                      o(MESA_ycbcr_texture),                      GL,             2002 },
+   { "GL_NV_blend_square",                         o(NV_blend_square),                         GL,             1999 },
+   { "GL_NV_conditional_render",                   o(NV_conditional_render),                   GL,             2008 },
+   { "GL_NV_depth_clamp",                          o(ARB_depth_clamp),                         GL,             2001 },
+   { "GL_NV_fragment_program",                     o(NV_fragment_program),                     GL,             2001 },
+   { "GL_NV_fragment_program_option",              o(NV_fragment_program_option),              GL,             2005 },
+   { "GL_NV_light_max_exponent",                   o(NV_light_max_exponent),                   GL,             1999 },
+   { "GL_NV_packed_depth_stencil",                 o(EXT_packed_depth_stencil),                GL,             2000 },
+   { "GL_NV_point_sprite",                         o(NV_point_sprite),                         GL,             2001 },
+   { "GL_NV_primitive_restart",                    o(NV_primitive_restart),                    GL,             2002 },
+   { "GL_NV_texgen_reflection",                    o(NV_texgen_reflection),                    GL,             1999 },
+   { "GL_NV_texture_barrier",                      o(NV_texture_barrier),                      GL,             2009 },
+   { "GL_NV_texture_env_combine4",                 o(NV_texture_env_combine4),                 GL,             1999 },
+   { "GL_NV_texture_rectangle",                    o(NV_texture_rectangle),                    GL,             2000 },
+   { "GL_NV_vertex_program1_1",                    o(NV_vertex_program1_1),                    GL,             2001 },
+   { "GL_NV_vertex_program",                       o(NV_vertex_program),                       GL,             2000 },
+   { "GL_S3_s3tc",                                 o(S3_s3tc),                                 GL,             1999 },
+   { "GL_SGIS_generate_mipmap",                    o(SGIS_generate_mipmap),                    GL,             1997 },
+   { "GL_SGIS_texture_border_clamp",               o(ARB_texture_border_clamp),                GL,             1997 },
+   { "GL_SGIS_texture_edge_clamp",                 o(SGIS_texture_edge_clamp),                 GL,             1997 },
+   { "GL_SGIS_texture_lod",                        o(SGIS_texture_lod),                        GL,             1997 },
+   { "GL_SUN_multi_draw_arrays",                   o(EXT_multi_draw_arrays),                   GL,             1999 },
+
+   { 0, 0, 0, 0 },
+};
+
+
+/**
+ * Given an extension name, lookup up the corresponding member of struct
+ * gl_extensions and return that member's offset (in bytes).  If the name is
+ * not found in the \c extension_table, return 0.
+ *
+ * \param name Name of extension.
+ * \return Offset of member in struct gl_extensions.
+ */
+static size_t
+name_to_offset(const char* name)
+{
+   const struct extension *i;
+
+   if (name == 0)
+      return 0;
+
+   for (i = extension_table; i->name != 0; ++i) {
+      if (strcmp(name, i->name) == 0)
+	 return i->offset;
+   }
+
+   return 0;
+}
+
+
+/**
+ * \brief Extensions enabled by default.
+ *
+ * These extensions are enabled by _mesa_init_extensions().
+ *
+ * XXX: Should these defaults also apply to GLES?
+ */
+static const size_t default_extensions[] = {
+   o(ARB_copy_buffer),
+   o(ARB_draw_buffers),
+   o(ARB_multisample),
+   o(ARB_texture_compression),
+   o(ARB_transpose_matrix),
+   o(ARB_vertex_buffer_object),
+   o(ARB_window_pos),
+
+   o(EXT_abgr),
+   o(EXT_bgra),
+   o(EXT_compiled_vertex_array),
+   o(EXT_copy_texture),
+   o(EXT_draw_range_elements),
+   o(EXT_multi_draw_arrays),
+   o(EXT_packed_pixels),
+   o(EXT_polygon_offset),
+   o(EXT_rescale_normal),
+   o(EXT_separate_specular_color),
+   o(EXT_subtexture),
+   o(EXT_texture),
+   o(EXT_texture3D),
+   o(EXT_texture_object),
+   o(EXT_vertex_array),
+
+   o(OES_read_format),
+   o(OES_standard_derivatives),
+
+   /* Vendor Extensions */
+   o(APPLE_packed_pixels),
+   o(IBM_multimode_draw_arrays),
+   o(IBM_rasterpos_clip),
+   o(NV_light_max_exponent),
+   o(NV_texgen_reflection),
+   o(SGIS_generate_mipmap),
+   o(SGIS_texture_edge_clamp),
+   o(SGIS_texture_lod),
+
+   0,
+};
+
+
+/**
+ * Enable all extensions suitable for a software-only renderer.
+ * This is a convenience function used by the XMesa, OSMesa, GGI drivers, etc.
+ */
+void
+_mesa_enable_sw_extensions(struct gl_context *ctx)
+{
+   /*ctx->Extensions.ARB_copy_buffer = GL_TRUE;*/
+   ctx->Extensions.ARB_depth_clamp = GL_TRUE;
+   ctx->Extensions.ARB_depth_texture = GL_TRUE;
+   /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/
+   ctx->Extensions.ARB_draw_elements_base_vertex = GL_TRUE;
+   ctx->Extensions.ARB_draw_instanced = GL_TRUE;
+   ctx->Extensions.ARB_explicit_attrib_location = GL_TRUE;
+   ctx->Extensions.ARB_fragment_coord_conventions = GL_TRUE;
+#if FEATURE_ARB_fragment_program
+   ctx->Extensions.ARB_fragment_program = GL_TRUE;
+   ctx->Extensions.ARB_fragment_program_shadow = GL_TRUE;
+#endif
+#if FEATURE_ARB_fragment_shader
+   ctx->Extensions.ARB_fragment_shader = GL_TRUE;
+#endif
+#if FEATURE_ARB_framebuffer_object
+   ctx->Extensions.ARB_framebuffer_object = GL_TRUE;
+#endif
+#if FEATURE_ARB_geometry_shader4 && 0
+   /* XXX re-enable when GLSL compiler again supports geometry shaders */
+   ctx->Extensions.ARB_geometry_shader4 = GL_TRUE;
+#endif
+   ctx->Extensions.ARB_half_float_pixel = GL_TRUE;
+   ctx->Extensions.ARB_half_float_vertex = GL_TRUE;
+   ctx->Extensions.ARB_map_buffer_range = GL_TRUE;
+   ctx->Extensions.ARB_multitexture = GL_TRUE;
+#if FEATURE_queryobj
+   ctx->Extensions.ARB_occlusion_query = GL_TRUE;
+   ctx->Extensions.ARB_occlusion_query2 = GL_TRUE;
+#endif
+   ctx->Extensions.ARB_point_sprite = GL_TRUE;
+#if FEATURE_ARB_shader_objects
+   ctx->Extensions.ARB_shader_objects = GL_TRUE;
+   ctx->Extensions.EXT_separate_shader_objects = GL_TRUE;
+#endif
+#if FEATURE_ARB_shading_language_100
+   ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
+#endif
+   ctx->Extensions.ARB_shadow = GL_TRUE;
+   ctx->Extensions.ARB_shadow_ambient = GL_TRUE;
+   ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
+   ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
+   /*ctx->Extensions.ARB_texture_float = GL_TRUE;*/
+   ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;
+   ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
+   ctx->Extensions.ARB_texture_rg = GL_TRUE;
+   ctx->Extensions.ARB_texture_compression_rgtc = GL_TRUE;
+   ctx->Extensions.ARB_vertex_array_object = GL_TRUE;
+#if FEATURE_ARB_vertex_program
+   ctx->Extensions.ARB_vertex_program = GL_TRUE;
+#endif
+#if FEATURE_ARB_vertex_shader
+   ctx->Extensions.ARB_vertex_shader = GL_TRUE;
+#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;
+#if FEATURE_APPLE_object_purgeable
+   ctx->Extensions.APPLE_object_purgeable = GL_TRUE;
+#endif
+   ctx->Extensions.ATI_envmap_bumpmap = GL_TRUE;
+#if FEATURE_ATI_fragment_shader
+   ctx->Extensions.ATI_fragment_shader = GL_TRUE;
+#endif
+   ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE;
+   ctx->Extensions.ATI_texture_env_combine3 = GL_TRUE;
+   ctx->Extensions.ATI_texture_mirror_once = GL_TRUE;
+   ctx->Extensions.ATI_separate_stencil = GL_TRUE;
+   ctx->Extensions.EXT_blend_color = GL_TRUE;
+   ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
+   ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
+   ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
+   ctx->Extensions.EXT_blend_minmax = GL_TRUE;
+   ctx->Extensions.EXT_blend_subtract = GL_TRUE;
+   ctx->Extensions.EXT_depth_bounds_test = GL_TRUE;
+   ctx->Extensions.EXT_draw_buffers2 = GL_TRUE;
+   ctx->Extensions.EXT_fog_coord = GL_TRUE;
+#if FEATURE_EXT_framebuffer_object
+   ctx->Extensions.EXT_framebuffer_object = GL_TRUE;
+#endif
+#if FEATURE_EXT_framebuffer_blit
+   ctx->Extensions.EXT_framebuffer_blit = GL_TRUE;
+#endif
+#if FEATURE_ARB_framebuffer_object
+   ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;
+#endif
+   /*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/
+   ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE;
+   ctx->Extensions.EXT_paletted_texture = GL_TRUE;
+#if FEATURE_EXT_pixel_buffer_object
+   ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
+#endif
+   ctx->Extensions.EXT_point_parameters = GL_TRUE;
+   ctx->Extensions.EXT_provoking_vertex = GL_TRUE;
+   ctx->Extensions.EXT_shadow_funcs = GL_TRUE;
+   ctx->Extensions.EXT_secondary_color = GL_TRUE;
+   ctx->Extensions.EXT_shared_texture_palette = GL_TRUE;
+   ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
+   ctx->Extensions.EXT_stencil_two_side = GL_TRUE;
+   ctx->Extensions.EXT_texture_array = GL_TRUE;
+   ctx->Extensions.EXT_texture_compression_latc = GL_TRUE;
+   ctx->Extensions.EXT_texture_env_add = GL_TRUE;
+   ctx->Extensions.EXT_texture_env_combine = GL_TRUE;
+   ctx->Extensions.EXT_texture_env_dot3 = GL_TRUE;
+   ctx->Extensions.EXT_texture_filter_anisotropic = GL_TRUE;
+   ctx->Extensions.EXT_texture_mirror_clamp = GL_TRUE;
+   ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;
+   ctx->Extensions.EXT_texture_shared_exponent = GL_TRUE;
+#if FEATURE_EXT_texture_sRGB
+   ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
+   ctx->Extensions.EXT_texture_sRGB_decode = GL_TRUE;
+#endif
+   ctx->Extensions.EXT_texture_swizzle = GL_TRUE;
+#if FEATURE_EXT_transform_feedback
+   /*ctx->Extensions.EXT_transform_feedback = GL_TRUE;*/
+#endif
+   ctx->Extensions.EXT_vertex_array_bgra = GL_TRUE;
+   /*ctx->Extensions.IBM_multimode_draw_arrays = GL_TRUE;*/
+   ctx->Extensions.MESA_pack_invert = GL_TRUE;
+   ctx->Extensions.MESA_resize_buffers = GL_TRUE;
+   ctx->Extensions.MESA_texture_array = GL_TRUE;
+   ctx->Extensions.MESA_ycbcr_texture = GL_TRUE;
+   ctx->Extensions.NV_blend_square = GL_TRUE;
+   ctx->Extensions.NV_conditional_render = GL_TRUE;
+   /*ctx->Extensions.NV_light_max_exponent = GL_TRUE;*/
+   ctx->Extensions.NV_point_sprite = GL_TRUE;
+   ctx->Extensions.NV_texture_env_combine4 = GL_TRUE;
+   ctx->Extensions.NV_texture_rectangle = GL_TRUE;
+   /*ctx->Extensions.NV_texgen_reflection = GL_TRUE;*/
+#if FEATURE_NV_vertex_program
+   ctx->Extensions.NV_vertex_program = GL_TRUE;
+   ctx->Extensions.NV_vertex_program1_1 = GL_TRUE;
+#endif
+#if FEATURE_NV_fragment_program
+   ctx->Extensions.NV_fragment_program = GL_TRUE;
+#endif
+#if FEATURE_NV_fragment_program && FEATURE_ARB_fragment_program
+   ctx->Extensions.NV_fragment_program_option = GL_TRUE;
+#endif
+   /*ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;*/
+   ctx->Extensions.SGIS_texture_edge_clamp = GL_TRUE;
+#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
+   ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;
+#endif
+#if FEATURE_texture_fxt1
+   _mesa_enable_extension(ctx, "GL_3DFX_texture_compression_FXT1");
+#endif
+#if FEATURE_texture_s3tc
+   if (ctx->Mesa_DXTn) {
+      _mesa_enable_extension(ctx, "GL_EXT_texture_compression_s3tc");
+      _mesa_enable_extension(ctx, "GL_S3_s3tc");
+   }
+#endif
+}
+
+
+/**
+ * Enable common EXT extensions in the ARB_imaging subset.
+ */
+void
+_mesa_enable_imaging_extensions(struct gl_context *ctx)
+{
+   ctx->Extensions.EXT_blend_color = GL_TRUE;
+   ctx->Extensions.EXT_blend_logic_op = GL_TRUE;
+   ctx->Extensions.EXT_blend_minmax = GL_TRUE;
+   ctx->Extensions.EXT_blend_subtract = GL_TRUE;
+}
+
+
+
+/**
+ * Enable all OpenGL 1.3 features and extensions.
+ * A convenience function to be called by drivers.
+ */
+void
+_mesa_enable_1_3_extensions(struct gl_context *ctx)
+{
+   /*ctx->Extensions.ARB_multisample = GL_TRUE;*/
+   ctx->Extensions.ARB_multitexture = GL_TRUE;
+   ctx->Extensions.ARB_texture_border_clamp = GL_TRUE;
+   /*ctx->Extensions.ARB_texture_compression = GL_TRUE;*/
+   ctx->Extensions.ARB_texture_cube_map = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_combine = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_dot3 = GL_TRUE;
+   ctx->Extensions.EXT_texture_env_add = GL_TRUE;
+   /*ctx->Extensions.ARB_transpose_matrix = GL_TRUE;*/
+}
+
+
+
+/**
+ * Enable all OpenGL 1.4 features and extensions.
+ * A convenience function to be called by drivers.
+ */
+void
+_mesa_enable_1_4_extensions(struct gl_context *ctx)
+{
+   ctx->Extensions.ARB_depth_texture = GL_TRUE;
+   ctx->Extensions.ARB_shadow = GL_TRUE;
+   ctx->Extensions.ARB_texture_env_crossbar = GL_TRUE;
+   ctx->Extensions.ARB_texture_mirrored_repeat = GL_TRUE;
+   ctx->Extensions.ARB_window_pos = GL_TRUE;
+   ctx->Extensions.EXT_blend_color = GL_TRUE;
+   ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
+   ctx->Extensions.EXT_blend_minmax = GL_TRUE;
+   ctx->Extensions.EXT_blend_subtract = GL_TRUE;
+   ctx->Extensions.EXT_fog_coord = GL_TRUE;
+   /*ctx->Extensions.EXT_multi_draw_arrays = GL_TRUE;*/
+   ctx->Extensions.EXT_point_parameters = GL_TRUE;
+   ctx->Extensions.EXT_secondary_color = GL_TRUE;
+   ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
+   ctx->Extensions.EXT_texture_lod_bias = GL_TRUE;
+   /*ctx->Extensions.SGIS_generate_mipmap = GL_TRUE;*/
+}
+
+
+/**
+ * Enable all OpenGL 1.5 features and extensions.
+ * A convenience function to be called by drivers.
+ */
+void
+_mesa_enable_1_5_extensions(struct gl_context *ctx)
+{
+   ctx->Extensions.ARB_occlusion_query = GL_TRUE;
+   /*ctx->Extensions.ARB_vertex_buffer_object = GL_TRUE;*/
+   ctx->Extensions.EXT_shadow_funcs = GL_TRUE;
+}
+
+
+/**
+ * Enable all OpenGL 2.0 features and extensions.
+ * A convenience function to be called by drivers.
+ */
+void
+_mesa_enable_2_0_extensions(struct gl_context *ctx)
+{
+   /*ctx->Extensions.ARB_draw_buffers = GL_TRUE;*/
+#if FEATURE_ARB_fragment_shader
+   ctx->Extensions.ARB_fragment_shader = GL_TRUE;
+#endif
+   ctx->Extensions.ARB_point_sprite = GL_TRUE;
+   ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
+   ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE;
+#if FEATURE_ARB_shader_objects
+   ctx->Extensions.ARB_shader_objects = GL_TRUE;
+#endif
+#if FEATURE_ARB_shading_language_100
+   ctx->Extensions.ARB_shading_language_100 = GL_TRUE;
+#endif
+   ctx->Extensions.EXT_stencil_two_side = GL_TRUE;
+#if FEATURE_ARB_vertex_shader
+   ctx->Extensions.ARB_vertex_shader = GL_TRUE;
+#endif
+}
+
+
+/**
+ * Enable all OpenGL 2.1 features and extensions.
+ * A convenience function to be called by drivers.
+ */
+void
+_mesa_enable_2_1_extensions(struct gl_context *ctx)
+{
+#if FEATURE_EXT_pixel_buffer_object
+   ctx->Extensions.EXT_pixel_buffer_object = GL_TRUE;
+#endif
+#if FEATURE_EXT_texture_sRGB
+   ctx->Extensions.EXT_texture_sRGB = GL_TRUE;
+#endif
+}
+
+
+/**
+ * Either enable or disable the named extension.
+ * \return GL_TRUE for success, GL_FALSE if invalid extension name
+ */
+static GLboolean
+set_extension( struct gl_context *ctx, const char *name, GLboolean state )
+{
+   size_t offset;
+
+   if (ctx->Extensions.String) {
+      /* The string was already queried - can't change it now! */
+      _mesa_problem(ctx, "Trying to enable/disable extension after glGetString(GL_EXTENSIONS): %s", name);
+      return GL_FALSE;
+   }
+
+   offset = name_to_offset(name);
+   if (offset == 0) {
+      _mesa_problem(ctx, "Trying to enable/disable unknown extension %s",
+	            name);
+      return GL_FALSE;
+   } else if (offset == o(dummy_true) && state == GL_FALSE) {
+      _mesa_problem(ctx, "Trying to disable a permanently enabled extension: "
+	                  "%s", name);
+      return GL_FALSE;
+   } else {
+      GLboolean *base = (GLboolean *) &ctx->Extensions;
+      base[offset] = state;
+      return GL_TRUE;
+   }
+}
+
+
+/**
+ * Enable the named extension.
+ * Typically called by drivers.
+ */
+void
+_mesa_enable_extension( struct gl_context *ctx, const char *name )
+{
+   if (!set_extension(ctx, name, GL_TRUE))
+      _mesa_problem(ctx, "Trying to enable unknown extension: %s", name);
+}
+
+
+/**
+ * Disable the named extension.
+ * XXX is this really needed???
+ */
+void
+_mesa_disable_extension( struct gl_context *ctx, const char *name )
+{
+   if (!set_extension(ctx, name, GL_FALSE))
+      _mesa_problem(ctx, "Trying to disable unknown extension: %s", name);
+}
+
+
+/**
+ * Test if the named extension is enabled in this context.
+ */
+GLboolean
+_mesa_extension_is_enabled( struct gl_context *ctx, const char *name )
+{
+   size_t offset;
+   GLboolean *base;
+
+   if (name == 0)
+      return GL_FALSE;
+
+   offset = name_to_offset(name);
+   if (offset == 0)
+      return GL_FALSE;
+   base = (GLboolean *) &ctx->Extensions;
+   return base[offset];
+}
+
+
+/**
+ * \brief Apply the \c MESA_EXTENSION_OVERRIDE environment variable.
+ *
+ * \c MESA_EXTENSION_OVERRIDE is a space-separated list of extensions to
+ * enable or disable. The list is processed thus:
+ *    - Enable recognized extension names that are prefixed with '+'.
+ *    - Disable recognized extension names that are prefixed with '-'.
+ *    - Enable recognized extension names that are not prefixed.
+ *    - Collect unrecognized extension names in a new string.
+ *
+ * \return Space-separated list of unrecognized extension names (which must
+ *    be freed). Does not return \c NULL.
+ */
+static char *
+get_extension_override( struct gl_context *ctx )
+{
+   const char *env_const = _mesa_getenv("MESA_EXTENSION_OVERRIDE");
+   char *env;
+   char *ext;
+   char *extra_exts;
+   int len;
+
+   if (env_const == NULL) {
+      /* Return the empty string rather than NULL. This simplifies the logic
+       * of client functions. */
+      return calloc(1, sizeof(char));
+   }
+
+   /* extra_exts: List of unrecognized extensions. */
+   extra_exts = calloc(strlen(env_const), sizeof(char));
+
+   /* Copy env_const because strtok() is destructive. */
+   env = strdup(env_const);
+   for (ext = strtok(env, " "); ext != NULL; ext = strtok(NULL, " ")) {
+      int enable;
+      int recognized;
+      switch (ext[0]) {
+      case '+':
+         enable = 1;
+         ++ext;
+         break;
+      case '-':
+         enable = 0;
+         ++ext;
+         break;
+      default:
+         enable = 1;
+         break;
+      }
+      recognized = set_extension(ctx, ext, enable);
+      if (!recognized) {
+         strcat(extra_exts, ext);
+         strcat(extra_exts, " ");
+      }
+   }
+
+   /* Remove trailing space. */
+   len = strlen(extra_exts);
+   if (extra_exts[len - 1] == ' ')
+      extra_exts[len - 1] = '\0';
+
+   return extra_exts;
+}
+
+
+/**
+ * \brief Initialize extension tables and enable default extensions.
+ *
+ * This should be called during context initialization.
+ * Note: Sets gl_extensions.dummy_true to true.
+ */
+void
+_mesa_init_extensions( struct gl_context *ctx )
+{
+   GLboolean *base = (GLboolean *) &ctx->Extensions;
+   GLboolean *sentinel = base + o(extension_sentinel);
+   GLboolean *i;
+   const size_t *j;
+
+   /* First, turn all extensions off. */
+   for (i = base; i != sentinel; ++i)
+      *i = GL_FALSE;
+
+   /* Then, selectively turn default extensions on. */
+   ctx->Extensions.dummy_true = GL_TRUE;
+   for (j = default_extensions; *j != 0; ++j)
+      base[*j] = GL_TRUE;
+}
+
+
+typedef unsigned short extension_index;
+
+
+/**
+ * Compare two entries of the extensions table.  Sorts first by year,
+ * then by name.
+ *
+ * Arguments are indices into extension_table.
+ */
+static int
+extension_compare(const void *p1, const void *p2)
+{
+   extension_index i1 = * (const extension_index *) p1;
+   extension_index i2 = * (const extension_index *) p2;
+   const struct extension *e1 = &extension_table[i1];
+   const struct extension *e2 = &extension_table[i2];
+   int res;
+
+   res = (int)e1->year - (int)e2->year;
+
+   if (res == 0) {
+      res = strcmp(e1->name, e2->name);
+   }
+
+   return res;
+}
+
+
+/**
+ * Construct the GL_EXTENSIONS string.  Called the first time that
+ * glGetString(GL_EXTENSIONS) is called.
+ */
+GLubyte*
+_mesa_make_extension_string(struct gl_context *ctx)
+{
+   /* The extension string. */
+   char *exts = 0;
+   /* Length of extension string. */
+   size_t length = 0;
+   /* Number of extensions */
+   unsigned count;
+   /* Indices of the extensions sorted by year */
+   extension_index *extension_indices;
+   /* String of extra extensions. */
+   char *extra_extensions = get_extension_override(ctx);
+   GLboolean *base = (GLboolean *) &ctx->Extensions;
+   const struct extension *i;
+   unsigned j;
+   unsigned maxYear = ~0;
+
+   /* Check if the MESA_EXTENSION_MAX_YEAR env var is set */
+   {
+      const char *env = getenv("MESA_EXTENSION_MAX_YEAR");
+      if (env) {
+         maxYear = atoi(env);
+         _mesa_debug(ctx, "Note: limiting GL extensions to %u or earlier\n",
+                     maxYear);
+      }
+   }
+
+   /* Compute length of the extension string. */
+   count = 0;
+   for (i = extension_table; i->name != 0; ++i) {
+      if (base[i->offset] &&
+          i->year <= maxYear &&
+          (i->api_set & (1 << ctx->API))) {
+	 length += strlen(i->name) + 1; /* +1 for space */
+	 ++count;
+      }
+   }
+   if (extra_extensions != NULL)
+      length += 1 + strlen(extra_extensions); /* +1 for space */
+
+   exts = (char *) calloc(length + 1, sizeof(char));
+   if (exts == NULL) {
+      free(extra_extensions);
+      return NULL;
+   }
+
+   extension_indices = malloc(count * sizeof(extension_index));
+   if (extension_indices == NULL) {
+      free(exts);
+      free(extra_extensions);
+      return NULL;
+   }
+
+   /* Sort extensions in chronological order because certain old applications (e.g.,
+    * Quake3 demo) store the extension list in a static size buffer so chronologically
+    * order ensure that the extensions that such applications expect will fit into
+    * that buffer.
+    */
+   j = 0;
+   for (i = extension_table; i->name != 0; ++i) {
+      if (base[i->offset] &&
+          i->year <= maxYear &&
+          (i->api_set & (1 << ctx->API))) {
+         extension_indices[j++] = i - extension_table;
+      }
+   }
+   assert(j == count);
+   qsort(extension_indices, count, sizeof *extension_indices, extension_compare);
+
+   /* Build the extension string.*/
+   for (j = 0; j < count; ++j) {
+      i = &extension_table[extension_indices[j]];
+      assert(base[i->offset] && (i->api_set & (1 << ctx->API)));
+      strcat(exts, i->name);
+      strcat(exts, " ");
+   }
+   free(extension_indices);
+   if (extra_extensions != 0) {
+      strcat(exts, extra_extensions);
+      free(extra_extensions);
+   }
+
+   return (GLubyte *) exts;
+}
+
+/**
+ * Return number of enabled extensions.
+ */
+GLuint
+_mesa_get_extension_count(struct gl_context *ctx)
+{
+   GLboolean *base;
+   const struct extension *i;
+
+   /* only count once */
+   if (ctx->Extensions.Count != 0)
+      return ctx->Extensions.Count;
+
+   base = (GLboolean *) &ctx->Extensions;
+   for (i = extension_table; i->name != 0; ++i) {
+      if (base[i->offset]) {
+	 ctx->Extensions.Count++;
+      }
+   }
+   return ctx->Extensions.Count;
+}
+
+/**
+ * Return name of i-th enabled extension
+ */
+const GLubyte *
+_mesa_get_enabled_extension(struct gl_context *ctx, GLuint index)
+{
+   const GLboolean *base;
+   size_t n;
+   const struct extension *i;
+
+   if (index < 0)
+      return NULL;
+
+   base = (GLboolean*) &ctx->Extensions;
+   n = 0;
+   for (i = extension_table; i->name != 0; ++i) {
+      if (n == index && base[i->offset]) {
+	 return (GLubyte*) i->name;
+      } else if (base[i->offset]) {
+	 ++n;
+      }
+   }
+
+   return NULL;
+}
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index 82eb7fb71..0b48fc7ea 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -1984,10 +1984,26 @@ _mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   if ((texture != 0) && (textarget != GL_TEXTURE_1D)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glFramebufferTexture1DEXT(textarget)");
-      return;
+   if (texture != 0) {
+      GLboolean error;
+
+      switch (textarget) {
+      case GL_TEXTURE_1D:
+         error = GL_FALSE;
+         break;
+      case GL_TEXTURE_1D_ARRAY:
+         error = !ctx->Extensions.EXT_texture_array;
+         break;
+      default:
+         error = GL_TRUE;
+      }
+
+      if (error) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glFramebufferTexture1DEXT(textarget=%s)",
+                     _mesa_lookup_enum_by_nr(textarget));
+         return;
+      }
    }
 
    framebuffer_texture(ctx, "1D", target, attachment, textarget, texture,
@@ -2001,13 +2017,37 @@ _mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
 {
    GET_CURRENT_CONTEXT(ctx);
 
-   if ((texture != 0) &&
-       (textarget != GL_TEXTURE_2D) &&
-       (textarget != GL_TEXTURE_RECTANGLE_ARB) &&
-       (!is_cube_face(textarget))) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glFramebufferTexture2DEXT(textarget=0x%x)", textarget);
-      return;
+   if (texture != 0) {
+      GLboolean error;
+
+      switch (textarget) {
+      case GL_TEXTURE_2D:
+         error = GL_FALSE;
+         break;
+      case GL_TEXTURE_RECTANGLE:
+         error = !ctx->Extensions.NV_texture_rectangle;
+         break;
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:
+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:
+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
+         error = !ctx->Extensions.ARB_texture_cube_map;
+         break;
+      case GL_TEXTURE_2D_ARRAY:
+         error = !ctx->Extensions.EXT_texture_array;
+         break;
+      default:
+         error = GL_FALSE;
+      }
+
+      if (error) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glFramebufferTexture2DEXT(textarget=%s)",
+                     _mesa_lookup_enum_by_nr(textarget));
+         return;
+      }
    }
 
    framebuffer_texture(ctx, "2D", target, attachment, textarget, texture,
@@ -2023,7 +2063,7 @@ _mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
    GET_CURRENT_CONTEXT(ctx);
 
    if ((texture != 0) && (textarget != GL_TEXTURE_3D)) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
+      _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glFramebufferTexture3DEXT(textarget)");
       return;
    }
@@ -2346,6 +2386,8 @@ void GLAPIENTRY
 _mesa_GenerateMipmapEXT(GLenum target)
 {
    struct gl_texture_object *texObj;
+   GLboolean error;
+
    GET_CURRENT_CONTEXT(ctx);
 
    ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -2355,12 +2397,22 @@ _mesa_GenerateMipmapEXT(GLenum target)
    case GL_TEXTURE_1D:
    case GL_TEXTURE_2D:
    case GL_TEXTURE_3D:
+      error = GL_FALSE;
+      break;
    case GL_TEXTURE_CUBE_MAP:
-      /* OK, legal value */
+      error = !ctx->Extensions.ARB_texture_cube_map;
+      break;
+   case GL_TEXTURE_1D_ARRAY:
+   case GL_TEXTURE_2D_ARRAY:
+      error = !ctx->Extensions.EXT_texture_array;
       break;
    default:
-      /* XXX need to implement GL_TEXTURE_1D_ARRAY and GL_TEXTURE_2D_ARRAY */
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGenerateMipmapEXT(target)");
+      error = GL_TRUE;
+   }
+
+   if (error) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGenerateMipmapEXT(target=%s)",
+                  _mesa_lookup_enum_by_nr(target));
       return;
    }
 
diff --git a/mesalib/src/mesa/main/imports.c b/mesalib/src/mesa/main/imports.c
index 0a572ec22..8f0971959 100644
--- a/mesalib/src/mesa/main/imports.c
+++ b/mesalib/src/mesa/main/imports.c
@@ -753,7 +753,8 @@ _mesa_strdup( const char *s )
 float
 _mesa_strtof( const char *s, char **end )
 {
-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
+#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
+    !defined(ANDROID)
    static locale_t loc = NULL;
    if (!loc) {
       loc = newlocale(LC_CTYPE_MASK, "C", NULL);
diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h
index 3fa1db02a..70defdc43 100644
--- a/mesalib/src/mesa/main/imports.h
+++ b/mesalib/src/mesa/main/imports.h
@@ -134,7 +134,13 @@ typedef union { GLfloat f; GLint i; } fi_type;
 #define exp2f(f) ((float) exp2(f))
 #define floorf(f) ((float) floor(f))
 #define logf(f) ((float) log(f))
+
+#ifdef ANDROID
+#define log2f(f) (logf(f) * (float) (1.0 / M_LN2))
+#else
 #define log2f(f) ((float) log2(f))
+#endif
+
 #define powf(x,y) ((float) pow(x,y))
 #define sinf(f) ((float) sin(f))
 #define sinhf(f) ((float) sinh(f))
@@ -562,7 +568,7 @@ _mesa_init_sqrt_table(void);
 
 #ifdef __GNUC__
 
-#ifdef __MINGW32__
+#if defined(__MINGW32__) || defined(ANDROID)
 #define ffs __builtin_ffs
 #define ffsll __builtin_ffsll
 #endif
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index 2d5f44c1e..f2eb889fe 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -1279,6 +1279,9 @@ struct gl_texture_image
    GLboolean _IsPowerOfTwo;	/**< Are all dimensions powers of two? */
 
    struct gl_texture_object *TexObject;  /**< Pointer back to parent object */
+   GLuint Level;                /**< Which mipmap level am I? */
+   /** Cube map face: index into gl_texture_object::Image[] array */
+   GLuint Face;
 
    FetchTexelFuncC FetchTexelc;	/**< GLchan texel fetch function pointer */
    FetchTexelFuncF FetchTexelf;	/**< Float texel fetch function pointer */
@@ -2717,6 +2720,12 @@ struct gl_constants
 
    GLuint GLSLVersion;  /**< GLSL version supported (ex: 120 = 1.20) */
 
+   /**
+    * Does the driver support real 32-bit integers?  (Otherwise, integers are
+    * simulated via floats.)
+    */
+   GLboolean NativeIntegers;
+
    /** Which texture units support GL_ATI_envmap_bumpmap as targets */
    GLbitfield SupportedBumpUnits;
 
diff --git a/mesalib/src/mesa/main/pbo.c b/mesalib/src/mesa/main/pbo.c
index 15e0480e9..4e7e6f925 100644
--- a/mesalib/src/mesa/main/pbo.c
+++ b/mesalib/src/mesa/main/pbo.c
@@ -128,9 +128,10 @@ _mesa_map_pbo_source(struct gl_context *ctx,
 
    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);
+      buf = (GLubyte *) ctx->Driver.MapBufferRange(ctx, 0,
+						   unpack->BufferObj->Size,
+						   GL_MAP_READ_BIT,
+						   unpack->BufferObj);
       if (!buf)
          return NULL;
 
@@ -201,8 +202,7 @@ _mesa_unmap_pbo_source(struct gl_context *ctx,
 {
    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);
+      ctx->Driver.UnmapBuffer(ctx, unpack->BufferObj);
    }
 }
 
@@ -224,9 +224,10 @@ _mesa_map_pbo_dest(struct gl_context *ctx,
 
    if (_mesa_is_bufferobj(pack->BufferObj)) {
       /* pack into PBO */
-      buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                                              GL_WRITE_ONLY_ARB,
-                                              pack->BufferObj);
+      buf = (GLubyte *) ctx->Driver.MapBufferRange(ctx, 0,
+						   pack->BufferObj->Size,
+						   GL_MAP_WRITE_BIT,
+						   pack->BufferObj);
       if (!buf)
          return NULL;
 
@@ -297,7 +298,7 @@ _mesa_unmap_pbo_dest(struct gl_context *ctx,
 {
    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);
+      ctx->Driver.UnmapBuffer(ctx, pack->BufferObj);
    }
 }
 
@@ -327,8 +328,9 @@ _mesa_validate_pbo_teximage(struct gl_context *ctx, GLuint dimensions,
       return NULL;
    }
 
-   buf = (GLubyte *) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                          GL_READ_ONLY_ARB, unpack->BufferObj);
+   buf = (GLubyte *) ctx->Driver.MapBufferRange(ctx, 0, unpack->BufferObj->Size,
+						GL_MAP_READ_BIT,
+						unpack->BufferObj);
    if (!buf) {
       _mesa_error(ctx, GL_INVALID_OPERATION, funcName, "(PBO is mapped)");
       return NULL;
@@ -364,8 +366,10 @@ _mesa_validate_pbo_compressed_teximage(struct gl_context *ctx,
       return NULL;
    }
 
-   buf = (GLubyte*) ctx->Driver.MapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                                         GL_READ_ONLY_ARB, packing->BufferObj);
+   buf = (GLubyte*) ctx->Driver.MapBufferRange(ctx, 0,
+					       packing->BufferObj->Size,
+					       GL_MAP_READ_BIT,
+					       packing->BufferObj);
    if (!buf) {
       _mesa_error(ctx, GL_INVALID_OPERATION, funcName, "(PBO is mapped");
       return NULL;
@@ -384,8 +388,7 @@ _mesa_unmap_teximage_pbo(struct gl_context *ctx,
                          const struct gl_pixelstore_attrib *unpack)
 {
    if (_mesa_is_bufferobj(unpack->BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_UNPACK_BUFFER_EXT,
-                              unpack->BufferObj);
+      ctx->Driver.UnmapBuffer(ctx, unpack->BufferObj);
    }
 }
 
diff --git a/mesalib/src/mesa/main/querymatrix.c b/mesalib/src/mesa/main/querymatrix.c
index aade8a614..eaedf7cd2 100644
--- a/mesalib/src/mesa/main/querymatrix.c
+++ b/mesalib/src/mesa/main/querymatrix.c
@@ -1,212 +1,212 @@
-/**************************************************************************

- *

- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.

- * All Rights Reserved.

- *

- **************************************************************************/

-

-

-/**

- * Code to implement GL_OES_query_matrix.  See the spec at:

- * http://www.khronos.org/registry/gles/extensions/OES/OES_query_matrix.txt

- */

-

-

-#include <stdlib.h>

-#include <math.h>

-#include "GLES/gl.h"

-#include "GLES/glext.h"

-

-

-/**

- * This is from the GL_OES_query_matrix extension specification:

- *

- *  GLbitfield glQueryMatrixxOES( GLfixed mantissa[16],

- *                                GLint   exponent[16] )

- *  mantissa[16] contains the contents of the current matrix in GLfixed

- *  format.  exponent[16] contains the unbiased exponents applied to the

- *  matrix components, so that the internal representation of component i

- *  is close to mantissa[i] * 2^exponent[i].  The function returns a status

- *  word which is zero if all the components are valid. If

- *  status & (1<<i) != 0, the component i is invalid (e.g., NaN, Inf).

- *  The implementations are not required to keep track of overflows.  In

- *  that case, the invalid bits are never set.

- */

-

-#define INT_TO_FIXED(x) ((GLfixed) ((x) << 16))

-#define FLOAT_TO_FIXED(x) ((GLfixed) ((x) * 65536.0))

-

-#if defined(_MSC_VER)

-/* Oddly, the fpclassify() function doesn't exist in such a form

- * on MSVC.  This is an implementation using slightly different

- * lower-level Windows functions.

- */

-#include <float.h>

-

-enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}

-fpclassify(double x)

-{

-    switch(_fpclass(x)) {

-        case _FPCLASS_SNAN: /* signaling NaN */

-        case _FPCLASS_QNAN: /* quiet NaN */

-            return FP_NAN;

-        case _FPCLASS_NINF: /* negative infinity */

-        case _FPCLASS_PINF: /* positive infinity */

-            return FP_INFINITE;

-        case _FPCLASS_NN:   /* negative normal */

-        case _FPCLASS_PN:   /* positive normal */

-            return FP_NORMAL;

-        case _FPCLASS_ND:   /* negative denormalized */

-        case _FPCLASS_PD:   /* positive denormalized */

-            return FP_SUBNORMAL;

-        case _FPCLASS_NZ:   /* negative zero */

-        case _FPCLASS_PZ:   /* positive zero */

-            return FP_ZERO;

-        default:

-            /* Should never get here; but if we do, this will guarantee

-             * that the pattern is not treated like a number.

-             */

-            return FP_NAN;

-    }

-}

-

-#elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \

-     defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \

-     (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \

-     (defined(__sun) && defined(__GNUC__))

-

-/* fpclassify is available. */

-

-#elif !defined(_XOPEN_SOURCE) || _XOPEN_SOURCE < 600

-

-enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}

-fpclassify(double x)

-{

-   /* XXX do something better someday */

-   return FP_NORMAL;

-}

-

-#endif

-

-extern GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);

-

-/* The Mesa functions we'll need */

-extern void GL_APIENTRY _mesa_GetIntegerv(GLenum pname, GLint *params);

-extern void GL_APIENTRY _mesa_GetFloatv(GLenum pname, GLfloat *params);

-

-GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])

-{

-    GLfloat matrix[16];

-    GLint tmp;

-    GLenum currentMode = GL_FALSE;

-    GLenum desiredMatrix = GL_FALSE;

-    /* The bitfield returns 1 for each component that is invalid (i.e.

-     * NaN or Inf).  In case of error, everything is invalid.

-     */

-    GLbitfield rv;

-    register unsigned int i;

-    unsigned int bit;

-

-    /* This data structure defines the mapping between the current matrix

-     * mode and the desired matrix identifier.

-     */

-    static struct {

-        GLenum currentMode;

-        GLenum desiredMatrix;

-    } modes[] = {

-        {GL_MODELVIEW, GL_MODELVIEW_MATRIX},

-        {GL_PROJECTION, GL_PROJECTION_MATRIX},

-        {GL_TEXTURE, GL_TEXTURE_MATRIX},

-    };

-

-    /* Call Mesa to get the current matrix in floating-point form.  First,

-     * we have to figure out what the current matrix mode is.

-     */

-    _mesa_GetIntegerv(GL_MATRIX_MODE, &tmp);

-    currentMode = (GLenum) tmp;

-

-    /* The mode is either GL_FALSE, if for some reason we failed to query

-     * the mode, or a given mode from the above table.  Search for the

-     * returned mode to get the desired matrix; if we don't find it,

-     * we can return immediately, as _mesa_GetInteger() will have

-     * logged the necessary error already.

-     */

-    for (i = 0; i < sizeof(modes)/sizeof(modes[0]); i++) {

-        if (modes[i].currentMode == currentMode) {

-            desiredMatrix = modes[i].desiredMatrix;

-            break;

-        }

-    }

-    if (desiredMatrix == GL_FALSE) {

-        /* Early error means all values are invalid. */

-        return 0xffff;

-    }

-

-    /* Now pull the matrix itself. */

-    _mesa_GetFloatv(desiredMatrix, matrix);

-

-    rv = 0;

-    for (i = 0, bit = 1; i < 16; i++, bit<<=1) {

-        float normalizedFraction;

-        int exp;

-

-        switch (fpclassify(matrix[i])) {

-            /* A "subnormal" or denormalized number is too small to be

-             * represented in normal format; but despite that it's a

-             * valid floating point number.  FP_ZERO and FP_NORMAL

-             * are both valid as well.  We should be fine treating

-             * these three cases as legitimate floating-point numbers.

-             */

-            case FP_SUBNORMAL:

-            case FP_NORMAL:

-            case FP_ZERO:

-                normalizedFraction = (GLfloat)frexp(matrix[i], &exp);

-                mantissa[i] = FLOAT_TO_FIXED(normalizedFraction);

-                exponent[i] = (GLint) exp;

-                break;

-

-            /* If the entry is not-a-number or an infinity, then the

-             * matrix component is invalid.  The invalid flag for

-             * the component is already set; might as well set the

-             * other return values to known values.  We'll set

-             * distinct values so that a savvy end user could determine

-             * whether the matrix component was a NaN or an infinity,

-             * but this is more useful for debugging than anything else

-             * since the standard doesn't specify any such magic

-             * values to return.

-             */

-            case FP_NAN:

-                mantissa[i] = INT_TO_FIXED(0);

-                exponent[i] = (GLint) 0;

-                rv |= bit;

-                break;

-

-            case FP_INFINITE:

-                /* Return +/- 1 based on whether it's a positive or

-                 * negative infinity.

-                 */

-                if (matrix[i] > 0) {

-                    mantissa[i] = INT_TO_FIXED(1);

-                }

-                else {

-                    mantissa[i] = -INT_TO_FIXED(1);

-                }

-                exponent[i] = (GLint) 0;

-                rv |= bit;

-                break;

-

-            /* We should never get here; but here's a catching case

-             * in case fpclassify() is returnings something unexpected.

-             */

-            default:

-                mantissa[i] = INT_TO_FIXED(2);

-                exponent[i] = (GLint) 0;

-                rv |= bit;

-                break;

-        }

-

-    } /* for each component */

-

-    /* All done */

-    return rv;

-}

+/**************************************************************************
+ *
+ * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ **************************************************************************/
+
+
+/**
+ * Code to implement GL_OES_query_matrix.  See the spec at:
+ * http://www.khronos.org/registry/gles/extensions/OES/OES_query_matrix.txt
+ */
+
+
+#include <stdlib.h>
+#include <math.h>
+#include "GLES/gl.h"
+#include "GLES/glext.h"
+
+
+/**
+ * This is from the GL_OES_query_matrix extension specification:
+ *
+ *  GLbitfield glQueryMatrixxOES( GLfixed mantissa[16],
+ *                                GLint   exponent[16] )
+ *  mantissa[16] contains the contents of the current matrix in GLfixed
+ *  format.  exponent[16] contains the unbiased exponents applied to the
+ *  matrix components, so that the internal representation of component i
+ *  is close to mantissa[i] * 2^exponent[i].  The function returns a status
+ *  word which is zero if all the components are valid. If
+ *  status & (1<<i) != 0, the component i is invalid (e.g., NaN, Inf).
+ *  The implementations are not required to keep track of overflows.  In
+ *  that case, the invalid bits are never set.
+ */
+
+#define INT_TO_FIXED(x) ((GLfixed) ((x) << 16))
+#define FLOAT_TO_FIXED(x) ((GLfixed) ((x) * 65536.0))
+
+#if defined(_MSC_VER)
+/* Oddly, the fpclassify() function doesn't exist in such a form
+ * on MSVC.  This is an implementation using slightly different
+ * lower-level Windows functions.
+ */
+#include <float.h>
+
+enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}
+fpclassify(double x)
+{
+    switch(_fpclass(x)) {
+        case _FPCLASS_SNAN: /* signaling NaN */
+        case _FPCLASS_QNAN: /* quiet NaN */
+            return FP_NAN;
+        case _FPCLASS_NINF: /* negative infinity */
+        case _FPCLASS_PINF: /* positive infinity */
+            return FP_INFINITE;
+        case _FPCLASS_NN:   /* negative normal */
+        case _FPCLASS_PN:   /* positive normal */
+            return FP_NORMAL;
+        case _FPCLASS_ND:   /* negative denormalized */
+        case _FPCLASS_PD:   /* positive denormalized */
+            return FP_SUBNORMAL;
+        case _FPCLASS_NZ:   /* negative zero */
+        case _FPCLASS_PZ:   /* positive zero */
+            return FP_ZERO;
+        default:
+            /* Should never get here; but if we do, this will guarantee
+             * that the pattern is not treated like a number.
+             */
+            return FP_NAN;
+    }
+}
+
+#elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \
+     defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \
+     (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \
+     (defined(__sun) && defined(__GNUC__)) || defined(ANDROID)
+
+/* fpclassify is available. */
+
+#elif !defined(_XOPEN_SOURCE) || _XOPEN_SOURCE < 600
+
+enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL}
+fpclassify(double x)
+{
+   /* XXX do something better someday */
+   return FP_NORMAL;
+}
+
+#endif
+
+extern GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);
+
+/* The Mesa functions we'll need */
+extern void GL_APIENTRY _mesa_GetIntegerv(GLenum pname, GLint *params);
+extern void GL_APIENTRY _mesa_GetFloatv(GLenum pname, GLfloat *params);
+
+GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
+{
+    GLfloat matrix[16];
+    GLint tmp;
+    GLenum currentMode = GL_FALSE;
+    GLenum desiredMatrix = GL_FALSE;
+    /* The bitfield returns 1 for each component that is invalid (i.e.
+     * NaN or Inf).  In case of error, everything is invalid.
+     */
+    GLbitfield rv;
+    register unsigned int i;
+    unsigned int bit;
+
+    /* This data structure defines the mapping between the current matrix
+     * mode and the desired matrix identifier.
+     */
+    static struct {
+        GLenum currentMode;
+        GLenum desiredMatrix;
+    } modes[] = {
+        {GL_MODELVIEW, GL_MODELVIEW_MATRIX},
+        {GL_PROJECTION, GL_PROJECTION_MATRIX},
+        {GL_TEXTURE, GL_TEXTURE_MATRIX},
+    };
+
+    /* Call Mesa to get the current matrix in floating-point form.  First,
+     * we have to figure out what the current matrix mode is.
+     */
+    _mesa_GetIntegerv(GL_MATRIX_MODE, &tmp);
+    currentMode = (GLenum) tmp;
+
+    /* The mode is either GL_FALSE, if for some reason we failed to query
+     * the mode, or a given mode from the above table.  Search for the
+     * returned mode to get the desired matrix; if we don't find it,
+     * we can return immediately, as _mesa_GetInteger() will have
+     * logged the necessary error already.
+     */
+    for (i = 0; i < sizeof(modes)/sizeof(modes[0]); i++) {
+        if (modes[i].currentMode == currentMode) {
+            desiredMatrix = modes[i].desiredMatrix;
+            break;
+        }
+    }
+    if (desiredMatrix == GL_FALSE) {
+        /* Early error means all values are invalid. */
+        return 0xffff;
+    }
+
+    /* Now pull the matrix itself. */
+    _mesa_GetFloatv(desiredMatrix, matrix);
+
+    rv = 0;
+    for (i = 0, bit = 1; i < 16; i++, bit<<=1) {
+        float normalizedFraction;
+        int exp;
+
+        switch (fpclassify(matrix[i])) {
+            /* A "subnormal" or denormalized number is too small to be
+             * represented in normal format; but despite that it's a
+             * valid floating point number.  FP_ZERO and FP_NORMAL
+             * are both valid as well.  We should be fine treating
+             * these three cases as legitimate floating-point numbers.
+             */
+            case FP_SUBNORMAL:
+            case FP_NORMAL:
+            case FP_ZERO:
+                normalizedFraction = (GLfloat)frexp(matrix[i], &exp);
+                mantissa[i] = FLOAT_TO_FIXED(normalizedFraction);
+                exponent[i] = (GLint) exp;
+                break;
+
+            /* If the entry is not-a-number or an infinity, then the
+             * matrix component is invalid.  The invalid flag for
+             * the component is already set; might as well set the
+             * other return values to known values.  We'll set
+             * distinct values so that a savvy end user could determine
+             * whether the matrix component was a NaN or an infinity,
+             * but this is more useful for debugging than anything else
+             * since the standard doesn't specify any such magic
+             * values to return.
+             */
+            case FP_NAN:
+                mantissa[i] = INT_TO_FIXED(0);
+                exponent[i] = (GLint) 0;
+                rv |= bit;
+                break;
+
+            case FP_INFINITE:
+                /* Return +/- 1 based on whether it's a positive or
+                 * negative infinity.
+                 */
+                if (matrix[i] > 0) {
+                    mantissa[i] = INT_TO_FIXED(1);
+                }
+                else {
+                    mantissa[i] = -INT_TO_FIXED(1);
+                }
+                exponent[i] = (GLint) 0;
+                rv |= bit;
+                break;
+
+            /* We should never get here; but here's a catching case
+             * in case fpclassify() is returnings something unexpected.
+             */
+            default:
+                mantissa[i] = INT_TO_FIXED(2);
+                exponent[i] = (GLint) 0;
+                rv |= bit;
+                break;
+        }
+
+    } /* for each component */
+
+    /* All done */
+    return rv;
+}
diff --git a/mesalib/src/mesa/main/remap_helper.h b/mesalib/src/mesa/main/remap_helper.h
index dca6b4987..bb714e8d2 100644
--- a/mesalib/src/mesa/main/remap_helper.h
+++ b/mesalib/src/mesa/main/remap_helper.h
@@ -475,4457 +475,4454 @@ static const char _mesa_function_pool[] =
    /* _mesa_function_pool[3103]: FramebufferTextureLayerEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
+   "glFramebufferTextureLayerARB\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[3165]: GetListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[3194]: GetListParameterfvSGIX (dynamic) */
    "iip\0"
    "glGetListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[3195]: Viewport (offset 305) */
+   /* _mesa_function_pool[3224]: Viewport (offset 305) */
    "iiii\0"
    "glViewport\0"
    "\0"
-   /* _mesa_function_pool[3212]: VertexAttrib4NusvARB (will be remapped) */
+   /* _mesa_function_pool[3241]: VertexAttrib4NusvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nusv\0"
    "glVertexAttrib4NusvARB\0"
    "\0"
-   /* _mesa_function_pool[3259]: WindowPos4svMESA (will be remapped) */
+   /* _mesa_function_pool[3288]: WindowPos4svMESA (will be remapped) */
    "p\0"
    "glWindowPos4svMESA\0"
    "\0"
-   /* _mesa_function_pool[3281]: CreateProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[3310]: CreateProgramObjectARB (will be remapped) */
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[3308]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[3337]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
    "glDeleteTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[3339]: UniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[3368]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[3366]: PrioritizeTextures (offset 331) */
+   /* _mesa_function_pool[3395]: PrioritizeTextures (offset 331) */
    "ipp\0"
    "glPrioritizeTextures\0"
    "glPrioritizeTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[3416]: VertexAttribI3uiEXT (will be remapped) */
+   /* _mesa_function_pool[3445]: VertexAttribI3uiEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3uiEXT\0"
    "glVertexAttribI3ui\0"
    "\0"
-   /* _mesa_function_pool[3463]: AsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[3492]: AsyncMarkerSGIX (dynamic) */
    "i\0"
    "glAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[3484]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[3513]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[3512]: ClearColorIuiEXT (will be remapped) */
+   /* _mesa_function_pool[3541]: ClearColorIuiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIuiEXT\0"
    "\0"
-   /* _mesa_function_pool[3537]: ClearDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[3566]: ClearDebugLogMESA (dynamic) */
    "iii\0"
    "glClearDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[3562]: Uniform4uiEXT (will be remapped) */
+   /* _mesa_function_pool[3591]: Uniform4uiEXT (will be remapped) */
    "iiiii\0"
    "glUniform4uiEXT\0"
    "glUniform4ui\0"
    "\0"
-   /* _mesa_function_pool[3598]: ResetHistogram (offset 369) */
+   /* _mesa_function_pool[3627]: ResetHistogram (offset 369) */
    "i\0"
    "glResetHistogram\0"
    "glResetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[3638]: GetProgramNamedParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[3667]: GetProgramNamedParameterfvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[3675]: PointParameterfEXT (will be remapped) */
+   /* _mesa_function_pool[3704]: PointParameterfEXT (will be remapped) */
    "if\0"
    "glPointParameterf\0"
    "glPointParameterfARB\0"
    "glPointParameterfEXT\0"
    "glPointParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[3761]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[3790]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[3797]: GenFencesNV (will be remapped) */
+   /* _mesa_function_pool[3826]: GenFencesNV (will be remapped) */
    "ip\0"
    "glGenFencesNV\0"
    "\0"
-   /* _mesa_function_pool[3815]: ImageTransformParameterfHP (dynamic) */
+   /* _mesa_function_pool[3844]: ImageTransformParameterfHP (dynamic) */
    "iif\0"
    "glImageTransformParameterfHP\0"
    "\0"
-   /* _mesa_function_pool[3849]: MatrixIndexusvARB (dynamic) */
+   /* _mesa_function_pool[3878]: MatrixIndexusvARB (dynamic) */
    "ip\0"
    "glMatrixIndexusvARB\0"
    "\0"
-   /* _mesa_function_pool[3873]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[3902]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[3905]: DisableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[3934]: DisableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[3965]: GetnConvolutionFilterARB (will be remapped) */
+   /* _mesa_function_pool[3994]: GetnConvolutionFilterARB (will be remapped) */
    "iiiip\0"
    "glGetnConvolutionFilterARB\0"
    "\0"
-   /* _mesa_function_pool[3999]: TexCoord2sv (offset 109) */
+   /* _mesa_function_pool[4028]: TexCoord2sv (offset 109) */
    "p\0"
    "glTexCoord2sv\0"
    "\0"
-   /* _mesa_function_pool[4016]: Vertex4dv (offset 143) */
+   /* _mesa_function_pool[4045]: Vertex4dv (offset 143) */
    "p\0"
    "glVertex4dv\0"
    "\0"
-   /* _mesa_function_pool[4031]: StencilMaskSeparate (will be remapped) */
+   /* _mesa_function_pool[4060]: StencilMaskSeparate (will be remapped) */
    "ii\0"
    "glStencilMaskSeparate\0"
    "\0"
-   /* _mesa_function_pool[4057]: ProgramLocalParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[4086]: ProgramLocalParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramLocalParameter4dARB\0"
    "\0"
-   /* _mesa_function_pool[4094]: CompressedTexImage3DARB (will be remapped) */
+   /* _mesa_function_pool[4123]: CompressedTexImage3DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexImage3D\0"
    "glCompressedTexImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[4154]: Color3sv (offset 18) */
+   /* _mesa_function_pool[4183]: Color3sv (offset 18) */
    "p\0"
    "glColor3sv\0"
    "\0"
-   /* _mesa_function_pool[4168]: GetConvolutionParameteriv (offset 358) */
+   /* _mesa_function_pool[4197]: GetConvolutionParameteriv (offset 358) */
    "iip\0"
    "glGetConvolutionParameteriv\0"
    "glGetConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[4232]: DeleteSamplers (will be remapped) */
+   /* _mesa_function_pool[4261]: DeleteSamplers (will be remapped) */
    "ip\0"
    "glDeleteSamplers\0"
    "\0"
-   /* _mesa_function_pool[4253]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[4282]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[4294]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[4323]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[4309]: TestFenceNV (will be remapped) */
+   /* _mesa_function_pool[4338]: TestFenceNV (will be remapped) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[4326]: GetVertexAttribIuivEXT (will be remapped) */
+   /* _mesa_function_pool[4355]: GetVertexAttribIuivEXT (will be remapped) */
    "iip\0"
    "glGetVertexAttribIuivEXT\0"
    "glGetVertexAttribIuiv\0"
    "\0"
-   /* _mesa_function_pool[4378]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[4407]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[4423]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[4452]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[4440]: Uniform2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4469]: Uniform2uivEXT (will be remapped) */
    "iip\0"
    "glUniform2uivEXT\0"
    "glUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[4476]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[4505]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[4510]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[4539]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4548]: GetPixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[4577]: GetPixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[4584]: Color3fv (offset 14) */
+   /* _mesa_function_pool[4613]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[4598]: GetnPixelMapfvARB (will be remapped) */
+   /* _mesa_function_pool[4627]: GetnPixelMapfvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[4623]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[4652]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[4649]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[4678]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[4670]: GetnUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[4699]: GetnUniformfvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[4695]: GetDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[4724]: GetDebugLogMESA (dynamic) */
    "iiiipp\0"
    "glGetDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[4721]: FogCoorddEXT (will be remapped) */
+   /* _mesa_function_pool[4750]: FogCoorddEXT (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[4751]: BeginConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[4780]: BeginConditionalRenderNV (will be remapped) */
    "ii\0"
    "glBeginConditionalRenderNV\0"
    "glBeginConditionalRender\0"
    "\0"
-   /* _mesa_function_pool[4807]: Color4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4836]: Color4ubVertex3fSUN (dynamic) */
    "iiiifff\0"
    "glColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4838]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[4867]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[4868]: PointSize (offset 173) */
+   /* _mesa_function_pool[4897]: PointSize (offset 173) */
    "f\0"
    "glPointSize\0"
    "\0"
-   /* _mesa_function_pool[4883]: VertexAttribI2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4912]: VertexAttribI2uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2uivEXT\0"
    "glVertexAttribI2uiv\0"
    "\0"
-   /* _mesa_function_pool[4930]: TexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4959]: TexCoord2fVertex3fSUN (dynamic) */
    "fffff\0"
    "glTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4961]: PopName (offset 200) */
+   /* _mesa_function_pool[4990]: PopName (offset 200) */
    "\0"
    "glPopName\0"
    "\0"
-   /* _mesa_function_pool[4973]: GetSamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[5002]: GetSamplerParameterfv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[5002]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[5031]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[5029]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[5058]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[5053]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[5082]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[5079]: VertexAttrib4NbvARB (will be remapped) */
+   /* _mesa_function_pool[5108]: VertexAttrib4NbvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[5124]: GetActiveAttribARB (will be remapped) */
+   /* _mesa_function_pool[5153]: GetActiveAttribARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[5172]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[5201]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[5187]: VertexAttrib4ubNV (will be remapped) */
+   /* _mesa_function_pool[5216]: VertexAttrib4ubNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4ubNV\0"
    "\0"
-   /* _mesa_function_pool[5214]: VertexAttribI1ivEXT (will be remapped) */
+   /* _mesa_function_pool[5243]: VertexAttribI1ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1ivEXT\0"
    "glVertexAttribI1iv\0"
    "\0"
-   /* _mesa_function_pool[5259]: ClampColor (will be remapped) */
+   /* _mesa_function_pool[5288]: ClampColor (will be remapped) */
    "ii\0"
    "glClampColor\0"
    "\0"
-   /* _mesa_function_pool[5276]: TextureRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[5305]: TextureRangeAPPLE (will be remapped) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[5301]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[5330]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[5320]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5349]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5348]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5377]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5401]: Indexub (offset 315) */
+   /* _mesa_function_pool[5430]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[5414]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[5443]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[5440]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[5469]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[5455]: GetClipPlane (offset 259) */
+   /* _mesa_function_pool[5484]: GetClipPlane (offset 259) */
    "ip\0"
    "glGetClipPlane\0"
    "\0"
-   /* _mesa_function_pool[5474]: CombinerParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[5503]: CombinerParameterfvNV (will be remapped) */
    "ip\0"
    "glCombinerParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[5502]: VertexAttribs3dvNV (will be remapped) */
+   /* _mesa_function_pool[5531]: VertexAttribs3dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3dvNV\0"
    "\0"
-   /* _mesa_function_pool[5528]: VertexAttribI2uiEXT (will be remapped) */
+   /* _mesa_function_pool[5557]: VertexAttribI2uiEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2uiEXT\0"
    "glVertexAttribI2ui\0"
    "\0"
-   /* _mesa_function_pool[5574]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[5603]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[5600]: VertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[5629]: VertexArrayRangeNV (will be remapped) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[5625]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[5654]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[5651]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[5680]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[5674]: VertexAttribI4uivEXT (will be remapped) */
+   /* _mesa_function_pool[5703]: VertexAttribI4uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4uivEXT\0"
    "glVertexAttribI4uiv\0"
    "\0"
-   /* _mesa_function_pool[5721]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[5750]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[5740]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[5769]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[5769]: Scaled (offset 301) */
+   /* _mesa_function_pool[5798]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[5783]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5812]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5811]: Scalef (offset 302) */
+   /* _mesa_function_pool[5840]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[5825]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[5854]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[5863]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[5892]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[5898]: MultTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[5927]: MultTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[5950]: ColorMaskIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[5979]: ColorMaskIndexedEXT (will be remapped) */
    "iiiii\0"
    "glColorMaskIndexedEXT\0"
    "glColorMaski\0"
    "\0"
-   /* _mesa_function_pool[5992]: ObjectUnpurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[6021]: ObjectUnpurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectUnpurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[6022]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[6051]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[6038]: WindowPos2svMESA (will be remapped) */
+   /* _mesa_function_pool[6067]: WindowPos2svMESA (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[6093]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[6122]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[6107]: TexCoord2iv (offset 107) */
+   /* _mesa_function_pool[6136]: TexCoord2iv (offset 107) */
    "p\0"
    "glTexCoord2iv\0"
    "\0"
-   /* _mesa_function_pool[6124]: CompressedTexImage1DARB (will be remapped) */
+   /* _mesa_function_pool[6153]: CompressedTexImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[6182]: Rotated (offset 299) */
+   /* _mesa_function_pool[6211]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[6198]: GetTexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[6227]: GetTexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIuivEXT\0"
    "glGetTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[6250]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[6279]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[6274]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[6303]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[6296]: VertexAttribDivisorARB (will be remapped) */
+   /* _mesa_function_pool[6325]: VertexAttribDivisorARB (will be remapped) */
    "ii\0"
    "glVertexAttribDivisorARB\0"
    "\0"
-   /* _mesa_function_pool[6325]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[6354]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[6340]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[6369]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[6369]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6398]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6393]: Color4iv (offset 32) */
+   /* _mesa_function_pool[6422]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[6407]: TexParameterf (offset 178) */
+   /* _mesa_function_pool[6436]: TexParameterf (offset 178) */
    "iif\0"
    "glTexParameterf\0"
    "\0"
-   /* _mesa_function_pool[6428]: TexParameteri (offset 180) */
+   /* _mesa_function_pool[6457]: TexParameteri (offset 180) */
    "iii\0"
    "glTexParameteri\0"
    "\0"
-   /* _mesa_function_pool[6449]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6478]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6474]: MultiTexCoord3dARB (offset 392) */
+   /* _mesa_function_pool[6503]: MultiTexCoord3dARB (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[6519]: MultiTexCoord2iARB (offset 388) */
+   /* _mesa_function_pool[6548]: MultiTexCoord2iARB (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[6563]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[6592]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[6583]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[6612]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[6643]: MultiTexCoord2svARB (offset 391) */
+   /* _mesa_function_pool[6672]: MultiTexCoord2svARB (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[6688]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[6717]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[6715]: Uniform3iARB (will be remapped) */
+   /* _mesa_function_pool[6744]: Uniform3iARB (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[6748]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[6777]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[6776]: DrawElementsInstancedARB (will be remapped) */
+   /* _mesa_function_pool[6805]: DrawElementsInstancedARB (will be remapped) */
    "iiipi\0"
    "glDrawElementsInstancedARB\0"
    "glDrawElementsInstancedEXT\0"
    "glDrawElementsInstanced\0"
    "\0"
-   /* _mesa_function_pool[6861]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[6890]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[6886]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[6915]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[6904]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[6933]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[6929]: GlobalAlphaFactordSUN (dynamic) */
+   /* _mesa_function_pool[6958]: GlobalAlphaFactordSUN (dynamic) */
    "d\0"
    "glGlobalAlphaFactordSUN\0"
    "\0"
-   /* _mesa_function_pool[6956]: GetFinalCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[6985]: GetFinalCombinerInputParameterfvNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[6998]: GenerateMipmapEXT (will be remapped) */
+   /* _mesa_function_pool[7027]: GenerateMipmapEXT (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "\0"
-   /* _mesa_function_pool[7038]: GenLists (offset 5) */
+   /* _mesa_function_pool[7067]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[7052]: DepthRangef (will be remapped) */
+   /* _mesa_function_pool[7081]: DepthRangef (will be remapped) */
    "ff\0"
    "glDepthRangef\0"
    "\0"
-   /* _mesa_function_pool[7070]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[7099]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[7104]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[7133]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[7131]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[7160]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[7159]: BufferDataARB (will be remapped) */
+   /* _mesa_function_pool[7188]: BufferDataARB (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[7194]: FlushVertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[7223]: FlushVertexArrayRangeNV (will be remapped) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[7222]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[7251]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[7242]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[7271]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[7262]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[7291]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[7282]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[7311]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[7308]: GetTexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[7337]: GetTexFilterFuncSGIS (dynamic) */
    "iip\0"
    "glGetTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[7336]: Scissor (offset 176) */
+   /* _mesa_function_pool[7365]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[7352]: Fogf (offset 153) */
+   /* _mesa_function_pool[7381]: Fogf (offset 153) */
    "if\0"
    "glFogf\0"
    "\0"
-   /* _mesa_function_pool[7363]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[7392]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[7408]: TexSubImage1D (offset 332) */
+   /* _mesa_function_pool[7437]: TexSubImage1D (offset 332) */
    "iiiiiip\0"
    "glTexSubImage1D\0"
    "glTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[7452]: VertexAttrib1sARB (will be remapped) */
+   /* _mesa_function_pool[7481]: VertexAttrib1sARB (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[7493]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[7522]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[7509]: Color4usv (offset 40) */
+   /* _mesa_function_pool[7538]: Color4usv (offset 40) */
    "p\0"
    "glColor4usv\0"
    "\0"
-   /* _mesa_function_pool[7524]: Fogi (offset 155) */
+   /* _mesa_function_pool[7553]: Fogi (offset 155) */
    "ii\0"
    "glFogi\0"
    "\0"
-   /* _mesa_function_pool[7535]: DepthRange (offset 288) */
+   /* _mesa_function_pool[7564]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[7552]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[7581]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[7570]: FinalCombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[7599]: FinalCombinerInputNV (will be remapped) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[7599]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[7628]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[7616]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[7645]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[7634]: Color4ui (offset 37) */
+   /* _mesa_function_pool[7663]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[7651]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[7680]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[7670]: Color3usv (offset 24) */
+   /* _mesa_function_pool[7699]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[7685]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[7714]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[7705]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[7734]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[7722]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[7751]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7771]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[7800]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[7788]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[7817]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[7807]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[7836]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[7826]: Uniform1fARB (will be remapped) */
+   /* _mesa_function_pool[7855]: Uniform1fARB (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[7857]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[7886]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[7909]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[7938]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[7926]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[7955]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[7975]: ColorTableParameteriv (offset 341) */
+   /* _mesa_function_pool[8004]: ColorTableParameteriv (offset 341) */
    "iip\0"
    "glColorTableParameteriv\0"
    "glColorTableParameterivSGI\0"
    "\0"
-   /* _mesa_function_pool[8031]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[8060]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[8062]: WindowPos3dMESA (will be remapped) */
+   /* _mesa_function_pool[8091]: WindowPos3dMESA (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[8116]: Color4us (offset 39) */
+   /* _mesa_function_pool[8145]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[8133]: PointParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[8162]: PointParameterfvEXT (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[8223]: Color3bv (offset 10) */
+   /* _mesa_function_pool[8252]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[8237]: GetnCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[8266]: GetnCompressedTexImageARB (will be remapped) */
    "iiip\0"
    "glGetnCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[8271]: WindowPos2fvMESA (will be remapped) */
+   /* _mesa_function_pool[8300]: WindowPos2fvMESA (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[8326]: SecondaryColor3bvEXT (will be remapped) */
+   /* _mesa_function_pool[8355]: SecondaryColor3bvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[8372]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[8401]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[8402]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[8431]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[8439]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[8468]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[8468]: BindSampler (will be remapped) */
+   /* _mesa_function_pool[8497]: BindSampler (will be remapped) */
    "ii\0"
    "glBindSampler\0"
    "\0"
-   /* _mesa_function_pool[8486]: RenderbufferStorageEXT (will be remapped) */
+   /* _mesa_function_pool[8515]: RenderbufferStorageEXT (will be remapped) */
    "iiii\0"
    "glRenderbufferStorage\0"
    "glRenderbufferStorageEXT\0"
    "\0"
-   /* _mesa_function_pool[8539]: IsFenceNV (will be remapped) */
+   /* _mesa_function_pool[8568]: IsFenceNV (will be remapped) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[8554]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[8583]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[8576]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[8605]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[8606]: UniformMatrix2fvARB (will be remapped) */
+   /* _mesa_function_pool[8635]: UniformMatrix2fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[8653]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[8682]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[8697]: ColorTable (offset 339) */
+   /* _mesa_function_pool[8726]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[8750]: IndexPointer (offset 314) */
+   /* _mesa_function_pool[8779]: IndexPointer (offset 314) */
    "iip\0"
    "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[8770]: Accum (offset 213) */
+   /* _mesa_function_pool[8799]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[8782]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[8811]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[8803]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[8832]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[8835]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[8864]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[8891]: Finish (offset 216) */
+   /* _mesa_function_pool[8920]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[8902]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[8931]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[8926]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[8955]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[8944]: VertexAttrib3dvARB (will be remapped) */
+   /* _mesa_function_pool[8973]: VertexAttrib3dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[8987]: Uniform4uivEXT (will be remapped) */
+   /* _mesa_function_pool[9016]: Uniform4uivEXT (will be remapped) */
    "iip\0"
    "glUniform4uivEXT\0"
    "glUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[9023]: HintPGI (dynamic) */
+   /* _mesa_function_pool[9052]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[9037]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[9066]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[9095]: Color4s (offset 33) */
+   /* _mesa_function_pool[9124]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[9111]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[9140]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[9136]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[9165]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[9154]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[9183]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[9171]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[9200]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[9186]: CullParameterdvEXT (dynamic) */
+   /* _mesa_function_pool[9215]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[9211]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[9240]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[9248]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[9277]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[9277]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[9306]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[9334]: Color4i (offset 31) */
+   /* _mesa_function_pool[9363]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[9350]: Color4f (offset 29) */
+   /* _mesa_function_pool[9379]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[9366]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[9395]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[9384]: Color4d (offset 27) */
+   /* _mesa_function_pool[9413]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[9400]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[9429]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[9416]: Color4b (offset 25) */
+   /* _mesa_function_pool[9445]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[9432]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[9461]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[9449]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[9478]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[9479]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[9508]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[9497]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[9526]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[9555]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[9584]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[9576]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[9605]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[9595]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[9624]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[9622]: BeginTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[9651]: BeginTransformFeedbackEXT (will be remapped) */
    "i\0"
    "glBeginTransformFeedbackEXT\0"
    "glBeginTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[9678]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[9707]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[9700]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[9729]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[9716]: EndList (offset 1) */
+   /* _mesa_function_pool[9745]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[9728]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[9757]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[9752]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[9781]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[9782]: Uniform3fvARB (will be remapped) */
+   /* _mesa_function_pool[9811]: Uniform3fvARB (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[9816]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[9845]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[9834]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[9863]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[9885]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[9914]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[9904]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[9933]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[9919]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[9948]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[9947]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[9976]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[9975]: CheckFramebufferStatusEXT (will be remapped) */
+   /* _mesa_function_pool[10004]: CheckFramebufferStatusEXT (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "\0"
-   /* _mesa_function_pool[10031]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[10060]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[10059]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[10088]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[10077]: GetVertexAttribivARB (will be remapped) */
+   /* _mesa_function_pool[10106]: GetVertexAttribivARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[10125]: BlendFunciARB (will be remapped) */
+   /* _mesa_function_pool[10154]: BlendFunciARB (will be remapped) */
    "iii\0"
    "glBlendFunciARB\0"
    "glBlendFuncIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[10168]: GetnUniformivARB (will be remapped) */
+   /* _mesa_function_pool[10197]: GetnUniformivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[10193]: GetTexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[10222]: GetTexParameterIivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIivEXT\0"
    "glGetTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[10243]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[10272]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[10261]: LoadTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[10290]: LoadTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[10313]: ReleaseShaderCompiler (will be remapped) */
+   /* _mesa_function_pool[10342]: ReleaseShaderCompiler (will be remapped) */
    "\0"
    "glReleaseShaderCompiler\0"
    "\0"
-   /* _mesa_function_pool[10339]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[10368]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[10373]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[10402]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[10401]: SecondaryColor3sEXT (will be remapped) */
+   /* _mesa_function_pool[10430]: SecondaryColor3sEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[10447]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10476]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10473]: GetInteger64i_v (will be remapped) */
+   /* _mesa_function_pool[10502]: GetInteger64i_v (will be remapped) */
    "iip\0"
    "glGetInteger64i_v\0"
    "\0"
-   /* _mesa_function_pool[10496]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[10525]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[10523]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[10552]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[10538]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[10567]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[10565]: Color3us (offset 23) */
+   /* _mesa_function_pool[10594]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[10581]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[10610]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[10616]: VertexAttrib4ivARB (will be remapped) */
+   /* _mesa_function_pool[10645]: VertexAttrib4ivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[10659]: End (offset 43) */
+   /* _mesa_function_pool[10688]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[10667]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[10696]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[10692]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[10721]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[10718]: GetQueryObjectui64vEXT (will be remapped) */
+   /* _mesa_function_pool[10747]: GetQueryObjectui64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[10748]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[10777]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[10793]: SecondaryColor3dEXT (will be remapped) */
+   /* _mesa_function_pool[10822]: SecondaryColor3dEXT (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[10839]: Color3ub (offset 19) */
+   /* _mesa_function_pool[10868]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[10855]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[10884]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[10887]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[10916]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[10912]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10941]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10947]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[10976]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[10970]: GetUniformuivEXT (will be remapped) */
+   /* _mesa_function_pool[10999]: GetUniformuivEXT (will be remapped) */
    "iip\0"
    "glGetUniformuivEXT\0"
    "glGetUniformuiv\0"
    "\0"
-   /* _mesa_function_pool[11010]: Color3ui (offset 21) */
+   /* _mesa_function_pool[11039]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[11026]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[11055]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[11043]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[11072]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[11089]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[11118]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11116]: GetTexParameterPointervAPPLE (will be remapped) */
+   /* _mesa_function_pool[11145]: GetTexParameterPointervAPPLE (will be remapped) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[11152]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[11181]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[11168]: GetTransformFeedbackVaryingEXT (will be remapped) */
+   /* _mesa_function_pool[11197]: GetTransformFeedbackVaryingEXT (will be remapped) */
    "iiipppp\0"
    "glGetTransformFeedbackVaryingEXT\0"
    "glGetTransformFeedbackVarying\0"
    "\0"
-   /* _mesa_function_pool[11240]: VertexAttrib4bvARB (will be remapped) */
+   /* _mesa_function_pool[11269]: VertexAttrib4bvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[11283]: ShaderBinary (will be remapped) */
+   /* _mesa_function_pool[11312]: ShaderBinary (will be remapped) */
    "ipipi\0"
    "glShaderBinary\0"
    "\0"
-   /* _mesa_function_pool[11305]: GetIntegerIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[11334]: GetIntegerIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "glGetIntegeri_v\0"
    "\0"
-   /* _mesa_function_pool[11350]: MultiTexCoord4sARB (offset 406) */
+   /* _mesa_function_pool[11379]: MultiTexCoord4sARB (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[11396]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[11425]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11429]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[11458]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[11453]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[11482]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "\0"
-   /* _mesa_function_pool[11478]: WindowPos2dMESA (will be remapped) */
+   /* _mesa_function_pool[11507]: WindowPos2dMESA (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[11531]: FramebufferTexture3DEXT (will be remapped) */
+   /* _mesa_function_pool[11560]: FramebufferTexture3DEXT (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "\0"
-   /* _mesa_function_pool[11588]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[11617]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "\0"
-   /* _mesa_function_pool[11626]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[11655]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[11651]: VertexAttrib3dARB (will be remapped) */
+   /* _mesa_function_pool[11680]: VertexAttrib3dARB (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[11694]: VertexAttribI4usvEXT (will be remapped) */
+   /* _mesa_function_pool[11723]: VertexAttribI4usvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4usvEXT\0"
    "glVertexAttribI4usv\0"
    "\0"
-   /* _mesa_function_pool[11741]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11770]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11805]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[11834]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[11849]: GetError (offset 261) */
+   /* _mesa_function_pool[11878]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[11862]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[11891]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[11881]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[11910]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[11898]: Indexdv (offset 45) */
+   /* _mesa_function_pool[11927]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[11911]: FramebufferTexture2DEXT (will be remapped) */
+   /* _mesa_function_pool[11940]: FramebufferTexture2DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "\0"
-   /* _mesa_function_pool[11967]: Normal3s (offset 60) */
+   /* _mesa_function_pool[11996]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[11983]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[12012]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[12017]: PushName (offset 201) */
+   /* _mesa_function_pool[12046]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[12031]: MultiTexCoord2dvARB (offset 385) */
+   /* _mesa_function_pool[12060]: MultiTexCoord2dvARB (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[12076]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[12105]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[12101]: Normal3i (offset 58) */
+   /* _mesa_function_pool[12130]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[12117]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[12146]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[12152]: SecondaryColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[12181]: SecondaryColorPointerEXT (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[12209]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[12238]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[12252]: PixelTexGenSGIX (will be remapped) */
+   /* _mesa_function_pool[12281]: PixelTexGenSGIX (will be remapped) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[12273]: GetActiveUniformARB (will be remapped) */
+   /* _mesa_function_pool[12302]: GetActiveUniformARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[12323]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[12352]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[12357]: Normal3b (offset 52) */
+   /* _mesa_function_pool[12386]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[12373]: Normal3d (offset 54) */
+   /* _mesa_function_pool[12402]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[12389]: Uniform1uiEXT (will be remapped) */
+   /* _mesa_function_pool[12418]: Uniform1uiEXT (will be remapped) */
    "ii\0"
    "glUniform1uiEXT\0"
    "glUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[12422]: Normal3f (offset 56) */
+   /* _mesa_function_pool[12451]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[12438]: MultiTexCoord1svARB (offset 383) */
+   /* _mesa_function_pool[12467]: MultiTexCoord1svARB (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[12483]: Indexi (offset 48) */
+   /* _mesa_function_pool[12512]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[12495]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[12524]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[12528]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[12557]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[12556]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[12585]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[12577]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12606]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12606]: BindBufferRangeEXT (will be remapped) */
+   /* _mesa_function_pool[12635]: BindBufferRangeEXT (will be remapped) */
    "iiiii\0"
    "glBindBufferRangeEXT\0"
    "glBindBufferRange\0"
    "\0"
-   /* _mesa_function_pool[12652]: DepthMask (offset 211) */
+   /* _mesa_function_pool[12681]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[12667]: IsShader (will be remapped) */
+   /* _mesa_function_pool[12696]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[12681]: Indexf (offset 46) */
+   /* _mesa_function_pool[12710]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[12693]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[12722]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[12731]: Indexd (offset 44) */
+   /* _mesa_function_pool[12760]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[12743]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[12772]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[12764]: StencilOp (offset 244) */
+   /* _mesa_function_pool[12793]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[12781]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[12810]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[12803]: FramebufferTextureLayer (dynamic) */
-   "iiiii\0"
-   "glFramebufferTextureLayerARB\0"
-   "\0"
-   /* _mesa_function_pool[12839]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[12832]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[12884]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[12877]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[12900]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[12893]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[12946]: Indexs (offset 50) */
+   /* _mesa_function_pool[12939]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[12958]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[12951]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[12978]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[12971]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[13000]: BlendFuncSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[12993]: BlendFuncSeparateiARB (will be remapped) */
    "iiiii\0"
    "glBlendFuncSeparateiARB\0"
    "glBlendFuncSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[13061]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[13054]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[13099]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[13092]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[13131]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[13124]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[13158]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[13151]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[13173]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[13166]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[13190]: VertexAttribI1uivEXT (will be remapped) */
+   /* _mesa_function_pool[13183]: VertexAttribI1uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1uivEXT\0"
    "glVertexAttribI1uiv\0"
    "\0"
-   /* _mesa_function_pool[13237]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[13230]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[13252]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[13245]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[13305]: Color4bv (offset 26) */
+   /* _mesa_function_pool[13298]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[13319]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[13312]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[13341]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[13334]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[13389]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[13382]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[13414]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[13407]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[13462]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[13455]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[13486]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[13479]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[13521]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[13514]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[13539]: LogicOp (offset 242) */
+   /* _mesa_function_pool[13532]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[13552]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[13545]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[13576]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[13569]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[13591]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[13584]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[13667]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[13660]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[13684]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[13677]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[13704]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[13697]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[13731]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[13724]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[13776]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[13769]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[13791]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13784]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13823]: VertexAttribI4svEXT (will be remapped) */
+   /* _mesa_function_pool[13816]: VertexAttribI4svEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4svEXT\0"
    "glVertexAttribI4sv\0"
    "\0"
-   /* _mesa_function_pool[13868]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[13861]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[13896]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[13889]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[13920]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[13913]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[13981]: ClearBufferuiv (will be remapped) */
+   /* _mesa_function_pool[13974]: ClearBufferuiv (will be remapped) */
    "iip\0"
    "glClearBufferuiv\0"
    "\0"
-   /* _mesa_function_pool[14003]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[13996]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[14027]: GenTextures (offset 328) */
+   /* _mesa_function_pool[14020]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[14062]: FramebufferTextureARB (will be remapped) */
+   /* _mesa_function_pool[14055]: FramebufferTextureARB (will be remapped) */
    "iiii\0"
    "glFramebufferTextureARB\0"
    "\0"
-   /* _mesa_function_pool[14092]: SetFenceNV (will be remapped) */
+   /* _mesa_function_pool[14085]: SetFenceNV (will be remapped) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[14109]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[14102]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[14165]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[14158]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[14204]: MultiModeDrawArraysIBM (will be remapped) */
+   /* _mesa_function_pool[14197]: MultiModeDrawArraysIBM (will be remapped) */
    "pppii\0"
    "glMultiModeDrawArraysIBM\0"
    "\0"
-   /* _mesa_function_pool[14236]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[14229]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[14269]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[14262]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[14291]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[14284]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[14319]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[14312]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[14337]: GetCombinerOutputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[14330]: GetCombinerOutputParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[14376]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[14369]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[14394]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[14387]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[14409]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[14402]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[14425]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[14418]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[14442]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[14435]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[14466]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[14459]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[14483]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[14476]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[14538]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[14531]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[14553]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[14546]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[14572]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[14565]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[14601]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[14594]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[14644]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[14637]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[14688]: IsSampler (will be remapped) */
+   /* _mesa_function_pool[14681]: IsSampler (will be remapped) */
    "i\0"
    "glIsSampler\0"
    "\0"
-   /* _mesa_function_pool[14703]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[14696]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[14719]: EndTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[14712]: EndTransformFeedbackEXT (will be remapped) */
    "\0"
    "glEndTransformFeedbackEXT\0"
    "glEndTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[14770]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[14763]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[14804]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[14797]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[14833]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[14826]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[14878]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[14871]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[14934]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[14927]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[14955]: GetShaderPrecisionFormat (will be remapped) */
+   /* _mesa_function_pool[14948]: GetShaderPrecisionFormat (will be remapped) */
    "iipp\0"
    "glGetShaderPrecisionFormat\0"
    "\0"
-   /* _mesa_function_pool[14988]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[14981]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[15018]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[15011]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[15053]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[15046]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[15072]: Flush (offset 217) */
+   /* _mesa_function_pool[15065]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[15082]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[15075]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[15097]: VertexAttribI4iEXT (will be remapped) */
+   /* _mesa_function_pool[15090]: VertexAttribI4iEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4iEXT\0"
    "glVertexAttribI4i\0"
    "\0"
-   /* _mesa_function_pool[15143]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[15136]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[15165]: Uniform3uivEXT (will be remapped) */
+   /* _mesa_function_pool[15158]: Uniform3uivEXT (will be remapped) */
    "iip\0"
    "glUniform3uivEXT\0"
    "glUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[15201]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[15194]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[15219]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[15212]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[15262]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[15255]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[15286]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[15279]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[15302]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[15295]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[15320]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[15313]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[15362]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[15355]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[15384]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[15377]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[15404]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[15397]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[15445]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[15438]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[15500]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[15493]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[15518]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[15511]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[15542]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[15535]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[15560]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[15553]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[15578]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[15571]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[15632]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[15625]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[15674]: Color4ub (offset 35) */
+   /* _mesa_function_pool[15667]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[15691]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[15684]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[15711]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[15704]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[15740]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[15733]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[15758]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[15751]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[15818]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[15811]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[15837]: Indexiv (offset 49) */
+   /* _mesa_function_pool[15830]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[15850]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[15843]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[15868]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[15861]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[15912]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[15905]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[15972]: Frustum (offset 289) */
+   /* _mesa_function_pool[15965]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[15990]: GetString (offset 275) */
+   /* _mesa_function_pool[15983]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[16005]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[15998]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[16031]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[16024]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[16046]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[16039]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[16064]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[16057]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[16094]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[16087]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[16112]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[16105]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[16157]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[16150]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[16201]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[16194]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[16244]: GetnHistogramARB (will be remapped) */
+   /* _mesa_function_pool[16237]: GetnHistogramARB (will be remapped) */
    "iiiiip\0"
    "glGetnHistogramARB\0"
    "\0"
-   /* _mesa_function_pool[16271]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[16264]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[16312]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[16305]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[16340]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[16333]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[16375]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[16368]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[16393]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[16386]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[16424]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[16417]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[16458]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[16451]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[16483]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[16476]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[16539]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[16532]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[16558]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[16551]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[16574]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[16567]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[16622]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[16615]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[16668]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[16661]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[16685]: VertexAttribI4uiEXT (will be remapped) */
+   /* _mesa_function_pool[16678]: VertexAttribI4uiEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4uiEXT\0"
    "glVertexAttribI4ui\0"
    "\0"
-   /* _mesa_function_pool[16733]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[16726]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[16766]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[16759]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[16793]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16786]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[16820]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[16813]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[16857]: SamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[16850]: SamplerParameterIiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[16884]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[16877]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[16904]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[16897]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[16925]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[16918]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[16952]: Rectd (offset 86) */
+   /* _mesa_function_pool[16945]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[16966]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16959]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[16992]: TextureBarrierNV (will be remapped) */
+   /* _mesa_function_pool[16985]: TextureBarrierNV (will be remapped) */
    "\0"
    "glTextureBarrierNV\0"
    "\0"
-   /* _mesa_function_pool[17013]: SamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[17006]: SamplerParameterfv (will be remapped) */
    "iip\0"
    "glSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[17039]: VertexAttribI4ubvEXT (will be remapped) */
+   /* _mesa_function_pool[17032]: VertexAttribI4ubvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ubvEXT\0"
    "glVertexAttribI4ubv\0"
    "\0"
-   /* _mesa_function_pool[17086]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[17079]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[17133]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[17126]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[17152]: BlendEquationSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[17145]: BlendEquationSeparateiARB (will be remapped) */
    "iii\0"
    "glBlendEquationSeparateiARB\0"
    "glBlendEquationSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[17219]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[17212]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[17264]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[17257]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[17289]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[17282]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[17319]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[17312]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[17366]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[17359]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[17414]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[17407]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[17472]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[17465]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[17506]: Lightfv (offset 160) */
+   /* _mesa_function_pool[17499]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[17521]: PrimitiveRestartIndexNV (will be remapped) */
+   /* _mesa_function_pool[17514]: PrimitiveRestartIndexNV (will be remapped) */
    "i\0"
    "glPrimitiveRestartIndexNV\0"
    "glPrimitiveRestartIndex\0"
    "\0"
-   /* _mesa_function_pool[17574]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[17567]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[17590]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[17583]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[17610]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[17603]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[17632]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[17625]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[17675]: Color4fv (offset 30) */
+   /* _mesa_function_pool[17668]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[17689]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[17682]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[17734]: GetnMinmaxARB (will be remapped) */
+   /* _mesa_function_pool[17727]: GetnMinmaxARB (will be remapped) */
    "iiiiip\0"
    "glGetnMinmaxARB\0"
    "\0"
-   /* _mesa_function_pool[17758]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[17751]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[17795]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[17788]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[17816]: Rects (offset 92) */
+   /* _mesa_function_pool[17809]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[17830]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17823]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17864]: CreateShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[17857]: CreateShaderProgramEXT (will be remapped) */
    "ip\0"
    "glCreateShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[17893]: ActiveProgramEXT (will be remapped) */
+   /* _mesa_function_pool[17886]: ActiveProgramEXT (will be remapped) */
    "i\0"
    "glActiveProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[17915]: Lightiv (offset 162) */
+   /* _mesa_function_pool[17908]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[17930]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[17923]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[17974]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[17967]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[18022]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[18015]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[18047]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[18040]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[18071]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[18064]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[18116]: ClearBufferfv (will be remapped) */
+   /* _mesa_function_pool[18109]: ClearBufferfv (will be remapped) */
    "iip\0"
    "glClearBufferfv\0"
    "\0"
-   /* _mesa_function_pool[18137]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[18130]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[18180]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[18173]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[18206]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[18199]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[18232]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[18225]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[18250]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[18243]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[18293]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[18286]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[18347]: Rectdv (offset 87) */
+   /* _mesa_function_pool[18340]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[18360]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[18353]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[18386]: BlendEquationiARB (will be remapped) */
+   /* _mesa_function_pool[18379]: BlendEquationiARB (will be remapped) */
    "ii\0"
    "glBlendEquationiARB\0"
    "glBlendEquationIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[18436]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[18429]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[18495]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[18488]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[18523]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[18516]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[18568]: DrawArraysInstancedARB (will be remapped) */
+   /* _mesa_function_pool[18561]: DrawArraysInstancedARB (will be remapped) */
    "iiii\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "glDrawArraysInstanced\0"
    "\0"
-   /* _mesa_function_pool[18646]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[18639]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[18673]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[18666]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[18700]: ClearBufferfi (will be remapped) */
+   /* _mesa_function_pool[18693]: ClearBufferfi (will be remapped) */
    "iifi\0"
    "glClearBufferfi\0"
    "\0"
-   /* _mesa_function_pool[18722]: Materialiv (offset 172) */
+   /* _mesa_function_pool[18715]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[18740]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[18733]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[18762]: SamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[18755]: SamplerParameteriv (will be remapped) */
    "iip\0"
    "glSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[18788]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[18781]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[18834]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[18827]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[18887]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[18880]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[18924]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[18917]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[18970]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[18963]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[18988]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[18981]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[19052]: VertexAttribI1iEXT (will be remapped) */
+   /* _mesa_function_pool[19045]: VertexAttribI1iEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1iEXT\0"
    "glVertexAttribI1i\0"
    "\0"
-   /* _mesa_function_pool[19095]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19088]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19137]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[19130]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[19164]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[19157]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[19191]: GetnUniformdvARB (will be remapped) */
+   /* _mesa_function_pool[19184]: GetnUniformdvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformdvARB\0"
    "\0"
-   /* _mesa_function_pool[19216]: DrawElementsInstancedBaseVertex (will be remapped) */
+   /* _mesa_function_pool[19209]: DrawElementsInstancedBaseVertex (will be remapped) */
    "iiipii\0"
    "glDrawElementsInstancedBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[19258]: VertexAttribIPointerEXT (will be remapped) */
+   /* _mesa_function_pool[19251]: VertexAttribIPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexAttribIPointerEXT\0"
    "glVertexAttribIPointer\0"
    "\0"
-   /* _mesa_function_pool[19314]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[19307]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[19342]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[19335]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[19361]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[19354]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[19399]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[19392]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[19417]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[19410]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[19441]: TexGeni (offset 192) */
+   /* _mesa_function_pool[19434]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[19456]: TexGenf (offset 190) */
+   /* _mesa_function_pool[19449]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[19471]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[19464]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[19504]: TexGend (offset 188) */
+   /* _mesa_function_pool[19497]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[19519]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[19512]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[19546]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[19539]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[19569]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[19562]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[19588]: BindBufferOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[19581]: BindBufferOffsetEXT (will be remapped) */
    "iiii\0"
    "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[19616]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[19609]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[19670]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[19663]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[19694]: DisableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[19687]: DisableIndexedEXT (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "glDisablei\0"
    "\0"
-   /* _mesa_function_pool[19729]: BindBufferBaseEXT (will be remapped) */
+   /* _mesa_function_pool[19722]: BindBufferBaseEXT (will be remapped) */
    "iii\0"
    "glBindBufferBaseEXT\0"
    "glBindBufferBase\0"
    "\0"
-   /* _mesa_function_pool[19771]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[19764]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[19800]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[19793]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[19824]: GetnPixelMapuivARB (will be remapped) */
+   /* _mesa_function_pool[19817]: GetnPixelMapuivARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapuivARB\0"
    "\0"
-   /* _mesa_function_pool[19850]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[19843]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[19897]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[19890]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[19947]: GetSamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[19940]: GetSamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[19978]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[19971]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[20005]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[19998]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[20039]: Color4sv (offset 34) */
+   /* _mesa_function_pool[20032]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[20053]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[20046]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[20083]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[20076]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[20115]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[20108]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[20150]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[20143]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[20166]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[20159]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[20199]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[20192]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[20257]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[20250]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[20313]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[20306]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[20343]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[20336]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[20363]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[20356]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[20382]: Color3dv (offset 12) */
+   /* _mesa_function_pool[20375]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[20396]: IsTexture (offset 330) */
+   /* _mesa_function_pool[20389]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[20426]: GenSamplers (will be remapped) */
+   /* _mesa_function_pool[20419]: GenSamplers (will be remapped) */
    "ip\0"
    "glGenSamplers\0"
    "\0"
-   /* _mesa_function_pool[20444]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[20437]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[20467]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[20460]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[20508]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[20501]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[20543]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[20536]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[20562]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[20555]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[20601]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[20594]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[20631]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[20624]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[20663]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[20656]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[20692]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[20685]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[20708]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[20701]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[20736]: GetStringi (will be remapped) */
+   /* _mesa_function_pool[20729]: GetStringi (will be remapped) */
    "ii\0"
    "glGetStringi\0"
    "\0"
-   /* _mesa_function_pool[20753]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[20746]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[20795]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[20788]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[20813]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[20806]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[20839]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[20832]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[20888]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[20881]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[20906]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[20899]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[20951]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[20944]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[20985]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[20978]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[21009]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[21002]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[21048]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[21041]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[21077]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[21070]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[21095]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[21088]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[21138]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[21131]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[21158]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[21151]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[21226]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[21219]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[21281]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[21274]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[21319]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[21312]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[21353]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[21346]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[21401]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[21394]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[21429]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[21422]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[21482]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[21475]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[21503]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[21496]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[21530]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[21523]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[21562]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[21555]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[21586]: TransformFeedbackVaryingsEXT (will be remapped) */
+   /* _mesa_function_pool[21579]: TransformFeedbackVaryingsEXT (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryingsEXT\0"
    "glTransformFeedbackVaryings\0"
    "\0"
-   /* _mesa_function_pool[21651]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[21644]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[21673]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[21666]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[21691]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[21684]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[21714]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[21707]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[21741]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[21734]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[21791]: Color3s (offset 17) */
+   /* _mesa_function_pool[21784]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[21806]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[21799]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[21840]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[21833]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[21893]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[21886]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[21912]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[21905]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[21936]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[21929]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[21980]: GetnSeparableFilterARB (will be remapped) */
+   /* _mesa_function_pool[21973]: GetnSeparableFilterARB (will be remapped) */
    "iiiipipp\0"
    "glGetnSeparableFilterARB\0"
    "\0"
-   /* _mesa_function_pool[22015]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[22008]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[22038]: Color3i (offset 15) */
+   /* _mesa_function_pool[22031]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[22053]: FrontFace (offset 157) */
+   /* _mesa_function_pool[22046]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[22068]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[22061]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[22086]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[22079]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[22134]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[22127]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[22152]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[22145]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[22195]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[22188]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[22245]: Color3b (offset 9) */
+   /* _mesa_function_pool[22238]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[22260]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[22253]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[22304]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[22297]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[22328]: Color3f (offset 13) */
+   /* _mesa_function_pool[22321]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[22343]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[22336]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[22363]: Color3d (offset 11) */
+   /* _mesa_function_pool[22356]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[22378]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[22371]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[22393]: Lightf (offset 159) */
+   /* _mesa_function_pool[22386]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[22407]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[22400]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[22433]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[22426]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[22449]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[22442]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[22470]: Lighti (offset 161) */
+   /* _mesa_function_pool[22463]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[22484]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[22477]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[22515]: ClearDepthf (will be remapped) */
+   /* _mesa_function_pool[22508]: ClearDepthf (will be remapped) */
    "f\0"
    "glClearDepthf\0"
    "\0"
-   /* _mesa_function_pool[22532]: GetBooleanIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[22525]: GetBooleanIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "glGetBooleani_v\0"
    "\0"
-   /* _mesa_function_pool[22577]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[22570]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[22662]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[22655]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[22697]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[22690]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[22742]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[22735]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[22777]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[22770]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[22794]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[22787]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[22811]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[22804]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[22828]: VertexAttribI4bvEXT (will be remapped) */
+   /* _mesa_function_pool[22821]: VertexAttribI4bvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4bvEXT\0"
    "glVertexAttribI4bv\0"
    "\0"
-   /* _mesa_function_pool[22873]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[22866]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[22916]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[22909]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[22947]: GetnMapfvARB (will be remapped) */
+   /* _mesa_function_pool[22940]: GetnMapfvARB (will be remapped) */
    "iiip\0"
    "glGetnMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[22968]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[22961]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[23023]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[23016]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[23048]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[23041]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[23074]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[23067]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[23119]: Uniform2uiEXT (will be remapped) */
+   /* _mesa_function_pool[23112]: Uniform2uiEXT (will be remapped) */
    "iii\0"
    "glUniform2uiEXT\0"
    "glUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[23153]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[23146]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[23180]: SamplerParameteri (will be remapped) */
+   /* _mesa_function_pool[23173]: SamplerParameteri (will be remapped) */
    "iii\0"
    "glSamplerParameteri\0"
    "\0"
-   /* _mesa_function_pool[23205]: SamplerParameterf (will be remapped) */
+   /* _mesa_function_pool[23198]: SamplerParameterf (will be remapped) */
    "iif\0"
    "glSamplerParameterf\0"
    "\0"
-   /* _mesa_function_pool[23230]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[23223]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[23257]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[23250]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[23286]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[23279]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[23312]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[23305]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[23335]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[23328]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[23354]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[23347]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[23381]: GetnUniformuivARB (will be remapped) */
+   /* _mesa_function_pool[23374]: GetnUniformuivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformuivARB\0"
    "\0"
-   /* _mesa_function_pool[23407]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[23400]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[23425]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[23418]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[23470]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[23463]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[23513]: ClearColor (offset 206) */
+   /* _mesa_function_pool[23506]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[23532]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[23525]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[23551]: ClearColorIiEXT (will be remapped) */
+   /* _mesa_function_pool[23544]: ClearColorIiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIiEXT\0"
    "\0"
-   /* _mesa_function_pool[23575]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[23568]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[23624]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[23617]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[23651]: IsEnabledIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[23644]: IsEnabledIndexedEXT (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "glIsEnabledi\0"
    "\0"
-   /* _mesa_function_pool[23690]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[23683]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[23706]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[23699]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[23754]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[23747]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[23774]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[23767]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[23822]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[23815]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[23846]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[23839]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[23887]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[23880]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[23919]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[23912]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[23937]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[23930]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[24029]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[24022]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[24060]: Bitmap (offset 8) */
+   /* _mesa_function_pool[24053]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[24078]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[24071]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[24123]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[24116]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[24154]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[24147]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[24190]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[24183]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[24233]: VertexAttribDivisor (will be remapped) */
+   /* _mesa_function_pool[24226]: VertexAttribDivisor (will be remapped) */
    "ii\0"
    "glVertexAttribDivisor\0"
    "\0"
-   /* _mesa_function_pool[24259]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[24252]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[24291]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[24284]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[24306]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[24299]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[24324]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[24317]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[24364]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[24357]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[24391]: GetnMapdvARB (will be remapped) */
+   /* _mesa_function_pool[24384]: GetnMapdvARB (will be remapped) */
    "iiip\0"
    "glGetnMapdvARB\0"
    "\0"
-   /* _mesa_function_pool[24412]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[24405]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[24431]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[24424]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[24479]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[24472]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[24514]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[24507]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[24541]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[24534]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[24565]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[24558]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[24599]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[24592]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[24651]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[24644]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[24670]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[24663]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[24701]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[24694]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[24739]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[24732]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[24782]: VertexAttribI2ivEXT (will be remapped) */
+   /* _mesa_function_pool[24775]: VertexAttribI2ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2ivEXT\0"
    "glVertexAttribI2iv\0"
    "\0"
-   /* _mesa_function_pool[24827]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[24820]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[24847]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[24840]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[24918]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[24911]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[24940]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[24933]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[24960]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[24953]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[25014]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[25007]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[25067]: ProgramParameteriARB (will be remapped) */
+   /* _mesa_function_pool[25060]: ProgramParameteriARB (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "\0"
-   /* _mesa_function_pool[25095]: Map1d (offset 220) */
+   /* _mesa_function_pool[25088]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[25111]: Map1f (offset 221) */
+   /* _mesa_function_pool[25104]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[25127]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[25120]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[25186]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[25179]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[25222]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[25215]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[25246]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[25239]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[25267]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[25260]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[25298]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[25291]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[25337]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[25330]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[25359]: GetFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[25352]: GetFragDataLocationEXT (will be remapped) */
    "ip\0"
    "glGetFragDataLocationEXT\0"
    "glGetFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[25410]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[25403]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[25464]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[25457]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[25485]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[25478]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[25531]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[25524]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[25546]: Fogiv (offset 156) */
+   /* _mesa_function_pool[25539]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[25558]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[25551]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[25575]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[25568]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[25611]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[25604]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[25632]: GetnColorTableARB (will be remapped) */
+   /* _mesa_function_pool[25625]: GetnColorTableARB (will be remapped) */
    "iiiip\0"
    "glGetnColorTableARB\0"
    "\0"
-   /* _mesa_function_pool[25659]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[25652]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[25683]: Rotatef (offset 300) */
+   /* _mesa_function_pool[25676]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[25699]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[25692]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[25741]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[25734]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[25757]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[25750]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[25773]: Clear (offset 203) */
+   /* _mesa_function_pool[25766]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[25784]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[25777]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[25800]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[25793]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[25827]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[25820]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[25861]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[25854]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[25877]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[25870]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[25933]: Ortho (offset 296) */
+   /* _mesa_function_pool[25926]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[25949]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[25942]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[25970]: ListBase (offset 6) */
+   /* _mesa_function_pool[25963]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[25984]: VertexAttribI3ivEXT (will be remapped) */
+   /* _mesa_function_pool[25977]: VertexAttribI3ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3ivEXT\0"
    "glVertexAttribI3iv\0"
    "\0"
-   /* _mesa_function_pool[26029]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[26022]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[26045]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[26038]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[26101]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[26094]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[26193]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[26186]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[26250]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[26243]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[26266]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[26259]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[26292]: Rectiv (offset 91) */
+   /* _mesa_function_pool[26285]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[26305]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[26298]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[26343]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[26336]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[26370]: EndConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[26363]: EndConditionalRenderNV (will be remapped) */
    "\0"
    "glEndConditionalRenderNV\0"
    "glEndConditionalRender\0"
    "\0"
-   /* _mesa_function_pool[26420]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[26413]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[26443]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[26436]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[26462]: GetSamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[26455]: GetSamplerParameteriv (will be remapped) */
    "iip\0"
    "glGetSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[26491]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[26484]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[26511]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[26504]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[26557]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[26550]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[26590]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[26583]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[26605]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[26598]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[26650]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[26643]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[26695]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[26688]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[26741]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[26734]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[26776]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[26769]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[26791]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[26784]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[26839]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[26832]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[26874]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[26867]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[26917]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[26910]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[26934]: PauseTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[26927]: PauseTransformFeedback (will be remapped) */
    "\0"
    "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[26961]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[26954]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[27004]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[26997]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[27051]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[27044]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[27139]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[27132]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[27165]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[27158]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[27210]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[27203]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[27242]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[27235]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[27257]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[27250]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[27283]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[27276]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[27308]: LineWidth (offset 168) */
+   /* _mesa_function_pool[27301]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[27323]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[27316]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[27354]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[27347]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[27392]: TexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[27385]: TexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIuivEXT\0"
    "glTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[27438]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[27431]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[27458]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[27451]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[27479]: GetBufferParameteri64v (will be remapped) */
+   /* _mesa_function_pool[27472]: GetBufferParameteri64v (will be remapped) */
    "iip\0"
    "glGetBufferParameteri64v\0"
    "\0"
-   /* _mesa_function_pool[27509]: TexGendv (offset 189) */
+   /* _mesa_function_pool[27502]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[27525]: VertexAttribI3iEXT (will be remapped) */
+   /* _mesa_function_pool[27518]: VertexAttribI3iEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3iEXT\0"
    "glVertexAttribI3i\0"
    "\0"
-   /* _mesa_function_pool[27570]: EnableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[27563]: EnableIndexedEXT (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "glEnablei\0"
    "\0"
-   /* _mesa_function_pool[27603]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[27596]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[27628]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[27621]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[27649]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[27642]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[27683]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[27676]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[27710]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[27703]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[27733]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[27726]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[27759]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[27752]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[27823]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[27816]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[27849]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[27842]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[27893]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[27886]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[27924]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[27917]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[27961]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[27954]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[27982]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[27975]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[28004]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[27997]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[28039]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[28032]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[28060]: CallList (offset 2) */
+   /* _mesa_function_pool[28053]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[28074]: Materialfv (offset 170) */
+   /* _mesa_function_pool[28067]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[28092]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[28085]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[28109]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[28102]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[28141]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[28134]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[28186]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[28179]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[28234]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[28227]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[28279]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[28272]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[28297]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[28290]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[28350]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[28343]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[28381]: Color3iv (offset 16) */
+   /* _mesa_function_pool[28374]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[28395]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[28388]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[28429]: DrawElements (offset 311) */
+   /* _mesa_function_pool[28422]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[28450]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[28443]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[28476]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[28469]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[28513]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[28506]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[28573]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[28566]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[28616]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[28609]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[28671]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[28664]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[28694]: TexBufferARB (will be remapped) */
+   /* _mesa_function_pool[28687]: TexBufferARB (will be remapped) */
    "iii\0"
    "glTexBufferARB\0"
    "\0"
-   /* _mesa_function_pool[28714]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[28707]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[28787]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[28780]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[28810]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[28803]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[28841]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[28834]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[28878]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[28871]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[28895]: Uniform1uivEXT (will be remapped) */
+   /* _mesa_function_pool[28888]: Uniform1uivEXT (will be remapped) */
    "iip\0"
    "glUniform1uivEXT\0"
    "glUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[28931]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[28924]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[28947]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[28940]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[28967]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[28960]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[28981]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[28974]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[29000]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[28993]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[29020]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[29013]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[29069]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[29062]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[29115]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[29108]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[29134]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[29127]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[29160]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[29153]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[29203]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[29196]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[29228]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[29221]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[29273]: Map2d (offset 222) */
+   /* _mesa_function_pool[29266]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[29293]: Map2f (offset 223) */
+   /* _mesa_function_pool[29286]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[29313]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[29306]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[29338]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[29331]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[29355]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[29348]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[29384]: FragmentLightModelivSGIX (dynamic) */
+   /* _mesa_function_pool[29377]: FragmentLightModelivSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelivSGIX\0"
    "\0"
-   /* _mesa_function_pool[29415]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[29408]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[29438]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[29431]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[29455]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[29448]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[29472]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[29465]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[29489]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[29482]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[29507]: UseShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[29500]: UseShaderProgramEXT (will be remapped) */
    "ii\0"
    "glUseShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[29533]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[29526]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[29559]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[29552]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[29615]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[29608]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[29634]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[29627]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[29651]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[29644]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[29682]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[29675]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[29722]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[29715]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[29748]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[29741]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[29779]: Materialf (offset 169) */
+   /* _mesa_function_pool[29772]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[29796]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[29789]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[29841]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[29834]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[29866]: Materiali (offset 171) */
+   /* _mesa_function_pool[29859]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[29883]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[29876]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[29909]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[29902]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[29944]: Indexsv (offset 51) */
+   /* _mesa_function_pool[29937]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[29957]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[29950]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[30002]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[29995]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[30021]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[30014]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[30038]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[30031]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[30071]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[30064]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[30089]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[30082]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[30126]: Translated (offset 303) */
+   /* _mesa_function_pool[30119]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[30144]: Translatef (offset 304) */
+   /* _mesa_function_pool[30137]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[30162]: Uniform3uiEXT (will be remapped) */
+   /* _mesa_function_pool[30155]: Uniform3uiEXT (will be remapped) */
    "iiii\0"
    "glUniform3uiEXT\0"
    "glUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[30197]: StencilMask (offset 209) */
+   /* _mesa_function_pool[30190]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[30214]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[30207]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[30234]: ClampColorARB (will be remapped) */
+   /* _mesa_function_pool[30227]: ClampColorARB (will be remapped) */
    "ii\0"
    "glClampColorARB\0"
    "\0"
-   /* _mesa_function_pool[30254]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[30247]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[30272]: GetSamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[30265]: GetSamplerParameterIiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[30302]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[30295]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[30328]: IsList (offset 287) */
+   /* _mesa_function_pool[30321]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[30340]: IsSync (will be remapped) */
+   /* _mesa_function_pool[30333]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[30352]: RenderMode (offset 196) */
+   /* _mesa_function_pool[30345]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[30368]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[30361]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[30401]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[30394]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "\0"
-   /* _mesa_function_pool[30453]: ClearBufferiv (will be remapped) */
+   /* _mesa_function_pool[30446]: ClearBufferiv (will be remapped) */
    "iip\0"
    "glClearBufferiv\0"
    "\0"
-   /* _mesa_function_pool[30474]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[30467]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[30511]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[30504]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[30539]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[30532]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[30581]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[30574]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[30624]: LoadName (offset 198) */
+   /* _mesa_function_pool[30617]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[30638]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[30631]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[30665]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[30658]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[30683]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[30676]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[30717]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[30710]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[30768]: CullFace (offset 152) */
+   /* _mesa_function_pool[30761]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[30782]: BindTexture (offset 307) */
+   /* _mesa_function_pool[30775]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[30817]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[30810]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[30844]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[30837]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[30890]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[30883]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[30916]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[30909]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[30935]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[30928]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[30955]: Rectsv (offset 93) */
+   /* _mesa_function_pool[30948]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[30968]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[30961]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[30995]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[30988]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[31053]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[31046]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[31079]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[31072]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[31142]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[31135]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[31197]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[31190]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[31224]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[31217]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[31245]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[31238]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[31267]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[31260]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[31295]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[31288]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[31319]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[31312]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[31364]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[31357]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[31383]: VertexAttribI3uivEXT (will be remapped) */
+   /* _mesa_function_pool[31376]: VertexAttribI3uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3uivEXT\0"
    "glVertexAttribI3uiv\0"
    "\0"
-   /* _mesa_function_pool[31430]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[31423]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[31457]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[31450]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[31473]: Recti (offset 90) */
+   /* _mesa_function_pool[31466]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[31487]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[31480]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[31509]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[31502]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[31548]: SamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[31541]: SamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[31576]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[31569]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[31605]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[31598]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[31644]: PixelTransformParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[31637]: PixelTransformParameterfvEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[31680]: PrimitiveRestartNV (will be remapped) */
+   /* _mesa_function_pool[31673]: PrimitiveRestartNV (will be remapped) */
    "\0"
    "glPrimitiveRestartNV\0"
    "\0"
-   /* _mesa_function_pool[31703]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[31696]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[31725]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[31718]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[31746]: Rectf (offset 88) */
+   /* _mesa_function_pool[31739]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[31760]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[31753]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[31783]: Indexfv (offset 47) */
+   /* _mesa_function_pool[31776]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[31796]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[31789]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[31842]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[31835]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[31894]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[31887]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[31929]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[31922]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[31949]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[31942]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[31976]: IndexMask (offset 212) */
+   /* _mesa_function_pool[31969]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[31991]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[31984]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[32028]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[32021]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[32071]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[32064]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[32087]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[32080]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[32113]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[32106]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[32132]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[32125]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[32154]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[32147]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[32173]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[32166]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[32190]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[32183]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[32217]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[32210]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[32231]: Fogfv (offset 154) */
+   /* _mesa_function_pool[32224]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[32243]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[32236]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[32277]: InitNames (offset 197) */
+   /* _mesa_function_pool[32270]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[32291]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[32284]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[32306]: Minmax (offset 368) */
+   /* _mesa_function_pool[32299]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[32332]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[32325]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[32351]: DeformationMap3dSGIX (dynamic) */
+   /* _mesa_function_pool[32344]: DeformationMap3dSGIX (dynamic) */
    "iddiiddiiddiip\0"
    "glDeformationMap3dSGIX\0"
    "\0"
-   /* _mesa_function_pool[32390]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[32383]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[32409]: FogCoorddvEXT (will be remapped) */
+   /* _mesa_function_pool[32402]: FogCoorddvEXT (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[32441]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[32434]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[32463]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[32456]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[32493]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[32486]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[32513]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[32506]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[32531]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[32524]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[32568]: Hint (offset 158) */
+   /* _mesa_function_pool[32561]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[32579]: Color4dv (offset 28) */
+   /* _mesa_function_pool[32572]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[32593]: VertexAttrib2svARB (will be remapped) */
+   /* _mesa_function_pool[32586]: VertexAttrib2svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[32636]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[32629]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[32665]: WindowPos3svMESA (will be remapped) */
+   /* _mesa_function_pool[32658]: WindowPos3svMESA (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[32720]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[32713]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[32770]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[32763]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[32788]: DeleteRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[32781]: DeleteRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[32839]: VertexAttrib4NubvARB (will be remapped) */
+   /* _mesa_function_pool[32832]: VertexAttrib4NubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[32886]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[32879]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[32910]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[32903]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[32941]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[32934]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[32956]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[32949]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[32991]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[32984]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[33008]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[33001]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[33028]: Begin (offset 7) */
+   /* _mesa_function_pool[33021]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[33039]: LightModeli (offset 165) */
+   /* _mesa_function_pool[33032]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[33057]: VertexAttribI4ivEXT (will be remapped) */
+   /* _mesa_function_pool[33050]: VertexAttribI4ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ivEXT\0"
    "glVertexAttribI4iv\0"
    "\0"
-   /* _mesa_function_pool[33102]: Rectfv (offset 89) */
+   /* _mesa_function_pool[33095]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[33115]: LightModelf (offset 163) */
+   /* _mesa_function_pool[33108]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[33133]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[33126]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[33158]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[33151]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[33176]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[33169]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[33212]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[33205]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[33238]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[33231]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[33261]: GetCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[33254]: GetCombinerInputParameterivNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[33300]: Disable (offset 214) */
+   /* _mesa_function_pool[33293]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[33313]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[33306]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[33358]: GetRenderbufferParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[33351]: GetRenderbufferParameterivEXT (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[33424]: CombinerParameterivNV (will be remapped) */
+   /* _mesa_function_pool[33417]: CombinerParameterivNV (will be remapped) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[33452]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[33445]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[33479]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[33472]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[33513]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[33506]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[33532]: GetVertexAttribIivEXT (will be remapped) */
+   /* _mesa_function_pool[33525]: GetVertexAttribIivEXT (will be remapped) */
    "iip\0"
    "glGetVertexAttribIivEXT\0"
    "glGetVertexAttribIiv\0"
    "\0"
-   /* _mesa_function_pool[33582]: VertexAttrib2sARB (will be remapped) */
+   /* _mesa_function_pool[33575]: VertexAttrib2sARB (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[33624]: GetnTexImageARB (will be remapped) */
+   /* _mesa_function_pool[33617]: GetnTexImageARB (will be remapped) */
    "iiiiip\0"
    "glGetnTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[33650]: ColorMask (offset 210) */
+   /* _mesa_function_pool[33643]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[33668]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[33661]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[33693]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[33686]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[33712]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[33705]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[33742]: BindBufferARB (will be remapped) */
+   /* _mesa_function_pool[33735]: BindBufferARB (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[33775]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[33768]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[33797]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[33790]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[33815]: Enable (offset 215) */
+   /* _mesa_function_pool[33808]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[33827]: LineStipple (offset 167) */
+   /* _mesa_function_pool[33820]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[33845]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[33838]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[33871]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[33864]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[33901]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[33894]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[33928]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[33921]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[33982]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[33975]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[34025]: GenBuffersARB (will be remapped) */
+   /* _mesa_function_pool[34018]: GenBuffersARB (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[34058]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[34051]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[34084]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[34077]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[34099]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[34092]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[34130]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[34123]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[34151]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[34144]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[34181]: IsRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[34174]: IsRenderbufferEXT (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[34221]: GenProgramsNV (will be remapped) */
+   /* _mesa_function_pool[34214]: GenProgramsNV (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[34258]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[34251]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[34282]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[34275]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[34307]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[34300]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[34328]: WindowPos2fMESA (will be remapped) */
+   /* _mesa_function_pool[34321]: WindowPos2fMESA (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
@@ -4936,526 +4933,526 @@ static const char _mesa_function_pool[] =
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
    {  1590, AttachShader_remap_index },
-   { 10243, CreateProgram_remap_index },
-   { 23919, CreateShader_remap_index },
-   { 26443, DeleteProgram_remap_index },
-   { 19399, DeleteShader_remap_index },
-   { 24412, DetachShader_remap_index },
-   { 18646, GetAttachedShaders_remap_index },
-   {  5053, GetProgramInfoLog_remap_index },
+   { 10272, CreateProgram_remap_index },
+   { 23912, CreateShader_remap_index },
+   { 26436, DeleteProgram_remap_index },
+   { 19392, DeleteShader_remap_index },
+   { 24405, DetachShader_remap_index },
+   { 18639, GetAttachedShaders_remap_index },
+   {  5082, GetProgramInfoLog_remap_index },
    {   405, GetProgramiv_remap_index },
-   {  6861, GetShaderInfoLog_remap_index },
-   { 32113, GetShaderiv_remap_index },
-   { 13776, IsProgram_remap_index },
-   { 12667, IsShader_remap_index },
-   { 10373, StencilFuncSeparate_remap_index },
-   {  4031, StencilMaskSeparate_remap_index },
-   {  7926, StencilOpSeparate_remap_index },
-   { 23153, UniformMatrix2x3fv_remap_index },
+   {  6890, GetShaderInfoLog_remap_index },
+   { 32106, GetShaderiv_remap_index },
+   { 13769, IsProgram_remap_index },
+   { 12696, IsShader_remap_index },
+   { 10402, StencilFuncSeparate_remap_index },
+   {  4060, StencilMaskSeparate_remap_index },
+   {  7955, StencilOpSeparate_remap_index },
+   { 23146, UniformMatrix2x3fv_remap_index },
    {  2920, UniformMatrix2x4fv_remap_index },
-   { 33901, UniformMatrix3x2fv_remap_index },
-   { 31430, UniformMatrix3x4fv_remap_index },
-   { 16766, UniformMatrix4x2fv_remap_index },
-   {  3339, UniformMatrix4x3fv_remap_index },
-   {  5259, ClampColor_remap_index },
-   { 18700, ClearBufferfi_remap_index },
-   { 18116, ClearBufferfv_remap_index },
-   { 30453, ClearBufferiv_remap_index },
-   { 13981, ClearBufferuiv_remap_index },
-   { 20736, GetStringi_remap_index },
+   { 33894, UniformMatrix3x2fv_remap_index },
+   { 31423, UniformMatrix3x4fv_remap_index },
+   { 16759, UniformMatrix4x2fv_remap_index },
+   {  3368, UniformMatrix4x3fv_remap_index },
+   {  5288, ClampColor_remap_index },
+   { 18693, ClearBufferfi_remap_index },
+   { 18109, ClearBufferfv_remap_index },
+   { 30446, ClearBufferiv_remap_index },
+   { 13974, ClearBufferuiv_remap_index },
+   { 20729, GetStringi_remap_index },
    {  2861, TexBuffer_remap_index },
    {   938, FramebufferTexture_remap_index },
-   { 27479, GetBufferParameteri64v_remap_index },
-   { 10473, GetInteger64i_v_remap_index },
-   { 24233, VertexAttribDivisor_remap_index },
-   { 10261, LoadTransposeMatrixdARB_remap_index },
-   { 31842, LoadTransposeMatrixfARB_remap_index },
-   {  5898, MultTransposeMatrixdARB_remap_index },
-   { 24599, MultTransposeMatrixfARB_remap_index },
+   { 27472, GetBufferParameteri64v_remap_index },
+   { 10502, GetInteger64i_v_remap_index },
+   { 24226, VertexAttribDivisor_remap_index },
+   { 10290, LoadTransposeMatrixdARB_remap_index },
+   { 31835, LoadTransposeMatrixfARB_remap_index },
+   {  5927, MultTransposeMatrixdARB_remap_index },
+   { 24592, MultTransposeMatrixfARB_remap_index },
    {   216, SampleCoverageARB_remap_index },
-   {  6124, CompressedTexImage1DARB_remap_index },
-   { 25127, CompressedTexImage2DARB_remap_index },
-   {  4094, CompressedTexImage3DARB_remap_index },
-   { 18988, CompressedTexSubImage1DARB_remap_index },
+   {  6153, CompressedTexImage1DARB_remap_index },
+   { 25120, CompressedTexImage2DARB_remap_index },
+   {  4123, CompressedTexImage3DARB_remap_index },
+   { 18981, CompressedTexSubImage1DARB_remap_index },
    {  2102, CompressedTexSubImage2DARB_remap_index },
-   { 21158, CompressedTexSubImage3DARB_remap_index },
-   { 29559, GetCompressedTexImageARB_remap_index },
-   {  3905, DisableVertexAttribArrayARB_remap_index },
-   { 30995, EnableVertexAttribArrayARB_remap_index },
-   { 32956, GetProgramEnvParameterdvARB_remap_index },
-   { 24479, GetProgramEnvParameterfvARB_remap_index },
-   { 28476, GetProgramLocalParameterdvARB_remap_index },
-   {  8402, GetProgramLocalParameterfvARB_remap_index },
-   { 19164, GetProgramStringARB_remap_index },
-   { 28671, GetProgramivARB_remap_index },
-   { 21353, GetVertexAttribdvARB_remap_index },
-   { 16574, GetVertexAttribfvARB_remap_index },
-   { 10077, GetVertexAttribivARB_remap_index },
-   { 20199, ProgramEnvParameter4dARB_remap_index },
-   { 26193, ProgramEnvParameter4dvARB_remap_index },
-   { 17414, ProgramEnvParameter4fARB_remap_index },
-   {  9277, ProgramEnvParameter4fvARB_remap_index },
-   {  4057, ProgramLocalParameter4dARB_remap_index },
-   { 13486, ProgramLocalParameter4dvARB_remap_index },
-   { 30474, ProgramLocalParameter4fARB_remap_index },
-   { 26839, ProgramLocalParameter4fvARB_remap_index },
-   { 29313, ProgramStringARB_remap_index },
-   { 20467, VertexAttrib1dARB_remap_index },
-   { 16201, VertexAttrib1dvARB_remap_index },
-   {  4253, VertexAttrib1fARB_remap_index },
-   { 33982, VertexAttrib1fvARB_remap_index },
-   {  7452, VertexAttrib1sARB_remap_index },
+   { 21151, CompressedTexSubImage3DARB_remap_index },
+   { 29552, GetCompressedTexImageARB_remap_index },
+   {  3934, DisableVertexAttribArrayARB_remap_index },
+   { 30988, EnableVertexAttribArrayARB_remap_index },
+   { 32949, GetProgramEnvParameterdvARB_remap_index },
+   { 24472, GetProgramEnvParameterfvARB_remap_index },
+   { 28469, GetProgramLocalParameterdvARB_remap_index },
+   {  8431, GetProgramLocalParameterfvARB_remap_index },
+   { 19157, GetProgramStringARB_remap_index },
+   { 28664, GetProgramivARB_remap_index },
+   { 21346, GetVertexAttribdvARB_remap_index },
+   { 16567, GetVertexAttribfvARB_remap_index },
+   { 10106, GetVertexAttribivARB_remap_index },
+   { 20192, ProgramEnvParameter4dARB_remap_index },
+   { 26186, ProgramEnvParameter4dvARB_remap_index },
+   { 17407, ProgramEnvParameter4fARB_remap_index },
+   {  9306, ProgramEnvParameter4fvARB_remap_index },
+   {  4086, ProgramLocalParameter4dARB_remap_index },
+   { 13479, ProgramLocalParameter4dvARB_remap_index },
+   { 30467, ProgramLocalParameter4fARB_remap_index },
+   { 26832, ProgramLocalParameter4fvARB_remap_index },
+   { 29306, ProgramStringARB_remap_index },
+   { 20460, VertexAttrib1dARB_remap_index },
+   { 16194, VertexAttrib1dvARB_remap_index },
+   {  4282, VertexAttrib1fARB_remap_index },
+   { 33975, VertexAttrib1fvARB_remap_index },
+   {  7481, VertexAttrib1sARB_remap_index },
    {  2297, VertexAttrib1svARB_remap_index },
-   { 15632, VertexAttrib2dARB_remap_index },
-   { 18137, VertexAttrib2dvARB_remap_index },
+   { 15625, VertexAttrib2dARB_remap_index },
+   { 18130, VertexAttrib2dvARB_remap_index },
    {  1648, VertexAttrib2fARB_remap_index },
-   { 18250, VertexAttrib2fvARB_remap_index },
-   { 33582, VertexAttrib2sARB_remap_index },
-   { 32593, VertexAttrib2svARB_remap_index },
-   { 11651, VertexAttrib3dARB_remap_index },
-   {  8944, VertexAttrib3dvARB_remap_index },
+   { 18243, VertexAttrib2fvARB_remap_index },
+   { 33575, VertexAttrib2sARB_remap_index },
+   { 32586, VertexAttrib2svARB_remap_index },
+   { 11680, VertexAttrib3dARB_remap_index },
+   {  8973, VertexAttrib3dvARB_remap_index },
    {  1735, VertexAttrib3fARB_remap_index },
-   { 23470, VertexAttrib3fvARB_remap_index },
-   { 29160, VertexAttrib3sARB_remap_index },
-   { 21095, VertexAttrib3svARB_remap_index },
-   {  5079, VertexAttrib4NbvARB_remap_index },
-   { 18523, VertexAttrib4NivARB_remap_index },
-   { 23425, VertexAttrib4NsvARB_remap_index },
-   { 24431, VertexAttrib4NubARB_remap_index },
-   { 32839, VertexAttrib4NubvARB_remap_index },
-   { 19850, VertexAttrib4NuivARB_remap_index },
-   {  3212, VertexAttrib4NusvARB_remap_index },
-   { 11240, VertexAttrib4bvARB_remap_index },
-   { 27849, VertexAttrib4dARB_remap_index },
-   { 22152, VertexAttrib4dvARB_remap_index },
-   { 11805, VertexAttrib4fARB_remap_index },
-   { 12209, VertexAttrib4fvARB_remap_index },
-   { 10616, VertexAttrib4ivARB_remap_index },
-   { 17930, VertexAttrib4sARB_remap_index },
-   { 32028, VertexAttrib4svARB_remap_index },
-   { 17219, VertexAttrib4ubvARB_remap_index },
-   { 31319, VertexAttrib4uivARB_remap_index },
-   { 20906, VertexAttrib4usvARB_remap_index },
-   { 22968, VertexAttribPointerARB_remap_index },
-   { 33742, BindBufferARB_remap_index },
-   {  7159, BufferDataARB_remap_index },
+   { 23463, VertexAttrib3fvARB_remap_index },
+   { 29153, VertexAttrib3sARB_remap_index },
+   { 21088, VertexAttrib3svARB_remap_index },
+   {  5108, VertexAttrib4NbvARB_remap_index },
+   { 18516, VertexAttrib4NivARB_remap_index },
+   { 23418, VertexAttrib4NsvARB_remap_index },
+   { 24424, VertexAttrib4NubARB_remap_index },
+   { 32832, VertexAttrib4NubvARB_remap_index },
+   { 19843, VertexAttrib4NuivARB_remap_index },
+   {  3241, VertexAttrib4NusvARB_remap_index },
+   { 11269, VertexAttrib4bvARB_remap_index },
+   { 27842, VertexAttrib4dARB_remap_index },
+   { 22145, VertexAttrib4dvARB_remap_index },
+   { 11834, VertexAttrib4fARB_remap_index },
+   { 12238, VertexAttrib4fvARB_remap_index },
+   { 10645, VertexAttrib4ivARB_remap_index },
+   { 17923, VertexAttrib4sARB_remap_index },
+   { 32021, VertexAttrib4svARB_remap_index },
+   { 17212, VertexAttrib4ubvARB_remap_index },
+   { 31312, VertexAttrib4uivARB_remap_index },
+   { 20899, VertexAttrib4usvARB_remap_index },
+   { 22961, VertexAttribPointerARB_remap_index },
+   { 33735, BindBufferARB_remap_index },
+   {  7188, BufferDataARB_remap_index },
    {  1511, BufferSubDataARB_remap_index },
-   { 31605, DeleteBuffersARB_remap_index },
-   { 34025, GenBuffersARB_remap_index },
-   { 18293, GetBufferParameterivARB_remap_index },
-   { 17366, GetBufferPointervARB_remap_index },
+   { 31598, DeleteBuffersARB_remap_index },
+   { 34018, GenBuffersARB_remap_index },
+   { 18286, GetBufferParameterivARB_remap_index },
+   { 17359, GetBufferPointervARB_remap_index },
    {  1464, GetBufferSubDataARB_remap_index },
-   { 31267, IsBufferARB_remap_index },
-   { 27323, MapBufferARB_remap_index },
-   { 32243, UnmapBufferARB_remap_index },
+   { 31260, IsBufferARB_remap_index },
+   { 27316, MapBufferARB_remap_index },
+   { 32236, UnmapBufferARB_remap_index },
    {   312, BeginQueryARB_remap_index },
-   { 20562, DeleteQueriesARB_remap_index },
-   { 12528, EndQueryARB_remap_index },
-   { 30038, GenQueriesARB_remap_index },
+   { 20555, DeleteQueriesARB_remap_index },
+   { 12557, EndQueryARB_remap_index },
+   { 30031, GenQueriesARB_remap_index },
    {  1994, GetQueryObjectivARB_remap_index },
-   { 17974, GetQueryObjectuivARB_remap_index },
+   { 17967, GetQueryObjectuivARB_remap_index },
    {  1792, GetQueryivARB_remap_index },
-   { 20813, IsQueryARB_remap_index },
-   {  8554, AttachObjectARB_remap_index },
-   { 19361, CompileShaderARB_remap_index },
-   {  3281, CreateProgramObjectARB_remap_index },
-   {  7104, CreateShaderObjectARB_remap_index },
-   { 14934, DeleteObjectARB_remap_index },
-   { 24918, DetachObjectARB_remap_index },
-   { 12273, GetActiveUniformARB_remap_index },
-   {  9752, GetAttachedObjectsARB_remap_index },
-   { 10059, GetHandleARB_remap_index },
-   { 33775, GetInfoLogARB_remap_index },
-   { 32910, GetObjectParameterfvARB_remap_index },
-   { 28350, GetObjectParameterivARB_remap_index },
-   { 29796, GetShaderSourceARB_remap_index },
-   { 29020, GetUniformLocationARB_remap_index },
-   { 24701, GetUniformfvARB_remap_index },
-   { 13061, GetUniformivARB_remap_index },
-   { 20951, LinkProgramARB_remap_index },
-   { 21009, ShaderSourceARB_remap_index },
-   {  7826, Uniform1fARB_remap_index },
-   { 30683, Uniform1fvARB_remap_index },
-   { 22916, Uniform1iARB_remap_index },
-   { 21806, Uniform1ivARB_remap_index },
+   { 20806, IsQueryARB_remap_index },
+   {  8583, AttachObjectARB_remap_index },
+   { 19354, CompileShaderARB_remap_index },
+   {  3310, CreateProgramObjectARB_remap_index },
+   {  7133, CreateShaderObjectARB_remap_index },
+   { 14927, DeleteObjectARB_remap_index },
+   { 24911, DetachObjectARB_remap_index },
+   { 12302, GetActiveUniformARB_remap_index },
+   {  9781, GetAttachedObjectsARB_remap_index },
+   { 10088, GetHandleARB_remap_index },
+   { 33768, GetInfoLogARB_remap_index },
+   { 32903, GetObjectParameterfvARB_remap_index },
+   { 28343, GetObjectParameterivARB_remap_index },
+   { 29789, GetShaderSourceARB_remap_index },
+   { 29013, GetUniformLocationARB_remap_index },
+   { 24694, GetUniformfvARB_remap_index },
+   { 13054, GetUniformivARB_remap_index },
+   { 20944, LinkProgramARB_remap_index },
+   { 21002, ShaderSourceARB_remap_index },
+   {  7855, Uniform1fARB_remap_index },
+   { 30676, Uniform1fvARB_remap_index },
+   { 22909, Uniform1iARB_remap_index },
+   { 21799, Uniform1ivARB_remap_index },
    {  2246, Uniform2fARB_remap_index },
-   { 14770, Uniform2fvARB_remap_index },
-   { 27210, Uniform2iARB_remap_index },
+   { 14763, Uniform2fvARB_remap_index },
+   { 27203, Uniform2iARB_remap_index },
    {  2366, Uniform2ivARB_remap_index },
-   { 19471, Uniform3fARB_remap_index },
-   {  9782, Uniform3fvARB_remap_index },
-   {  6715, Uniform3iARB_remap_index },
-   { 17472, Uniform3ivARB_remap_index },
-   { 20005, Uniform4fARB_remap_index },
-   { 24565, Uniform4fvARB_remap_index },
-   { 25827, Uniform4iARB_remap_index },
-   { 21319, Uniform4ivARB_remap_index },
-   {  8606, UniformMatrix2fvARB_remap_index },
+   { 19464, Uniform3fARB_remap_index },
+   {  9811, Uniform3fvARB_remap_index },
+   {  6744, Uniform3iARB_remap_index },
+   { 17465, Uniform3ivARB_remap_index },
+   { 19998, Uniform4fARB_remap_index },
+   { 24558, Uniform4fvARB_remap_index },
+   { 25820, Uniform4iARB_remap_index },
+   { 21312, Uniform4ivARB_remap_index },
+   {  8635, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
    {  2763, UniformMatrix4fvARB_remap_index },
-   { 26305, UseProgramObjectARB_remap_index },
-   { 15320, ValidateProgramARB_remap_index },
-   { 22195, BindAttribLocationARB_remap_index },
-   {  5124, GetActiveAttribARB_remap_index },
-   { 17086, GetAttribLocationARB_remap_index },
-   { 30401, DrawBuffersARB_remap_index },
-   { 30234, ClampColorARB_remap_index },
-   { 18568, DrawArraysInstancedARB_remap_index },
-   {  6776, DrawElementsInstancedARB_remap_index },
-   { 13591, RenderbufferStorageMultisample_remap_index },
-   { 14062, FramebufferTextureARB_remap_index },
-   { 26741, FramebufferTextureFaceARB_remap_index },
-   { 25067, ProgramParameteriARB_remap_index },
-   {  6296, VertexAttribDivisorARB_remap_index },
-   { 20053, FlushMappedBufferRange_remap_index },
-   { 28787, MapBufferRange_remap_index },
-   { 28694, TexBufferARB_remap_index },
-   { 16904, BindVertexArray_remap_index },
-   { 15143, GenVertexArrays_remap_index },
-   { 31197, CopyBufferSubData_remap_index },
-   { 32132, ClientWaitSync_remap_index },
+   { 26298, UseProgramObjectARB_remap_index },
+   { 15313, ValidateProgramARB_remap_index },
+   { 22188, BindAttribLocationARB_remap_index },
+   {  5153, GetActiveAttribARB_remap_index },
+   { 17079, GetAttribLocationARB_remap_index },
+   { 30394, DrawBuffersARB_remap_index },
+   { 30227, ClampColorARB_remap_index },
+   { 18561, DrawArraysInstancedARB_remap_index },
+   {  6805, DrawElementsInstancedARB_remap_index },
+   { 13584, RenderbufferStorageMultisample_remap_index },
+   { 14055, FramebufferTextureARB_remap_index },
+   { 26734, FramebufferTextureFaceARB_remap_index },
+   { 25060, ProgramParameteriARB_remap_index },
+   {  6325, VertexAttribDivisorARB_remap_index },
+   { 20046, FlushMappedBufferRange_remap_index },
+   { 28780, MapBufferRange_remap_index },
+   { 28687, TexBufferARB_remap_index },
+   { 16897, BindVertexArray_remap_index },
+   { 15136, GenVertexArrays_remap_index },
+   { 31190, CopyBufferSubData_remap_index },
+   { 32125, ClientWaitSync_remap_index },
    {  2682, DeleteSync_remap_index },
-   {  7493, FenceSync_remap_index },
-   { 15691, GetInteger64v_remap_index },
-   { 23532, GetSynciv_remap_index },
-   { 30340, IsSync_remap_index },
-   {  9700, WaitSync_remap_index },
-   {  3873, DrawElementsBaseVertex_remap_index },
-   { 19216, DrawElementsInstancedBaseVertex_remap_index },
-   { 31509, DrawRangeElementsBaseVertex_remap_index },
-   { 27354, MultiDrawElementsBaseVertex_remap_index },
-   { 17152, BlendEquationSeparateiARB_remap_index },
-   { 18386, BlendEquationiARB_remap_index },
-   { 13000, BlendFuncSeparateiARB_remap_index },
-   { 10125, BlendFunciARB_remap_index },
-   {  8468, BindSampler_remap_index },
-   {  4232, DeleteSamplers_remap_index },
-   { 20426, GenSamplers_remap_index },
-   { 30272, GetSamplerParameterIiv_remap_index },
-   { 19947, GetSamplerParameterIuiv_remap_index },
-   {  4973, GetSamplerParameterfv_remap_index },
-   { 26462, GetSamplerParameteriv_remap_index },
-   { 14688, IsSampler_remap_index },
-   { 16857, SamplerParameterIiv_remap_index },
-   { 31548, SamplerParameterIuiv_remap_index },
-   { 23205, SamplerParameterf_remap_index },
-   { 17013, SamplerParameterfv_remap_index },
-   { 23180, SamplerParameteri_remap_index },
-   { 18762, SamplerParameteriv_remap_index },
-   {  5320, BindTransformFeedback_remap_index },
-   {  3308, DeleteTransformFeedbacks_remap_index },
-   {  6748, DrawTransformFeedback_remap_index },
-   {  9919, GenTransformFeedbacks_remap_index },
-   { 29203, IsTransformFeedback_remap_index },
-   { 26934, PauseTransformFeedback_remap_index },
-   {  5783, ResumeTransformFeedback_remap_index },
-   { 22515, ClearDepthf_remap_index },
-   {  7052, DepthRangef_remap_index },
-   { 14955, GetShaderPrecisionFormat_remap_index },
-   { 10313, ReleaseShaderCompiler_remap_index },
-   { 11283, ShaderBinary_remap_index },
+   {  7522, FenceSync_remap_index },
+   { 15684, GetInteger64v_remap_index },
+   { 23525, GetSynciv_remap_index },
+   { 30333, IsSync_remap_index },
+   {  9729, WaitSync_remap_index },
+   {  3902, DrawElementsBaseVertex_remap_index },
+   { 19209, DrawElementsInstancedBaseVertex_remap_index },
+   { 31502, DrawRangeElementsBaseVertex_remap_index },
+   { 27347, MultiDrawElementsBaseVertex_remap_index },
+   { 17145, BlendEquationSeparateiARB_remap_index },
+   { 18379, BlendEquationiARB_remap_index },
+   { 12993, BlendFuncSeparateiARB_remap_index },
+   { 10154, BlendFunciARB_remap_index },
+   {  8497, BindSampler_remap_index },
+   {  4261, DeleteSamplers_remap_index },
+   { 20419, GenSamplers_remap_index },
+   { 30265, GetSamplerParameterIiv_remap_index },
+   { 19940, GetSamplerParameterIuiv_remap_index },
+   {  5002, GetSamplerParameterfv_remap_index },
+   { 26455, GetSamplerParameteriv_remap_index },
+   { 14681, IsSampler_remap_index },
+   { 16850, SamplerParameterIiv_remap_index },
+   { 31541, SamplerParameterIuiv_remap_index },
+   { 23198, SamplerParameterf_remap_index },
+   { 17006, SamplerParameterfv_remap_index },
+   { 23173, SamplerParameteri_remap_index },
+   { 18755, SamplerParameteriv_remap_index },
+   {  5349, BindTransformFeedback_remap_index },
+   {  3337, DeleteTransformFeedbacks_remap_index },
+   {  6777, DrawTransformFeedback_remap_index },
+   {  9948, GenTransformFeedbacks_remap_index },
+   { 29196, IsTransformFeedback_remap_index },
+   { 26927, PauseTransformFeedback_remap_index },
+   {  5812, ResumeTransformFeedback_remap_index },
+   { 22508, ClearDepthf_remap_index },
+   {  7081, DepthRangef_remap_index },
+   { 14948, GetShaderPrecisionFormat_remap_index },
+   { 10342, ReleaseShaderCompiler_remap_index },
+   { 11312, ShaderBinary_remap_index },
    {   965, GetGraphicsResetStatusARB_remap_index },
-   { 25632, GetnColorTableARB_remap_index },
-   {  8237, GetnCompressedTexImageARB_remap_index },
-   {  3965, GetnConvolutionFilterARB_remap_index },
-   { 16244, GetnHistogramARB_remap_index },
-   { 24391, GetnMapdvARB_remap_index },
-   { 22947, GetnMapfvARB_remap_index },
+   { 25625, GetnColorTableARB_remap_index },
+   {  8266, GetnCompressedTexImageARB_remap_index },
+   {  3994, GetnConvolutionFilterARB_remap_index },
+   { 16237, GetnHistogramARB_remap_index },
+   { 24384, GetnMapdvARB_remap_index },
+   { 22940, GetnMapfvARB_remap_index },
    {  2225, GetnMapivARB_remap_index },
-   { 17734, GetnMinmaxARB_remap_index },
-   {  4598, GetnPixelMapfvARB_remap_index },
-   { 19824, GetnPixelMapuivARB_remap_index },
+   { 17727, GetnMinmaxARB_remap_index },
+   {  4627, GetnPixelMapfvARB_remap_index },
+   { 19817, GetnPixelMapuivARB_remap_index },
    {  3033, GetnPixelMapusvARB_remap_index },
    {  1344, GetnPolygonStippleARB_remap_index },
-   { 21980, GetnSeparableFilterARB_remap_index },
-   { 33624, GetnTexImageARB_remap_index },
-   { 19191, GetnUniformdvARB_remap_index },
-   {  4670, GetnUniformfvARB_remap_index },
-   { 10168, GetnUniformivARB_remap_index },
-   { 23381, GetnUniformuivARB_remap_index },
+   { 21973, GetnSeparableFilterARB_remap_index },
+   { 33617, GetnTexImageARB_remap_index },
+   { 19184, GetnUniformdvARB_remap_index },
+   {  4699, GetnUniformfvARB_remap_index },
+   { 10197, GetnUniformivARB_remap_index },
+   { 23374, GetnUniformuivARB_remap_index },
    {  2947, ReadnPixelsARB_remap_index },
-   {  5651, PolygonOffsetEXT_remap_index },
-   { 24154, GetPixelTexGenParameterfvSGIS_remap_index },
-   {  4548, GetPixelTexGenParameterivSGIS_remap_index },
-   { 23887, PixelTexGenParameterfSGIS_remap_index },
+   {  5680, PolygonOffsetEXT_remap_index },
+   { 24147, GetPixelTexGenParameterfvSGIS_remap_index },
+   {  4577, GetPixelTexGenParameterivSGIS_remap_index },
+   { 23880, PixelTexGenParameterfSGIS_remap_index },
    {   624, PixelTexGenParameterfvSGIS_remap_index },
-   { 13099, PixelTexGenParameteriSGIS_remap_index },
-   { 14236, PixelTexGenParameterivSGIS_remap_index },
-   { 18887, SampleMaskSGIS_remap_index },
-   { 20753, SamplePatternSGIS_remap_index },
-   { 27283, ColorPointerEXT_remap_index },
-   { 18180, EdgeFlagPointerEXT_remap_index },
-   {  6369, IndexPointerEXT_remap_index },
-   {  6449, NormalPointerEXT_remap_index },
-   { 16312, TexCoordPointerEXT_remap_index },
-   {  7282, VertexPointerEXT_remap_index },
-   {  3675, PointParameterfEXT_remap_index },
-   {  8133, PointParameterfvEXT_remap_index },
-   { 33008, LockArraysEXT_remap_index },
-   { 15384, UnlockArraysEXT_remap_index },
+   { 13092, PixelTexGenParameteriSGIS_remap_index },
+   { 14229, PixelTexGenParameterivSGIS_remap_index },
+   { 18880, SampleMaskSGIS_remap_index },
+   { 20746, SamplePatternSGIS_remap_index },
+   { 27276, ColorPointerEXT_remap_index },
+   { 18173, EdgeFlagPointerEXT_remap_index },
+   {  6398, IndexPointerEXT_remap_index },
+   {  6478, NormalPointerEXT_remap_index },
+   { 16305, TexCoordPointerEXT_remap_index },
+   {  7311, VertexPointerEXT_remap_index },
+   {  3704, PointParameterfEXT_remap_index },
+   {  8162, PointParameterfvEXT_remap_index },
+   { 33001, LockArraysEXT_remap_index },
+   { 15377, UnlockArraysEXT_remap_index },
    {  1252, SecondaryColor3bEXT_remap_index },
-   {  8326, SecondaryColor3bvEXT_remap_index },
-   { 10793, SecondaryColor3dEXT_remap_index },
-   { 26511, SecondaryColor3dvEXT_remap_index },
-   { 29069, SecondaryColor3fEXT_remap_index },
-   { 18924, SecondaryColor3fvEXT_remap_index },
+   {  8355, SecondaryColor3bvEXT_remap_index },
+   { 10822, SecondaryColor3dEXT_remap_index },
+   { 26504, SecondaryColor3dvEXT_remap_index },
+   { 29062, SecondaryColor3fEXT_remap_index },
+   { 18917, SecondaryColor3fvEXT_remap_index },
    {   470, SecondaryColor3iEXT_remap_index },
-   { 16622, SecondaryColor3ivEXT_remap_index },
-   { 10401, SecondaryColor3sEXT_remap_index },
-   { 31796, SecondaryColor3svEXT_remap_index },
-   { 28186, SecondaryColor3ubEXT_remap_index },
-   { 22086, SecondaryColor3ubvEXT_remap_index },
-   { 13341, SecondaryColor3uiEXT_remap_index },
-   { 23774, SecondaryColor3uivEXT_remap_index },
-   { 26791, SecondaryColor3usEXT_remap_index },
-   { 13414, SecondaryColor3usvEXT_remap_index },
-   { 12152, SecondaryColorPointerEXT_remap_index },
-   { 26605, MultiDrawArraysEXT_remap_index },
-   { 21741, MultiDrawElementsEXT_remap_index },
-   { 21936, FogCoordPointerEXT_remap_index },
-   {  4721, FogCoorddEXT_remap_index },
-   { 32409, FogCoorddvEXT_remap_index },
-   {  4838, FogCoordfEXT_remap_index },
-   { 28109, FogCoordfvEXT_remap_index },
-   { 12252, PixelTexGenSGIX_remap_index },
-   { 28714, BlendFuncSeparateEXT_remap_index },
-   {  7194, FlushVertexArrayRangeNV_remap_index },
-   {  5600, VertexArrayRangeNV_remap_index },
-   { 29134, CombinerInputNV_remap_index },
+   { 16615, SecondaryColor3ivEXT_remap_index },
+   { 10430, SecondaryColor3sEXT_remap_index },
+   { 31789, SecondaryColor3svEXT_remap_index },
+   { 28179, SecondaryColor3ubEXT_remap_index },
+   { 22079, SecondaryColor3ubvEXT_remap_index },
+   { 13334, SecondaryColor3uiEXT_remap_index },
+   { 23767, SecondaryColor3uivEXT_remap_index },
+   { 26784, SecondaryColor3usEXT_remap_index },
+   { 13407, SecondaryColor3usvEXT_remap_index },
+   { 12181, SecondaryColorPointerEXT_remap_index },
+   { 26598, MultiDrawArraysEXT_remap_index },
+   { 21734, MultiDrawElementsEXT_remap_index },
+   { 21929, FogCoordPointerEXT_remap_index },
+   {  4750, FogCoorddEXT_remap_index },
+   { 32402, FogCoorddvEXT_remap_index },
+   {  4867, FogCoordfEXT_remap_index },
+   { 28102, FogCoordfvEXT_remap_index },
+   { 12281, PixelTexGenSGIX_remap_index },
+   { 28707, BlendFuncSeparateEXT_remap_index },
+   {  7223, FlushVertexArrayRangeNV_remap_index },
+   {  5629, VertexArrayRangeNV_remap_index },
+   { 29127, CombinerInputNV_remap_index },
    {  2168, CombinerOutputNV_remap_index },
-   { 31949, CombinerParameterfNV_remap_index },
-   {  5474, CombinerParameterfvNV_remap_index },
-   { 23230, CombinerParameteriNV_remap_index },
-   { 33424, CombinerParameterivNV_remap_index },
-   {  7570, FinalCombinerInputNV_remap_index },
+   { 31942, CombinerParameterfNV_remap_index },
+   {  5503, CombinerParameterfvNV_remap_index },
+   { 23223, CombinerParameteriNV_remap_index },
+   { 33417, CombinerParameterivNV_remap_index },
+   {  7599, FinalCombinerInputNV_remap_index },
    {  1609, GetCombinerInputParameterfvNV_remap_index },
-   { 33261, GetCombinerInputParameterivNV_remap_index },
-   { 14337, GetCombinerOutputParameterfvNV_remap_index },
-   { 14165, GetCombinerOutputParameterivNV_remap_index },
-   {  6956, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 25699, GetFinalCombinerInputParameterivNV_remap_index },
-   { 12978, ResizeBuffersMESA_remap_index },
-   { 11478, WindowPos2dMESA_remap_index },
+   { 33254, GetCombinerInputParameterivNV_remap_index },
+   { 14330, GetCombinerOutputParameterfvNV_remap_index },
+   { 14158, GetCombinerOutputParameterivNV_remap_index },
+   {  6985, GetFinalCombinerInputParameterfvNV_remap_index },
+   { 25692, GetFinalCombinerInputParameterivNV_remap_index },
+   { 12971, ResizeBuffersMESA_remap_index },
+   { 11507, WindowPos2dMESA_remap_index },
    {  1045, WindowPos2dvMESA_remap_index },
-   { 34328, WindowPos2fMESA_remap_index },
-   {  8271, WindowPos2fvMESA_remap_index },
-   { 18834, WindowPos2iMESA_remap_index },
-   { 21226, WindowPos2ivMESA_remap_index },
-   { 21840, WindowPos2sMESA_remap_index },
-   {  6038, WindowPos2svMESA_remap_index },
-   {  8062, WindowPos3dMESA_remap_index },
-   { 14483, WindowPos3dvMESA_remap_index },
+   { 34321, WindowPos2fMESA_remap_index },
+   {  8300, WindowPos2fvMESA_remap_index },
+   { 18827, WindowPos2iMESA_remap_index },
+   { 21219, WindowPos2ivMESA_remap_index },
+   { 21833, WindowPos2sMESA_remap_index },
+   {  6067, WindowPos2svMESA_remap_index },
+   {  8091, WindowPos3dMESA_remap_index },
+   { 14476, WindowPos3dvMESA_remap_index },
    {   516, WindowPos3fMESA_remap_index },
-   { 15445, WindowPos3fvMESA_remap_index },
-   { 24960, WindowPos3iMESA_remap_index },
-   { 31142, WindowPos3ivMESA_remap_index },
-   { 19616, WindowPos3sMESA_remap_index },
-   { 32665, WindowPos3svMESA_remap_index },
-   { 11429, WindowPos4dMESA_remap_index },
-   { 17610, WindowPos4dvMESA_remap_index },
-   { 14442, WindowPos4fMESA_remap_index },
-   { 31703, WindowPos4fvMESA_remap_index },
-   { 31295, WindowPos4iMESA_remap_index },
-   { 12781, WindowPos4ivMESA_remap_index },
-   { 19800, WindowPos4sMESA_remap_index },
-   {  3259, WindowPos4svMESA_remap_index },
-   { 14204, MultiModeDrawArraysIBM_remap_index },
-   { 29909, MultiModeDrawElementsIBM_remap_index },
-   { 12556, DeleteFencesNV_remap_index },
-   { 28981, FinishFenceNV_remap_index },
-   {  3797, GenFencesNV_remap_index },
-   { 17590, GetFenceivNV_remap_index },
-   {  8539, IsFenceNV_remap_index },
-   { 14092, SetFenceNV_remap_index },
-   {  4309, TestFenceNV_remap_index },
-   { 32636, AreProgramsResidentNV_remap_index },
-   { 31991, BindProgramNV_remap_index },
-   { 26874, DeleteProgramsNV_remap_index },
-   { 22304, ExecuteProgramNV_remap_index },
-   { 34221, GenProgramsNV_remap_index },
-   { 24259, GetProgramParameterdvNV_remap_index },
-   { 10855, GetProgramParameterfvNV_remap_index },
-   { 27257, GetProgramStringNV_remap_index },
-   { 25337, GetProgramivNV_remap_index },
-   { 24514, GetTrackMatrixivNV_remap_index },
-   { 27051, GetVertexAttribPointervNV_remap_index },
-   { 10496, GetVertexAttribdvNV_remap_index },
-   {  9595, GetVertexAttribfvNV_remap_index },
-   { 19137, GetVertexAttribivNV_remap_index },
-   { 20083, IsProgramNV_remap_index },
-   {  9678, LoadProgramNV_remap_index },
-   { 28810, ProgramParameters4dvNV_remap_index },
-   { 25267, ProgramParameters4fvNV_remap_index },
-   { 21530, RequestResidentProgramsNV_remap_index },
-   { 31487, TrackMatrixNV_remap_index },
-   { 33238, VertexAttrib1dNV_remap_index },
-   { 14003, VertexAttrib1dvNV_remap_index },
-   { 29415, VertexAttrib1fNV_remap_index },
+   { 15438, WindowPos3fvMESA_remap_index },
+   { 24953, WindowPos3iMESA_remap_index },
+   { 31135, WindowPos3ivMESA_remap_index },
+   { 19609, WindowPos3sMESA_remap_index },
+   { 32658, WindowPos3svMESA_remap_index },
+   { 11458, WindowPos4dMESA_remap_index },
+   { 17603, WindowPos4dvMESA_remap_index },
+   { 14435, WindowPos4fMESA_remap_index },
+   { 31696, WindowPos4fvMESA_remap_index },
+   { 31288, WindowPos4iMESA_remap_index },
+   { 12810, WindowPos4ivMESA_remap_index },
+   { 19793, WindowPos4sMESA_remap_index },
+   {  3288, WindowPos4svMESA_remap_index },
+   { 14197, MultiModeDrawArraysIBM_remap_index },
+   { 29902, MultiModeDrawElementsIBM_remap_index },
+   { 12585, DeleteFencesNV_remap_index },
+   { 28974, FinishFenceNV_remap_index },
+   {  3826, GenFencesNV_remap_index },
+   { 17583, GetFenceivNV_remap_index },
+   {  8568, IsFenceNV_remap_index },
+   { 14085, SetFenceNV_remap_index },
+   {  4338, TestFenceNV_remap_index },
+   { 32629, AreProgramsResidentNV_remap_index },
+   { 31984, BindProgramNV_remap_index },
+   { 26867, DeleteProgramsNV_remap_index },
+   { 22297, ExecuteProgramNV_remap_index },
+   { 34214, GenProgramsNV_remap_index },
+   { 24252, GetProgramParameterdvNV_remap_index },
+   { 10884, GetProgramParameterfvNV_remap_index },
+   { 27250, GetProgramStringNV_remap_index },
+   { 25330, GetProgramivNV_remap_index },
+   { 24507, GetTrackMatrixivNV_remap_index },
+   { 27044, GetVertexAttribPointervNV_remap_index },
+   { 10525, GetVertexAttribdvNV_remap_index },
+   {  9624, GetVertexAttribfvNV_remap_index },
+   { 19130, GetVertexAttribivNV_remap_index },
+   { 20076, IsProgramNV_remap_index },
+   {  9707, LoadProgramNV_remap_index },
+   { 28803, ProgramParameters4dvNV_remap_index },
+   { 25260, ProgramParameters4fvNV_remap_index },
+   { 21523, RequestResidentProgramsNV_remap_index },
+   { 31480, TrackMatrixNV_remap_index },
+   { 33231, VertexAttrib1dNV_remap_index },
+   { 13996, VertexAttrib1dvNV_remap_index },
+   { 29408, VertexAttrib1fNV_remap_index },
    {  2488, VertexAttrib1fvNV_remap_index },
-   { 31760, VertexAttrib1sNV_remap_index },
-   { 15518, VertexAttrib1svNV_remap_index },
-   {  5029, VertexAttrib2dNV_remap_index },
-   { 13896, VertexAttrib2dvNV_remap_index },
-   { 20985, VertexAttrib2fNV_remap_index },
-   { 13462, VertexAttrib2fvNV_remap_index },
-   {  6250, VertexAttrib2sNV_remap_index },
-   { 19670, VertexAttrib2svNV_remap_index },
-   { 11626, VertexAttrib3dNV_remap_index },
-   { 32886, VertexAttrib3dvNV_remap_index },
-   { 10667, VertexAttrib3fNV_remap_index },
-   { 25659, VertexAttrib3fvNV_remap_index },
-   { 23023, VertexAttrib3sNV_remap_index },
-   { 24541, VertexAttrib3svNV_remap_index },
-   { 29883, VertexAttrib4dNV_remap_index },
-   { 34258, VertexAttrib4dvNV_remap_index },
-   {  5414, VertexAttrib4fNV_remap_index },
-   {  9728, VertexAttrib4fvNV_remap_index },
-   { 27733, VertexAttrib4sNV_remap_index },
+   { 31753, VertexAttrib1sNV_remap_index },
+   { 15511, VertexAttrib1svNV_remap_index },
+   {  5058, VertexAttrib2dNV_remap_index },
+   { 13889, VertexAttrib2dvNV_remap_index },
+   { 20978, VertexAttrib2fNV_remap_index },
+   { 13455, VertexAttrib2fvNV_remap_index },
+   {  6279, VertexAttrib2sNV_remap_index },
+   { 19663, VertexAttrib2svNV_remap_index },
+   { 11655, VertexAttrib3dNV_remap_index },
+   { 32879, VertexAttrib3dvNV_remap_index },
+   { 10696, VertexAttrib3fNV_remap_index },
+   { 25652, VertexAttrib3fvNV_remap_index },
+   { 23016, VertexAttrib3sNV_remap_index },
+   { 24534, VertexAttrib3svNV_remap_index },
+   { 29876, VertexAttrib4dNV_remap_index },
+   { 34251, VertexAttrib4dvNV_remap_index },
+   {  5443, VertexAttrib4fNV_remap_index },
+   {  9757, VertexAttrib4fvNV_remap_index },
+   { 27726, VertexAttrib4sNV_remap_index },
    {  1422, VertexAttrib4svNV_remap_index },
-   {  5187, VertexAttrib4ubNV_remap_index },
+   {  5216, VertexAttrib4ubNV_remap_index },
    {   778, VertexAttrib4ubvNV_remap_index },
-   { 22484, VertexAttribPointerNV_remap_index },
+   { 22477, VertexAttribPointerNV_remap_index },
    {  2340, VertexAttribs1dvNV_remap_index },
-   { 27139, VertexAttribs1fvNV_remap_index },
-   { 34058, VertexAttribs1svNV_remap_index },
-   { 10692, VertexAttribs2dvNV_remap_index },
-   { 26266, VertexAttribs2fvNV_remap_index },
-   { 18206, VertexAttribs2svNV_remap_index },
-   {  5502, VertexAttribs3dvNV_remap_index },
+   { 27132, VertexAttribs1fvNV_remap_index },
+   { 34051, VertexAttribs1svNV_remap_index },
+   { 10721, VertexAttribs2dvNV_remap_index },
+   { 26259, VertexAttribs2fvNV_remap_index },
+   { 18199, VertexAttribs2svNV_remap_index },
+   {  5531, VertexAttribs3dvNV_remap_index },
    {  2199, VertexAttribs3fvNV_remap_index },
-   { 30890, VertexAttribs3svNV_remap_index },
-   { 27823, VertexAttribs4dvNV_remap_index },
-   {  5574, VertexAttribs4fvNV_remap_index },
-   { 33845, VertexAttribs4svNV_remap_index },
-   { 30638, VertexAttribs4ubvNV_remap_index },
-   { 27893, GetTexBumpParameterfvATI_remap_index },
-   { 34099, GetTexBumpParameterivATI_remap_index },
-   { 19314, TexBumpParameterfvATI_remap_index },
-   { 21401, TexBumpParameterivATI_remap_index },
-   { 16064, AlphaFragmentOp1ATI_remap_index },
-   { 26557, AlphaFragmentOp2ATI_remap_index },
-   { 25575, AlphaFragmentOp3ATI_remap_index },
-   { 30817, BeginFragmentShaderATI_remap_index },
-   { 32190, BindFragmentShaderATI_remap_index },
-   { 24670, ColorFragmentOp1ATI_remap_index },
-   {  4476, ColorFragmentOp2ATI_remap_index },
-   { 32531, ColorFragmentOp3ATI_remap_index },
-   {  5740, DeleteFragmentShaderATI_remap_index },
-   { 34282, EndFragmentShaderATI_remap_index },
-   { 33452, GenFragmentShadersATI_remap_index },
-   { 26420, PassTexCoordATI_remap_index },
-   {  7262, SampleMapATI_remap_index },
-   { 28004, SetFragmentShaderConstantATI_remap_index },
+   { 30883, VertexAttribs3svNV_remap_index },
+   { 27816, VertexAttribs4dvNV_remap_index },
+   {  5603, VertexAttribs4fvNV_remap_index },
+   { 33838, VertexAttribs4svNV_remap_index },
+   { 30631, VertexAttribs4ubvNV_remap_index },
+   { 27886, GetTexBumpParameterfvATI_remap_index },
+   { 34092, GetTexBumpParameterivATI_remap_index },
+   { 19307, TexBumpParameterfvATI_remap_index },
+   { 21394, TexBumpParameterivATI_remap_index },
+   { 16057, AlphaFragmentOp1ATI_remap_index },
+   { 26550, AlphaFragmentOp2ATI_remap_index },
+   { 25568, AlphaFragmentOp3ATI_remap_index },
+   { 30810, BeginFragmentShaderATI_remap_index },
+   { 32183, BindFragmentShaderATI_remap_index },
+   { 24663, ColorFragmentOp1ATI_remap_index },
+   {  4505, ColorFragmentOp2ATI_remap_index },
+   { 32524, ColorFragmentOp3ATI_remap_index },
+   {  5769, DeleteFragmentShaderATI_remap_index },
+   { 34275, EndFragmentShaderATI_remap_index },
+   { 33445, GenFragmentShadersATI_remap_index },
+   { 26413, PassTexCoordATI_remap_index },
+   {  7291, SampleMapATI_remap_index },
+   { 27997, SetFragmentShaderConstantATI_remap_index },
    {   363, PointParameteriNV_remap_index },
-   { 14644, PointParameterivNV_remap_index },
-   { 29722, ActiveStencilFaceEXT_remap_index },
-   { 28450, BindVertexArrayAPPLE_remap_index },
+   { 14637, PointParameterivNV_remap_index },
+   { 29715, ActiveStencilFaceEXT_remap_index },
+   { 28443, BindVertexArrayAPPLE_remap_index },
    {  2810, DeleteVertexArraysAPPLE_remap_index },
-   { 18673, GenVertexArraysAPPLE_remap_index },
-   { 24324, IsVertexArrayAPPLE_remap_index },
+   { 18666, GenVertexArraysAPPLE_remap_index },
+   { 24317, IsVertexArrayAPPLE_remap_index },
    {   819, GetProgramNamedParameterdvNV_remap_index },
-   {  3638, GetProgramNamedParameterfvNV_remap_index },
-   { 27924, ProgramNamedParameter4dNV_remap_index },
-   { 15018, ProgramNamedParameter4dvNV_remap_index },
-   {  9211, ProgramNamedParameter4fNV_remap_index },
-   { 12117, ProgramNamedParameter4fvNV_remap_index },
-   { 17521, PrimitiveRestartIndexNV_remap_index },
-   { 31680, PrimitiveRestartNV_remap_index },
-   { 25246, DepthBoundsEXT_remap_index },
+   {  3667, GetProgramNamedParameterfvNV_remap_index },
+   { 27917, ProgramNamedParameter4dNV_remap_index },
+   { 15011, ProgramNamedParameter4dvNV_remap_index },
+   {  9240, ProgramNamedParameter4fNV_remap_index },
+   { 12146, ProgramNamedParameter4fvNV_remap_index },
+   { 17514, PrimitiveRestartIndexNV_remap_index },
+   { 31673, PrimitiveRestartNV_remap_index },
+   { 25239, DepthBoundsEXT_remap_index },
    {  1144, BlendEquationSeparateEXT_remap_index },
-   { 15219, BindFramebufferEXT_remap_index },
-   { 26650, BindRenderbufferEXT_remap_index },
-   {  9975, CheckFramebufferStatusEXT_remap_index },
-   { 23575, DeleteFramebuffersEXT_remap_index },
-   { 32788, DeleteRenderbuffersEXT_remap_index },
-   { 13920, FramebufferRenderbufferEXT_remap_index },
-   { 14109, FramebufferTexture1DEXT_remap_index },
-   { 11911, FramebufferTexture2DEXT_remap_index },
-   { 11531, FramebufferTexture3DEXT_remap_index },
-   { 24190, GenFramebuffersEXT_remap_index },
-   { 18071, GenRenderbuffersEXT_remap_index },
-   {  6998, GenerateMipmapEXT_remap_index },
-   { 22577, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 33358, GetRenderbufferParameterivEXT_remap_index },
-   { 21281, IsFramebufferEXT_remap_index },
-   { 34181, IsRenderbufferEXT_remap_index },
-   {  8486, RenderbufferStorageEXT_remap_index },
+   { 15212, BindFramebufferEXT_remap_index },
+   { 26643, BindRenderbufferEXT_remap_index },
+   { 10004, CheckFramebufferStatusEXT_remap_index },
+   { 23568, DeleteFramebuffersEXT_remap_index },
+   { 32781, DeleteRenderbuffersEXT_remap_index },
+   { 13913, FramebufferRenderbufferEXT_remap_index },
+   { 14102, FramebufferTexture1DEXT_remap_index },
+   { 11940, FramebufferTexture2DEXT_remap_index },
+   { 11560, FramebufferTexture3DEXT_remap_index },
+   { 24183, GenFramebuffersEXT_remap_index },
+   { 18064, GenRenderbuffersEXT_remap_index },
+   {  7027, GenerateMipmapEXT_remap_index },
+   { 22570, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 33351, GetRenderbufferParameterivEXT_remap_index },
+   { 21274, IsFramebufferEXT_remap_index },
+   { 34174, IsRenderbufferEXT_remap_index },
+   {  8515, RenderbufferStorageEXT_remap_index },
    {   695, BlitFramebufferEXT_remap_index },
-   { 14804, BufferParameteriAPPLE_remap_index },
-   { 20115, FlushMappedBufferRangeAPPLE_remap_index },
+   { 14797, BufferParameteriAPPLE_remap_index },
+   { 20108, FlushMappedBufferRangeAPPLE_remap_index },
    {  1867, BindFragDataLocationEXT_remap_index },
-   { 25359, GetFragDataLocationEXT_remap_index },
-   { 10970, GetUniformuivEXT_remap_index },
-   { 33532, GetVertexAttribIivEXT_remap_index },
-   {  4326, GetVertexAttribIuivEXT_remap_index },
-   { 12389, Uniform1uiEXT_remap_index },
-   { 28895, Uniform1uivEXT_remap_index },
-   { 23119, Uniform2uiEXT_remap_index },
-   {  4440, Uniform2uivEXT_remap_index },
-   { 30162, Uniform3uiEXT_remap_index },
-   { 15165, Uniform3uivEXT_remap_index },
-   {  3562, Uniform4uiEXT_remap_index },
-   {  8987, Uniform4uivEXT_remap_index },
-   { 19052, VertexAttribI1iEXT_remap_index },
-   {  5214, VertexAttribI1ivEXT_remap_index },
+   { 25352, GetFragDataLocationEXT_remap_index },
+   { 10999, GetUniformuivEXT_remap_index },
+   { 33525, GetVertexAttribIivEXT_remap_index },
+   {  4355, GetVertexAttribIuivEXT_remap_index },
+   { 12418, Uniform1uiEXT_remap_index },
+   { 28888, Uniform1uivEXT_remap_index },
+   { 23112, Uniform2uiEXT_remap_index },
+   {  4469, Uniform2uivEXT_remap_index },
+   { 30155, Uniform3uiEXT_remap_index },
+   { 15158, Uniform3uivEXT_remap_index },
+   {  3591, Uniform4uiEXT_remap_index },
+   {  9016, Uniform4uivEXT_remap_index },
+   { 19045, VertexAttribI1iEXT_remap_index },
+   {  5243, VertexAttribI1ivEXT_remap_index },
    {  2589, VertexAttribI1uiEXT_remap_index },
-   { 13190, VertexAttribI1uivEXT_remap_index },
+   { 13183, VertexAttribI1uivEXT_remap_index },
    {    81, VertexAttribI2iEXT_remap_index },
-   { 24782, VertexAttribI2ivEXT_remap_index },
-   {  5528, VertexAttribI2uiEXT_remap_index },
-   {  4883, VertexAttribI2uivEXT_remap_index },
-   { 27525, VertexAttribI3iEXT_remap_index },
-   { 25984, VertexAttribI3ivEXT_remap_index },
-   {  3416, VertexAttribI3uiEXT_remap_index },
-   { 31383, VertexAttribI3uivEXT_remap_index },
-   { 22828, VertexAttribI4bvEXT_remap_index },
-   { 15097, VertexAttribI4iEXT_remap_index },
-   { 33057, VertexAttribI4ivEXT_remap_index },
-   { 13823, VertexAttribI4svEXT_remap_index },
-   { 17039, VertexAttribI4ubvEXT_remap_index },
-   { 16685, VertexAttribI4uiEXT_remap_index },
-   {  5674, VertexAttribI4uivEXT_remap_index },
-   { 11694, VertexAttribI4usvEXT_remap_index },
-   { 19258, VertexAttribIPointerEXT_remap_index },
+   { 24775, VertexAttribI2ivEXT_remap_index },
+   {  5557, VertexAttribI2uiEXT_remap_index },
+   {  4912, VertexAttribI2uivEXT_remap_index },
+   { 27518, VertexAttribI3iEXT_remap_index },
+   { 25977, VertexAttribI3ivEXT_remap_index },
+   {  3445, VertexAttribI3uiEXT_remap_index },
+   { 31376, VertexAttribI3uivEXT_remap_index },
+   { 22821, VertexAttribI4bvEXT_remap_index },
+   { 15090, VertexAttribI4iEXT_remap_index },
+   { 33050, VertexAttribI4ivEXT_remap_index },
+   { 13816, VertexAttribI4svEXT_remap_index },
+   { 17032, VertexAttribI4ubvEXT_remap_index },
+   { 16678, VertexAttribI4uiEXT_remap_index },
+   {  5703, VertexAttribI4uivEXT_remap_index },
+   { 11723, VertexAttribI4usvEXT_remap_index },
+   { 19251, VertexAttribIPointerEXT_remap_index },
    {  3103, FramebufferTextureLayerEXT_remap_index },
-   {  5950, ColorMaskIndexedEXT_remap_index },
-   { 19694, DisableIndexedEXT_remap_index },
-   { 27570, EnableIndexedEXT_remap_index },
-   { 22532, GetBooleanIndexedvEXT_remap_index },
-   { 11305, GetIntegerIndexedvEXT_remap_index },
-   { 23651, IsEnabledIndexedEXT_remap_index },
-   { 23551, ClearColorIiEXT_remap_index },
-   {  3512, ClearColorIuiEXT_remap_index },
-   { 10193, GetTexParameterIivEXT_remap_index },
-   {  6198, GetTexParameterIuivEXT_remap_index },
+   {  5979, ColorMaskIndexedEXT_remap_index },
+   { 19687, DisableIndexedEXT_remap_index },
+   { 27563, EnableIndexedEXT_remap_index },
+   { 22525, GetBooleanIndexedvEXT_remap_index },
+   { 11334, GetIntegerIndexedvEXT_remap_index },
+   { 23644, IsEnabledIndexedEXT_remap_index },
+   { 23544, ClearColorIiEXT_remap_index },
+   {  3541, ClearColorIuiEXT_remap_index },
+   { 10222, GetTexParameterIivEXT_remap_index },
+   {  6227, GetTexParameterIuivEXT_remap_index },
    {  3059, TexParameterIivEXT_remap_index },
-   { 27392, TexParameterIuivEXT_remap_index },
-   {  4751, BeginConditionalRenderNV_remap_index },
-   { 26370, EndConditionalRenderNV_remap_index },
-   {  9622, BeginTransformFeedbackEXT_remap_index },
-   { 19729, BindBufferBaseEXT_remap_index },
-   { 19588, BindBufferOffsetEXT_remap_index },
-   { 12606, BindBufferRangeEXT_remap_index },
-   { 14719, EndTransformFeedbackEXT_remap_index },
-   { 11168, GetTransformFeedbackVaryingEXT_remap_index },
-   { 21586, TransformFeedbackVaryingsEXT_remap_index },
-   { 30539, ProvokingVertexEXT_remap_index },
-   { 11116, GetTexParameterPointervAPPLE_remap_index },
-   {  5276, TextureRangeAPPLE_remap_index },
-   { 11983, GetObjectParameterivAPPLE_remap_index },
-   { 20708, ObjectPurgeableAPPLE_remap_index },
-   {  5992, ObjectUnpurgeableAPPLE_remap_index },
-   { 17893, ActiveProgramEXT_remap_index },
-   { 17864, CreateShaderProgramEXT_remap_index },
-   { 29507, UseShaderProgramEXT_remap_index },
-   { 16992, TextureBarrierNV_remap_index },
-   { 29748, StencilFuncSeparateATI_remap_index },
-   {  5863, ProgramEnvParameters4fvEXT_remap_index },
-   { 17758, ProgramLocalParameters4fvEXT_remap_index },
-   { 14572, GetQueryObjecti64vEXT_remap_index },
-   { 10718, GetQueryObjectui64vEXT_remap_index },
-   { 24739, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 12495, EGLImageTargetTexture2DOES_remap_index },
+   { 27385, TexParameterIuivEXT_remap_index },
+   {  4780, BeginConditionalRenderNV_remap_index },
+   { 26363, EndConditionalRenderNV_remap_index },
+   {  9651, BeginTransformFeedbackEXT_remap_index },
+   { 19722, BindBufferBaseEXT_remap_index },
+   { 19581, BindBufferOffsetEXT_remap_index },
+   { 12635, BindBufferRangeEXT_remap_index },
+   { 14712, EndTransformFeedbackEXT_remap_index },
+   { 11197, GetTransformFeedbackVaryingEXT_remap_index },
+   { 21579, TransformFeedbackVaryingsEXT_remap_index },
+   { 30532, ProvokingVertexEXT_remap_index },
+   { 11145, GetTexParameterPointervAPPLE_remap_index },
+   {  5305, TextureRangeAPPLE_remap_index },
+   { 12012, GetObjectParameterivAPPLE_remap_index },
+   { 20701, ObjectPurgeableAPPLE_remap_index },
+   {  6021, ObjectUnpurgeableAPPLE_remap_index },
+   { 17886, ActiveProgramEXT_remap_index },
+   { 17857, CreateShaderProgramEXT_remap_index },
+   { 29500, UseShaderProgramEXT_remap_index },
+   { 16985, TextureBarrierNV_remap_index },
+   { 29741, StencilFuncSeparateATI_remap_index },
+   {  5892, ProgramEnvParameters4fvEXT_remap_index },
+   { 17751, ProgramLocalParameters4fvEXT_remap_index },
+   { 14565, GetQueryObjecti64vEXT_remap_index },
+   { 10747, GetQueryObjectui64vEXT_remap_index },
+   { 24732, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 12524, EGLImageTargetTexture2DOES_remap_index },
    {    -1, -1 }
 };
 
@@ -5464,108 +5461,108 @@ static const struct gl_function_remap MESA_alt_functions[] = {
    /* from GL_EXT_blend_color */
    {  2728, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 11588, _gloffset_BlendEquation },
+   { 11617, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 17632, _gloffset_ColorSubTable },
-   { 32720, _gloffset_CopyColorSubTable },
+   { 17625, _gloffset_ColorSubTable },
+   { 32713, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
    {   257, _gloffset_ConvolutionFilter1D },
    {  2527, _gloffset_CopyConvolutionFilter1D },
-   {  4168, _gloffset_GetConvolutionParameteriv },
-   {  8835, _gloffset_ConvolutionFilter2D },
-   {  9037, _gloffset_ConvolutionParameteriv },
-   {  9497, _gloffset_ConvolutionParameterfv },
-   { 21429, _gloffset_GetSeparableFilter },
-   { 25014, _gloffset_SeparableFilter2D },
-   { 25877, _gloffset_ConvolutionParameteri },
-   { 26045, _gloffset_ConvolutionParameterf },
-   { 27759, _gloffset_GetConvolutionParameterfv },
-   { 28616, _gloffset_GetConvolutionFilter },
-   { 31079, _gloffset_CopyConvolutionFilter2D },
+   {  4197, _gloffset_GetConvolutionParameteriv },
+   {  8864, _gloffset_ConvolutionFilter2D },
+   {  9066, _gloffset_ConvolutionParameteriv },
+   {  9526, _gloffset_ConvolutionParameterfv },
+   { 21422, _gloffset_GetSeparableFilter },
+   { 25007, _gloffset_SeparableFilter2D },
+   { 25870, _gloffset_ConvolutionParameteri },
+   { 26038, _gloffset_ConvolutionParameterf },
+   { 27752, _gloffset_GetConvolutionParameterfv },
+   { 28609, _gloffset_GetConvolutionFilter },
+   { 31072, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 15578, _gloffset_CopyTexSubImage3D },
-   { 17319, _gloffset_CopyTexImage2D },
-   { 25485, _gloffset_CopyTexImage1D },
-   { 28297, _gloffset_CopyTexSubImage2D },
-   { 30717, _gloffset_CopyTexSubImage1D },
+   { 15571, _gloffset_CopyTexSubImage3D },
+   { 17312, _gloffset_CopyTexImage2D },
+   { 25478, _gloffset_CopyTexImage1D },
+   { 28290, _gloffset_CopyTexSubImage2D },
+   { 30710, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
-   {  9834, _gloffset_DrawRangeElements },
+   {  9863, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
    {   856, _gloffset_Histogram },
-   {  3598, _gloffset_ResetHistogram },
-   { 10339, _gloffset_GetMinmax },
-   { 15912, _gloffset_GetHistogramParameterfv },
-   { 25410, _gloffset_GetMinmaxParameteriv },
-   { 27649, _gloffset_ResetMinmax },
-   { 28513, _gloffset_GetHistogramParameteriv },
-   { 29682, _gloffset_GetHistogram },
-   { 32306, _gloffset_Minmax },
-   { 33928, _gloffset_GetMinmaxParameterfv },
+   {  3627, _gloffset_ResetHistogram },
+   { 10368, _gloffset_GetMinmax },
+   { 15905, _gloffset_GetHistogramParameterfv },
+   { 25403, _gloffset_GetMinmaxParameteriv },
+   { 27642, _gloffset_ResetMinmax },
+   { 28506, _gloffset_GetHistogramParameteriv },
+   { 29675, _gloffset_GetHistogram },
+   { 32299, _gloffset_Minmax },
+   { 33921, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
-   {  8697, _gloffset_ColorTable },
-   { 15758, _gloffset_GetColorTable },
-   { 23937, _gloffset_GetColorTableParameterfv },
-   { 26101, _gloffset_GetColorTableParameteriv },
+   {  8726, _gloffset_ColorTable },
+   { 15751, _gloffset_GetColorTable },
+   { 23930, _gloffset_GetColorTableParameterfv },
+   { 26094, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
-   {  7408, _gloffset_TexSubImage1D },
-   { 11043, _gloffset_TexSubImage2D },
+   {  7437, _gloffset_TexSubImage1D },
+   { 11072, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
    {  1826, _gloffset_TexImage3D },
-   { 23706, _gloffset_TexSubImage3D },
+   { 23699, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
-   {  3366, _gloffset_PrioritizeTextures },
-   {  7857, _gloffset_AreTexturesResident },
-   { 14027, _gloffset_GenTextures },
-   { 16271, _gloffset_DeleteTextures },
-   { 20396, _gloffset_IsTexture },
-   { 30782, _gloffset_BindTexture },
+   {  3395, _gloffset_PrioritizeTextures },
+   {  7886, _gloffset_AreTexturesResident },
+   { 14020, _gloffset_GenTextures },
+   { 16264, _gloffset_DeleteTextures },
+   { 20389, _gloffset_IsTexture },
+   { 30775, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 25186, _gloffset_ArrayElement },
-   { 31894, _gloffset_GetPointerv },
-   { 33479, _gloffset_DrawArrays },
+   { 25179, _gloffset_ArrayElement },
+   { 31887, _gloffset_GetPointerv },
+   { 33472, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
-   {  7975, _gloffset_ColorTableParameteriv },
-   {  8697, _gloffset_ColorTable },
-   { 15758, _gloffset_GetColorTable },
-   { 15868, _gloffset_CopyColorTable },
-   { 20257, _gloffset_ColorTableParameterfv },
-   { 23937, _gloffset_GetColorTableParameterfv },
-   { 26101, _gloffset_GetColorTableParameteriv },
+   {  8004, _gloffset_ColorTableParameteriv },
+   {  8726, _gloffset_ColorTable },
+   { 15751, _gloffset_GetColorTable },
+   { 15861, _gloffset_CopyColorTable },
+   { 20250, _gloffset_ColorTableParameterfv },
+   { 23930, _gloffset_GetColorTableParameterfv },
+   { 26094, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
    {   425, _gloffset_MultiTexCoord3sARB },
    {   657, _gloffset_ActiveTextureARB },
-   {  4378, _gloffset_MultiTexCoord1fvARB },
-   {  6474, _gloffset_MultiTexCoord3dARB },
-   {  6519, _gloffset_MultiTexCoord2iARB },
-   {  6643, _gloffset_MultiTexCoord2svARB },
-   {  8653, _gloffset_MultiTexCoord2fARB },
-   { 10748, _gloffset_MultiTexCoord3fvARB },
-   { 11350, _gloffset_MultiTexCoord4sARB },
-   { 12031, _gloffset_MultiTexCoord2dvARB },
-   { 12438, _gloffset_MultiTexCoord1svARB },
-   { 12839, _gloffset_MultiTexCoord3svARB },
-   { 12900, _gloffset_MultiTexCoord4iARB },
-   { 13731, _gloffset_MultiTexCoord3iARB },
-   { 14601, _gloffset_MultiTexCoord1dARB },
-   { 14833, _gloffset_MultiTexCoord3dvARB },
-   { 16112, _gloffset_MultiTexCoord3ivARB },
-   { 16157, _gloffset_MultiTexCoord2sARB },
-   { 17689, _gloffset_MultiTexCoord4ivARB },
-   { 19897, _gloffset_ClientActiveTextureARB },
-   { 22260, _gloffset_MultiTexCoord2dARB },
-   { 22697, _gloffset_MultiTexCoord4dvARB },
-   { 23074, _gloffset_MultiTexCoord4fvARB },
-   { 24078, _gloffset_MultiTexCoord3fARB },
-   { 26695, _gloffset_MultiTexCoord4dARB },
-   { 26961, _gloffset_MultiTexCoord1sARB },
-   { 27165, _gloffset_MultiTexCoord1dvARB },
-   { 28141, _gloffset_MultiTexCoord1ivARB },
-   { 28234, _gloffset_MultiTexCoord2ivARB },
-   { 28573, _gloffset_MultiTexCoord1iARB },
-   { 29957, _gloffset_MultiTexCoord4svARB },
-   { 30581, _gloffset_MultiTexCoord1fARB },
-   { 30844, _gloffset_MultiTexCoord4fARB },
-   { 33313, _gloffset_MultiTexCoord2fvARB },
+   {  4407, _gloffset_MultiTexCoord1fvARB },
+   {  6503, _gloffset_MultiTexCoord3dARB },
+   {  6548, _gloffset_MultiTexCoord2iARB },
+   {  6672, _gloffset_MultiTexCoord2svARB },
+   {  8682, _gloffset_MultiTexCoord2fARB },
+   { 10777, _gloffset_MultiTexCoord3fvARB },
+   { 11379, _gloffset_MultiTexCoord4sARB },
+   { 12060, _gloffset_MultiTexCoord2dvARB },
+   { 12467, _gloffset_MultiTexCoord1svARB },
+   { 12832, _gloffset_MultiTexCoord3svARB },
+   { 12893, _gloffset_MultiTexCoord4iARB },
+   { 13724, _gloffset_MultiTexCoord3iARB },
+   { 14594, _gloffset_MultiTexCoord1dARB },
+   { 14826, _gloffset_MultiTexCoord3dvARB },
+   { 16105, _gloffset_MultiTexCoord3ivARB },
+   { 16150, _gloffset_MultiTexCoord2sARB },
+   { 17682, _gloffset_MultiTexCoord4ivARB },
+   { 19890, _gloffset_ClientActiveTextureARB },
+   { 22253, _gloffset_MultiTexCoord2dARB },
+   { 22690, _gloffset_MultiTexCoord4dvARB },
+   { 23067, _gloffset_MultiTexCoord4fvARB },
+   { 24071, _gloffset_MultiTexCoord3fARB },
+   { 26688, _gloffset_MultiTexCoord4dARB },
+   { 26954, _gloffset_MultiTexCoord1sARB },
+   { 27158, _gloffset_MultiTexCoord1dvARB },
+   { 28134, _gloffset_MultiTexCoord1ivARB },
+   { 28227, _gloffset_MultiTexCoord2ivARB },
+   { 28566, _gloffset_MultiTexCoord1iARB },
+   { 29950, _gloffset_MultiTexCoord4svARB },
+   { 30574, _gloffset_MultiTexCoord1fARB },
+   { 30837, _gloffset_MultiTexCoord4fARB },
+   { 33306, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 
@@ -5573,7 +5570,7 @@ static const struct gl_function_remap MESA_alt_functions[] = {
 
 #if defined(need_GL_3DFX_tbuffer)
 static const struct gl_function_remap GL_3DFX_tbuffer_functions[] = {
-   {  9555, -1 }, /* TbufferMask3DFX */
+   {  9584, -1 }, /* TbufferMask3DFX */
    {    -1, -1 }
 };
 #endif
@@ -5672,7 +5669,6 @@ static const struct gl_function_remap GL_ARB_framebuffer_object_functions[] = {
 #if defined(need_GL_ARB_geometry_shader4)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_ARB_geometry_shader4_functions[] = {
-   { 12803, -1 }, /* FramebufferTextureLayer */
    {    -1, -1 }
 };
 #endif
@@ -5693,11 +5689,11 @@ static const struct gl_function_remap GL_ARB_map_buffer_range_functions[] = {
 
 #if defined(need_GL_ARB_matrix_palette)
 static const struct gl_function_remap GL_ARB_matrix_palette_functions[] = {
-   {  3849, -1 }, /* MatrixIndexusvARB */
-   { 13552, -1 }, /* MatrixIndexuivARB */
-   { 14988, -1 }, /* MatrixIndexPointerARB */
-   { 20663, -1 }, /* CurrentPaletteMatrixARB */
-   { 23822, -1 }, /* MatrixIndexubvARB */
+   {  3878, -1 }, /* MatrixIndexusvARB */
+   { 13545, -1 }, /* MatrixIndexuivARB */
+   { 14981, -1 }, /* MatrixIndexPointerARB */
+   { 20656, -1 }, /* CurrentPaletteMatrixARB */
+   { 23815, -1 }, /* MatrixIndexubvARB */
    {    -1, -1 }
 };
 #endif
@@ -5796,15 +5792,15 @@ static const struct gl_function_remap GL_ARB_vertex_array_object_functions[] = {
 #if defined(need_GL_ARB_vertex_blend)
 static const struct gl_function_remap GL_ARB_vertex_blend_functions[] = {
    {  2469, -1 }, /* WeightubvARB */
-   {  6886, -1 }, /* WeightivARB */
-   { 11453, -1 }, /* WeightPointerARB */
-   { 14319, -1 }, /* WeightfvARB */
-   { 18232, -1 }, /* WeightbvARB */
-   { 21893, -1 }, /* WeightusvARB */
-   { 24940, -1 }, /* VertexBlendARB */
-   { 30665, -1 }, /* WeightsvARB */
-   { 32770, -1 }, /* WeightdvARB */
-   { 33513, -1 }, /* WeightuivARB */
+   {  6915, -1 }, /* WeightivARB */
+   { 11482, -1 }, /* WeightPointerARB */
+   { 14312, -1 }, /* WeightfvARB */
+   { 18225, -1 }, /* WeightbvARB */
+   { 21886, -1 }, /* WeightusvARB */
+   { 24933, -1 }, /* VertexBlendARB */
+   { 30658, -1 }, /* WeightsvARB */
+   { 32763, -1 }, /* WeightdvARB */
+   { 33506, -1 }, /* WeightuivARB */
    {    -1, -1 }
 };
 #endif
@@ -5895,15 +5891,15 @@ static const struct gl_function_remap GL_EXT_blend_func_separate_functions[] = {
 
 #if defined(need_GL_EXT_blend_minmax)
 static const struct gl_function_remap GL_EXT_blend_minmax_functions[] = {
-   { 11588, _gloffset_BlendEquation },
+   { 11617, _gloffset_BlendEquation },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_color_subtable)
 static const struct gl_function_remap GL_EXT_color_subtable_functions[] = {
-   { 17632, _gloffset_ColorSubTable },
-   { 32720, _gloffset_CopyColorSubTable },
+   { 17625, _gloffset_ColorSubTable },
+   { 32713, _gloffset_CopyColorSubTable },
    {    -1, -1 }
 };
 #endif
@@ -5919,64 +5915,64 @@ static const struct gl_function_remap GL_EXT_compiled_vertex_array_functions[] =
 static const struct gl_function_remap GL_EXT_convolution_functions[] = {
    {   257, _gloffset_ConvolutionFilter1D },
    {  2527, _gloffset_CopyConvolutionFilter1D },
-   {  4168, _gloffset_GetConvolutionParameteriv },
-   {  8835, _gloffset_ConvolutionFilter2D },
-   {  9037, _gloffset_ConvolutionParameteriv },
-   {  9497, _gloffset_ConvolutionParameterfv },
-   { 21429, _gloffset_GetSeparableFilter },
-   { 25014, _gloffset_SeparableFilter2D },
-   { 25877, _gloffset_ConvolutionParameteri },
-   { 26045, _gloffset_ConvolutionParameterf },
-   { 27759, _gloffset_GetConvolutionParameterfv },
-   { 28616, _gloffset_GetConvolutionFilter },
-   { 31079, _gloffset_CopyConvolutionFilter2D },
+   {  4197, _gloffset_GetConvolutionParameteriv },
+   {  8864, _gloffset_ConvolutionFilter2D },
+   {  9066, _gloffset_ConvolutionParameteriv },
+   {  9526, _gloffset_ConvolutionParameterfv },
+   { 21422, _gloffset_GetSeparableFilter },
+   { 25007, _gloffset_SeparableFilter2D },
+   { 25870, _gloffset_ConvolutionParameteri },
+   { 26038, _gloffset_ConvolutionParameterf },
+   { 27752, _gloffset_GetConvolutionParameterfv },
+   { 28609, _gloffset_GetConvolutionFilter },
+   { 31072, _gloffset_CopyConvolutionFilter2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_coordinate_frame)
 static const struct gl_function_remap GL_EXT_coordinate_frame_functions[] = {
-   { 10887, -1 }, /* TangentPointerEXT */
-   { 12958, -1 }, /* Binormal3ivEXT */
-   { 13684, -1 }, /* Tangent3sEXT */
-   { 15053, -1 }, /* Tangent3fvEXT */
-   { 19342, -1 }, /* Tangent3ivEXT */
-   { 19569, -1 }, /* Tangent3dvEXT */
-   { 20343, -1 }, /* Binormal3bvEXT */
-   { 21482, -1 }, /* Binormal3dEXT */
-   { 23754, -1 }, /* Tangent3fEXT */
-   { 25949, -1 }, /* Binormal3sEXT */
-   { 26491, -1 }, /* Tangent3dEXT */
-   { 27438, -1 }, /* Binormal3svEXT */
-   { 28039, -1 }, /* Binormal3fEXT */
-   { 28947, -1 }, /* Binormal3dvEXT */
-   { 30214, -1 }, /* Tangent3iEXT */
-   { 31364, -1 }, /* Tangent3bvEXT */
-   { 31929, -1 }, /* Tangent3bEXT */
-   { 32493, -1 }, /* Binormal3fvEXT */
-   { 33212, -1 }, /* BinormalPointerEXT */
-   { 33693, -1 }, /* Tangent3svEXT */
-   { 34130, -1 }, /* Binormal3bEXT */
-   { 34307, -1 }, /* Binormal3iEXT */
+   { 10916, -1 }, /* TangentPointerEXT */
+   { 12951, -1 }, /* Binormal3ivEXT */
+   { 13677, -1 }, /* Tangent3sEXT */
+   { 15046, -1 }, /* Tangent3fvEXT */
+   { 19335, -1 }, /* Tangent3ivEXT */
+   { 19562, -1 }, /* Tangent3dvEXT */
+   { 20336, -1 }, /* Binormal3bvEXT */
+   { 21475, -1 }, /* Binormal3dEXT */
+   { 23747, -1 }, /* Tangent3fEXT */
+   { 25942, -1 }, /* Binormal3sEXT */
+   { 26484, -1 }, /* Tangent3dEXT */
+   { 27431, -1 }, /* Binormal3svEXT */
+   { 28032, -1 }, /* Binormal3fEXT */
+   { 28940, -1 }, /* Binormal3dvEXT */
+   { 30207, -1 }, /* Tangent3iEXT */
+   { 31357, -1 }, /* Tangent3bvEXT */
+   { 31922, -1 }, /* Tangent3bEXT */
+   { 32486, -1 }, /* Binormal3fvEXT */
+   { 33205, -1 }, /* BinormalPointerEXT */
+   { 33686, -1 }, /* Tangent3svEXT */
+   { 34123, -1 }, /* Binormal3bEXT */
+   { 34300, -1 }, /* Binormal3iEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_copy_texture)
 static const struct gl_function_remap GL_EXT_copy_texture_functions[] = {
-   { 15578, _gloffset_CopyTexSubImage3D },
-   { 17319, _gloffset_CopyTexImage2D },
-   { 25485, _gloffset_CopyTexImage1D },
-   { 28297, _gloffset_CopyTexSubImage2D },
-   { 30717, _gloffset_CopyTexSubImage1D },
+   { 15571, _gloffset_CopyTexSubImage3D },
+   { 17312, _gloffset_CopyTexImage2D },
+   { 25478, _gloffset_CopyTexImage1D },
+   { 28290, _gloffset_CopyTexSubImage2D },
+   { 30710, _gloffset_CopyTexSubImage1D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_cull_vertex)
 static const struct gl_function_remap GL_EXT_cull_vertex_functions[] = {
-   {  9186, -1 }, /* CullParameterdvEXT */
-   { 12076, -1 }, /* CullParameterfvEXT */
+   {  9215, -1 }, /* CullParameterdvEXT */
+   { 12105, -1 }, /* CullParameterfvEXT */
    {    -1, -1 }
 };
 #endif
@@ -6004,7 +6000,7 @@ static const struct gl_function_remap GL_EXT_draw_instanced_functions[] = {
 
 #if defined(need_GL_EXT_draw_range_elements)
 static const struct gl_function_remap GL_EXT_draw_range_elements_functions[] = {
-   {  9834, _gloffset_DrawRangeElements },
+   {  9863, _gloffset_DrawRangeElements },
    {    -1, -1 }
 };
 #endif
@@ -6054,38 +6050,38 @@ static const struct gl_function_remap GL_EXT_gpu_shader4_functions[] = {
 #if defined(need_GL_EXT_histogram)
 static const struct gl_function_remap GL_EXT_histogram_functions[] = {
    {   856, _gloffset_Histogram },
-   {  3598, _gloffset_ResetHistogram },
-   { 10339, _gloffset_GetMinmax },
-   { 15912, _gloffset_GetHistogramParameterfv },
-   { 25410, _gloffset_GetMinmaxParameteriv },
-   { 27649, _gloffset_ResetMinmax },
-   { 28513, _gloffset_GetHistogramParameteriv },
-   { 29682, _gloffset_GetHistogram },
-   { 32306, _gloffset_Minmax },
-   { 33928, _gloffset_GetMinmaxParameterfv },
+   {  3627, _gloffset_ResetHistogram },
+   { 10368, _gloffset_GetMinmax },
+   { 15905, _gloffset_GetHistogramParameterfv },
+   { 25403, _gloffset_GetMinmaxParameteriv },
+   { 27642, _gloffset_ResetMinmax },
+   { 28506, _gloffset_GetHistogramParameteriv },
+   { 29675, _gloffset_GetHistogram },
+   { 32299, _gloffset_Minmax },
+   { 33921, _gloffset_GetMinmaxParameterfv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_func)
 static const struct gl_function_remap GL_EXT_index_func_functions[] = {
-   { 11862, -1 }, /* IndexFuncEXT */
+   { 11891, -1 }, /* IndexFuncEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_material)
 static const struct gl_function_remap GL_EXT_index_material_functions[] = {
-   { 22015, -1 }, /* IndexMaterialEXT */
+   { 22008, -1 }, /* IndexMaterialEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_light_texture)
 static const struct gl_function_remap GL_EXT_light_texture_functions[] = {
-   { 27458, -1 }, /* ApplyTextureEXT */
-   { 27603, -1 }, /* TextureMaterialEXT */
-   { 27628, -1 }, /* TextureLightEXT */
+   { 27451, -1 }, /* ApplyTextureEXT */
+   { 27596, -1 }, /* TextureMaterialEXT */
+   { 27621, -1 }, /* TextureLightEXT */
    {    -1, -1 }
 };
 #endif
@@ -6106,20 +6102,20 @@ static const struct gl_function_remap GL_EXT_multisample_functions[] = {
 
 #if defined(need_GL_EXT_paletted_texture)
 static const struct gl_function_remap GL_EXT_paletted_texture_functions[] = {
-   {  8697, _gloffset_ColorTable },
-   { 15758, _gloffset_GetColorTable },
-   { 23937, _gloffset_GetColorTableParameterfv },
-   { 26101, _gloffset_GetColorTableParameteriv },
+   {  8726, _gloffset_ColorTable },
+   { 15751, _gloffset_GetColorTable },
+   { 23930, _gloffset_GetColorTableParameterfv },
+   { 26094, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_pixel_transform)
 static const struct gl_function_remap GL_EXT_pixel_transform_functions[] = {
-   { 22662, -1 }, /* PixelTransformParameterfEXT */
-   { 22742, -1 }, /* PixelTransformParameteriEXT */
-   { 31644, -1 }, /* PixelTransformParameterfvEXT */
-   { 33176, -1 }, /* PixelTransformParameterivEXT */
+   { 22655, -1 }, /* PixelTransformParameterfEXT */
+   { 22735, -1 }, /* PixelTransformParameteriEXT */
+   { 31637, -1 }, /* PixelTransformParameterfvEXT */
+   { 33169, -1 }, /* PixelTransformParameterivEXT */
    {    -1, -1 }
 };
 #endif
@@ -6168,8 +6164,8 @@ static const struct gl_function_remap GL_EXT_stencil_two_side_functions[] = {
 
 #if defined(need_GL_EXT_subtexture)
 static const struct gl_function_remap GL_EXT_subtexture_functions[] = {
-   {  7408, _gloffset_TexSubImage1D },
-   { 11043, _gloffset_TexSubImage2D },
+   {  7437, _gloffset_TexSubImage1D },
+   { 11072, _gloffset_TexSubImage2D },
    {    -1, -1 }
 };
 #endif
@@ -6177,7 +6173,7 @@ static const struct gl_function_remap GL_EXT_subtexture_functions[] = {
 #if defined(need_GL_EXT_texture3D)
 static const struct gl_function_remap GL_EXT_texture3D_functions[] = {
    {  1826, _gloffset_TexImage3D },
-   { 23706, _gloffset_TexSubImage3D },
+   { 23699, _gloffset_TexSubImage3D },
    {    -1, -1 }
 };
 #endif
@@ -6198,19 +6194,19 @@ static const struct gl_function_remap GL_EXT_texture_integer_functions[] = {
 
 #if defined(need_GL_EXT_texture_object)
 static const struct gl_function_remap GL_EXT_texture_object_functions[] = {
-   {  3366, _gloffset_PrioritizeTextures },
-   {  7857, _gloffset_AreTexturesResident },
-   { 14027, _gloffset_GenTextures },
-   { 16271, _gloffset_DeleteTextures },
-   { 20396, _gloffset_IsTexture },
-   { 30782, _gloffset_BindTexture },
+   {  3395, _gloffset_PrioritizeTextures },
+   {  7886, _gloffset_AreTexturesResident },
+   { 14020, _gloffset_GenTextures },
+   { 16264, _gloffset_DeleteTextures },
+   { 20389, _gloffset_IsTexture },
+   { 30775, _gloffset_BindTexture },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_texture_perturb_normal)
 static const struct gl_function_remap GL_EXT_texture_perturb_normal_functions[] = {
-   { 14269, -1 }, /* TextureNormalEXT */
+   { 14262, -1 }, /* TextureNormalEXT */
    {    -1, -1 }
 };
 #endif
@@ -6232,18 +6228,18 @@ static const struct gl_function_remap GL_EXT_transform_feedback_functions[] = {
 #if defined(need_GL_EXT_vertex_array)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_EXT_vertex_array_functions[] = {
-   { 25186, _gloffset_ArrayElement },
-   { 31894, _gloffset_GetPointerv },
-   { 33479, _gloffset_DrawArrays },
+   { 25179, _gloffset_ArrayElement },
+   { 31887, _gloffset_GetPointerv },
+   { 33472, _gloffset_DrawArrays },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_vertex_weighting)
 static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
-   { 20444, -1 }, /* VertexWeightfvEXT */
-   { 27982, -1 }, /* VertexWeightfEXT */
-   { 29651, -1 }, /* VertexWeightPointerEXT */
+   { 20437, -1 }, /* VertexWeightfvEXT */
+   { 27975, -1 }, /* VertexWeightfEXT */
+   { 29644, -1 }, /* VertexWeightPointerEXT */
    {    -1, -1 }
 };
 #endif
@@ -6251,11 +6247,11 @@ static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
 #if defined(need_GL_HP_image_transform)
 static const struct gl_function_remap GL_HP_image_transform_functions[] = {
    {  2400, -1 }, /* GetImageTransformParameterfvHP */
-   {  3815, -1 }, /* ImageTransformParameterfHP */
-   { 10581, -1 }, /* ImageTransformParameterfvHP */
-   { 12323, -1 }, /* ImageTransformParameteriHP */
-   { 12693, -1 }, /* GetImageTransformParameterivHP */
-   { 20508, -1 }, /* ImageTransformParameterivHP */
+   {  3844, -1 }, /* ImageTransformParameterfHP */
+   { 10610, -1 }, /* ImageTransformParameterfvHP */
+   { 12352, -1 }, /* ImageTransformParameteriHP */
+   { 12722, -1 }, /* GetImageTransformParameterivHP */
+   { 20501, -1 }, /* ImageTransformParameterivHP */
    {    -1, -1 }
 };
 #endif
@@ -6269,14 +6265,14 @@ static const struct gl_function_remap GL_IBM_multimode_draw_arrays_functions[] =
 
 #if defined(need_GL_IBM_vertex_array_lists)
 static const struct gl_function_remap GL_IBM_vertex_array_lists_functions[] = {
-   {  4510, -1 }, /* SecondaryColorPointerListIBM */
-   {  6340, -1 }, /* NormalPointerListIBM */
-   {  8031, -1 }, /* FogCoordPointerListIBM */
-   {  8372, -1 }, /* VertexPointerListIBM */
-   { 12577, -1 }, /* ColorPointerListIBM */
-   { 13791, -1 }, /* TexCoordPointerListIBM */
-   { 14291, -1 }, /* IndexPointerListIBM */
-   { 33871, -1 }, /* EdgeFlagPointerListIBM */
+   {  4539, -1 }, /* SecondaryColorPointerListIBM */
+   {  6369, -1 }, /* NormalPointerListIBM */
+   {  8060, -1 }, /* FogCoordPointerListIBM */
+   {  8401, -1 }, /* VertexPointerListIBM */
+   { 12606, -1 }, /* ColorPointerListIBM */
+   { 13784, -1 }, /* TexCoordPointerListIBM */
+   { 14284, -1 }, /* IndexPointerListIBM */
+   { 33864, -1 }, /* EdgeFlagPointerListIBM */
    {    -1, -1 }
 };
 #endif
@@ -6290,10 +6286,10 @@ static const struct gl_function_remap GL_INGR_blend_func_separate_functions[] =
 
 #if defined(need_GL_INTEL_parallel_arrays)
 static const struct gl_function_remap GL_INTEL_parallel_arrays_functions[] = {
-   { 13131, -1 }, /* VertexPointervINTEL */
-   { 16005, -1 }, /* ColorPointervINTEL */
-   { 31053, -1 }, /* NormalPointervINTEL */
-   { 31576, -1 }, /* TexCoordPointervINTEL */
+   { 13124, -1 }, /* VertexPointervINTEL */
+   { 15998, -1 }, /* ColorPointervINTEL */
+   { 31046, -1 }, /* NormalPointervINTEL */
+   { 31569, -1 }, /* TexCoordPointervINTEL */
    {    -1, -1 }
 };
 #endif
@@ -6308,9 +6304,9 @@ static const struct gl_function_remap GL_MESA_resize_buffers_functions[] = {
 #if defined(need_GL_MESA_shader_debug)
 static const struct gl_function_remap GL_MESA_shader_debug_functions[] = {
    {  1690, -1 }, /* GetDebugLogLengthMESA */
-   {  3537, -1 }, /* ClearDebugLogMESA */
-   {  4695, -1 }, /* GetDebugLogMESA */
-   { 32087, -1 }, /* CreateDebugObjectMESA */
+   {  3566, -1 }, /* ClearDebugLogMESA */
+   {  4724, -1 }, /* GetDebugLogMESA */
+   { 32080, -1 }, /* CreateDebugObjectMESA */
    {    -1, -1 }
 };
 #endif
@@ -6331,15 +6327,15 @@ static const struct gl_function_remap GL_NV_condtitional_render_functions[] = {
 
 #if defined(need_GL_NV_evaluators)
 static const struct gl_function_remap GL_NV_evaluators_functions[] = {
-   {  7070, -1 }, /* GetMapAttribParameterivNV */
-   {  8803, -1 }, /* MapControlPointsNV */
-   {  8902, -1 }, /* MapParameterfvNV */
-   { 11026, -1 }, /* EvalMapsNV */
-   { 17830, -1 }, /* GetMapAttribParameterfvNV */
-   { 18047, -1 }, /* MapParameterivNV */
-   { 25800, -1 }, /* GetMapParameterivNV */
-   { 26343, -1 }, /* GetMapParameterfvNV */
-   { 30368, -1 }, /* GetMapControlPointsNV */
+   {  7099, -1 }, /* GetMapAttribParameterivNV */
+   {  8832, -1 }, /* MapControlPointsNV */
+   {  8931, -1 }, /* MapParameterfvNV */
+   { 11055, -1 }, /* EvalMapsNV */
+   { 17823, -1 }, /* GetMapAttribParameterfvNV */
+   { 18040, -1 }, /* MapParameterivNV */
+   { 25793, -1 }, /* GetMapParameterivNV */
+   { 26336, -1 }, /* GetMapParameterfvNV */
+   { 30361, -1 }, /* GetMapControlPointsNV */
    {    -1, -1 }
 };
 #endif
@@ -6381,8 +6377,8 @@ static const struct gl_function_remap GL_NV_register_combiners_functions[] = {
 
 #if defined(need_GL_NV_register_combiners2)
 static const struct gl_function_remap GL_NV_register_combiners2_functions[] = {
-   { 16424, -1 }, /* CombinerStageParameterfvNV */
-   { 16820, -1 }, /* GetCombinerStageParameterfvNV */
+   { 16417, -1 }, /* CombinerStageParameterfvNV */
+   { 16813, -1 }, /* GetCombinerStageParameterfvNV */
    {    -1, -1 }
 };
 #endif
@@ -6417,23 +6413,23 @@ static const struct gl_function_remap GL_OES_EGL_image_functions[] = {
 
 #if defined(need_GL_PGI_misc_hints)
 static const struct gl_function_remap GL_PGI_misc_hints_functions[] = {
-   {  9023, -1 }, /* HintPGI */
+   {  9052, -1 }, /* HintPGI */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_detail_texture)
 static const struct gl_function_remap GL_SGIS_detail_texture_functions[] = {
-   { 16793, -1 }, /* GetDetailTexFuncSGIS */
-   { 17264, -1 }, /* DetailTexFuncSGIS */
+   { 16786, -1 }, /* GetDetailTexFuncSGIS */
+   { 17257, -1 }, /* DetailTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_fog_function)
 static const struct gl_function_remap GL_SGIS_fog_function_functions[] = {
-   { 28279, -1 }, /* FogFuncSGIS */
-   { 29000, -1 }, /* GetFogFuncSGIS */
+   { 28272, -1 }, /* FogFuncSGIS */
+   { 28993, -1 }, /* GetFogFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -6461,8 +6457,8 @@ static const struct gl_function_remap GL_SGIS_point_parameters_functions[] = {
 
 #if defined(need_GL_SGIS_sharpen_texture)
 static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
-   {  7131, -1 }, /* GetSharpenTexFuncSGIS */
-   { 23048, -1 }, /* SharpenTexFuncSGIS */
+   {  7160, -1 }, /* GetSharpenTexFuncSGIS */
+   { 23041, -1 }, /* SharpenTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -6470,41 +6466,41 @@ static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
 #if defined(need_GL_SGIS_texture4D)
 static const struct gl_function_remap GL_SGIS_texture4D_functions[] = {
    {   995, -1 }, /* TexImage4DSGIS */
-   { 16340, -1 }, /* TexSubImage4DSGIS */
+   { 16333, -1 }, /* TexSubImage4DSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_color_mask)
 static const struct gl_function_remap GL_SGIS_texture_color_mask_functions[] = {
-   { 15711, -1 }, /* TextureColorMaskSGIS */
+   { 15704, -1 }, /* TextureColorMaskSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_filter4)
 static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {
-   {  7308, -1 }, /* GetTexFilterFuncSGIS */
-   { 16966, -1 }, /* TexFilterFuncSGIS */
+   {  7337, -1 }, /* GetTexFilterFuncSGIS */
+   { 16959, -1 }, /* TexFilterFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_async)
 static const struct gl_function_remap GL_SGIX_async_functions[] = {
-   {  3463, -1 }, /* AsyncMarkerSGIX */
-   {  4649, -1 }, /* FinishAsyncSGIX */
-   {  5721, -1 }, /* PollAsyncSGIX */
-   { 23257, -1 }, /* DeleteAsyncMarkersSGIX */
-   { 23312, -1 }, /* IsAsyncMarkerSGIX */
-   { 33668, -1 }, /* GenAsyncMarkersSGIX */
+   {  3492, -1 }, /* AsyncMarkerSGIX */
+   {  4678, -1 }, /* FinishAsyncSGIX */
+   {  5750, -1 }, /* PollAsyncSGIX */
+   { 23250, -1 }, /* DeleteAsyncMarkersSGIX */
+   { 23305, -1 }, /* IsAsyncMarkerSGIX */
+   { 33661, -1 }, /* GenAsyncMarkersSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_flush_raster)
 static const struct gl_function_remap GL_SGIX_flush_raster_functions[] = {
-   {  7685, -1 }, /* FlushRasterSGIX */
+   {  7714, -1 }, /* FlushRasterSGIX */
    {    -1, -1 }
 };
 #endif
@@ -6512,37 +6508,37 @@ static const struct gl_function_remap GL_SGIX_flush_raster_functions[] = {
 #if defined(need_GL_SGIX_fragment_lighting)
 static const struct gl_function_remap GL_SGIX_fragment_lighting_functions[] = {
    {  2698, -1 }, /* FragmentMaterialfvSGIX */
-   {  5625, -1 }, /* FragmentLightiSGIX */
-   {  8439, -1 }, /* FragmentMaterialfSGIX */
-   {  8576, -1 }, /* GetFragmentLightivSGIX */
-   {  9449, -1 }, /* FragmentLightModeliSGIX */
-   { 11089, -1 }, /* FragmentLightivSGIX */
-   { 11396, -1 }, /* GetFragmentMaterialivSGIX */
-   { 16733, -1 }, /* GetFragmentMaterialfvSGIX */
-   { 20313, -1 }, /* FragmentLightModelfSGIX */
-   { 20631, -1 }, /* FragmentColorMaterialSGIX */
-   { 21048, -1 }, /* FragmentMaterialiSGIX */
-   { 22343, -1 }, /* LightEnviSGIX */
-   { 24029, -1 }, /* FragmentLightModelfvSGIX */
-   { 24364, -1 }, /* FragmentLightfvSGIX */
-   { 29384, -1 }, /* FragmentLightModelivSGIX */
-   { 29533, -1 }, /* FragmentLightfSGIX */
-   { 32463, -1 }, /* GetFragmentLightfvSGIX */
-   { 34151, -1 }, /* FragmentMaterialivSGIX */
+   {  5654, -1 }, /* FragmentLightiSGIX */
+   {  8468, -1 }, /* FragmentMaterialfSGIX */
+   {  8605, -1 }, /* GetFragmentLightivSGIX */
+   {  9478, -1 }, /* FragmentLightModeliSGIX */
+   { 11118, -1 }, /* FragmentLightivSGIX */
+   { 11425, -1 }, /* GetFragmentMaterialivSGIX */
+   { 16726, -1 }, /* GetFragmentMaterialfvSGIX */
+   { 20306, -1 }, /* FragmentLightModelfSGIX */
+   { 20624, -1 }, /* FragmentColorMaterialSGIX */
+   { 21041, -1 }, /* FragmentMaterialiSGIX */
+   { 22336, -1 }, /* LightEnviSGIX */
+   { 24022, -1 }, /* FragmentLightModelfvSGIX */
+   { 24357, -1 }, /* FragmentLightfvSGIX */
+   { 29377, -1 }, /* FragmentLightModelivSGIX */
+   { 29526, -1 }, /* FragmentLightfSGIX */
+   { 32456, -1 }, /* GetFragmentLightfvSGIX */
+   { 34144, -1 }, /* FragmentMaterialivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_framezoom)
 static const struct gl_function_remap GL_SGIX_framezoom_functions[] = {
-   { 23335, -1 }, /* FrameZoomSGIX */
+   { 23328, -1 }, /* FrameZoomSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_igloo_interface)
 static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
-   { 29841, -1 }, /* IglooInterfaceSGIX */
+   { 29834, -1 }, /* IglooInterfaceSGIX */
    {    -1, -1 }
 };
 #endif
@@ -6550,11 +6546,11 @@ static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
 #if defined(need_GL_SGIX_instruments)
 static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
    {  2878, -1 }, /* ReadInstrumentsSGIX */
-   {  6904, -1 }, /* PollInstrumentsSGIX */
-   { 10947, -1 }, /* GetInstrumentsSGIX */
-   { 13389, -1 }, /* StartInstrumentsSGIX */
-   { 16458, -1 }, /* StopInstrumentsSGIX */
-   { 18495, -1 }, /* InstrumentsBufferSGIX */
+   {  6933, -1 }, /* PollInstrumentsSGIX */
+   { 10976, -1 }, /* GetInstrumentsSGIX */
+   { 13382, -1 }, /* StartInstrumentsSGIX */
+   { 16451, -1 }, /* StopInstrumentsSGIX */
+   { 18488, -1 }, /* InstrumentsBufferSGIX */
    {    -1, -1 }
 };
 #endif
@@ -6562,11 +6558,11 @@ static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
 #if defined(need_GL_SGIX_list_priority)
 static const struct gl_function_remap GL_SGIX_list_priority_functions[] = {
    {  1226, -1 }, /* ListParameterfSGIX */
-   {  3165, -1 }, /* GetListParameterfvSGIX */
-   { 18360, -1 }, /* ListParameteriSGIX */
-   { 19519, -1 }, /* ListParameterfvSGIX */
-   { 21714, -1 }, /* ListParameterivSGIX */
-   { 33712, -1 }, /* GetListParameterivSGIX */
+   {  3194, -1 }, /* GetListParameterfvSGIX */
+   { 18353, -1 }, /* ListParameteriSGIX */
+   { 19512, -1 }, /* ListParameterfvSGIX */
+   { 21707, -1 }, /* ListParameterivSGIX */
+   { 33705, -1 }, /* GetListParameterivSGIX */
    {    -1, -1 }
 };
 #endif
@@ -6580,88 +6576,88 @@ static const struct gl_function_remap GL_SGIX_pixel_texture_functions[] = {
 
 #if defined(need_GL_SGIX_polynomial_ffd)
 static const struct gl_function_remap GL_SGIX_polynomial_ffd_functions[] = {
-   {  3761, -1 }, /* LoadIdentityDeformationMapSGIX */
-   { 16558, -1 }, /* DeformSGIX */
-   { 25298, -1 }, /* DeformationMap3fSGIX */
-   { 32351, -1 }, /* DeformationMap3dSGIX */
+   {  3790, -1 }, /* LoadIdentityDeformationMapSGIX */
+   { 16551, -1 }, /* DeformSGIX */
+   { 25291, -1 }, /* DeformationMap3fSGIX */
+   { 32344, -1 }, /* DeformationMap3dSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_reference_plane)
 static const struct gl_function_remap GL_SGIX_reference_plane_functions[] = {
-   { 15262, -1 }, /* ReferencePlaneSGIX */
+   { 15255, -1 }, /* ReferencePlaneSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_sprite)
 static const struct gl_function_remap GL_SGIX_sprite_functions[] = {
-   {  9947, -1 }, /* SpriteParameterfvSGIX */
-   { 21503, -1 }, /* SpriteParameteriSGIX */
-   { 27683, -1 }, /* SpriteParameterfSGIX */
-   { 30511, -1 }, /* SpriteParameterivSGIX */
+   {  9976, -1 }, /* SpriteParameterfvSGIX */
+   { 21496, -1 }, /* SpriteParameteriSGIX */
+   { 27676, -1 }, /* SpriteParameterfSGIX */
+   { 30504, -1 }, /* SpriteParameterivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_tag_sample_buffer)
 static const struct gl_function_remap GL_SGIX_tag_sample_buffer_functions[] = {
-   { 21562, -1 }, /* TagSampleBufferSGIX */
+   { 21555, -1 }, /* TagSampleBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGI_color_table)
 static const struct gl_function_remap GL_SGI_color_table_functions[] = {
-   {  7975, _gloffset_ColorTableParameteriv },
-   {  8697, _gloffset_ColorTable },
-   { 15758, _gloffset_GetColorTable },
-   { 15868, _gloffset_CopyColorTable },
-   { 20257, _gloffset_ColorTableParameterfv },
-   { 23937, _gloffset_GetColorTableParameterfv },
-   { 26101, _gloffset_GetColorTableParameteriv },
+   {  8004, _gloffset_ColorTableParameteriv },
+   {  8726, _gloffset_ColorTable },
+   { 15751, _gloffset_GetColorTable },
+   { 15861, _gloffset_CopyColorTable },
+   { 20250, _gloffset_ColorTableParameterfv },
+   { 23930, _gloffset_GetColorTableParameterfv },
+   { 26094, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUNX_constant_data)
 static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
-   { 32441, -1 }, /* FinishTextureSUNX */
+   { 32434, -1 }, /* FinishTextureSUNX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_global_alpha)
 static const struct gl_function_remap GL_SUN_global_alpha_functions[] = {
-   {  3484, -1 }, /* GlobalAlphaFactorubSUN */
-   {  5002, -1 }, /* GlobalAlphaFactoriSUN */
-   {  6929, -1 }, /* GlobalAlphaFactordSUN */
-   { 10031, -1 }, /* GlobalAlphaFactoruiSUN */
-   { 10538, -1 }, /* GlobalAlphaFactorbSUN */
-   { 13704, -1 }, /* GlobalAlphaFactorfSUN */
-   { 13868, -1 }, /* GlobalAlphaFactorusSUN */
-   { 23624, -1 }, /* GlobalAlphaFactorsSUN */
+   {  3513, -1 }, /* GlobalAlphaFactorubSUN */
+   {  5031, -1 }, /* GlobalAlphaFactoriSUN */
+   {  6958, -1 }, /* GlobalAlphaFactordSUN */
+   { 10060, -1 }, /* GlobalAlphaFactoruiSUN */
+   { 10567, -1 }, /* GlobalAlphaFactorbSUN */
+   { 13697, -1 }, /* GlobalAlphaFactorfSUN */
+   { 13861, -1 }, /* GlobalAlphaFactorusSUN */
+   { 23617, -1 }, /* GlobalAlphaFactorsSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_mesh_array)
 static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
-   { 30302, -1 }, /* DrawMeshArraysSUN */
+   { 30295, -1 }, /* DrawMeshArraysSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_triangle_list)
 static const struct gl_function_remap GL_SUN_triangle_list_functions[] = {
-   {  4623, -1 }, /* ReplacementCodeubSUN */
-   {  6688, -1 }, /* ReplacementCodeubvSUN */
-   { 19978, -1 }, /* ReplacementCodeusvSUN */
-   { 20166, -1 }, /* ReplacementCodePointerSUN */
-   { 22407, -1 }, /* ReplacementCodeuiSUN */
-   { 23286, -1 }, /* ReplacementCodeusSUN */
-   { 30968, -1 }, /* ReplacementCodeuivSUN */
+   {  4652, -1 }, /* ReplacementCodeubSUN */
+   {  6717, -1 }, /* ReplacementCodeubvSUN */
+   { 19971, -1 }, /* ReplacementCodeusvSUN */
+   { 20159, -1 }, /* ReplacementCodePointerSUN */
+   { 22400, -1 }, /* ReplacementCodeuiSUN */
+   { 23279, -1 }, /* ReplacementCodeusSUN */
+   { 30961, -1 }, /* ReplacementCodeuivSUN */
    {    -1, -1 }
 };
 #endif
@@ -6675,39 +6671,39 @@ static const struct gl_function_remap GL_SUN_vertex_functions[] = {
    {  2055, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fvSUN */
    {  2634, -1 }, /* ReplacementCodeuiNormal3fVertex3fSUN */
    {  2974, -1 }, /* Color4ubVertex3fvSUN */
-   {  4807, -1 }, /* Color4ubVertex3fSUN */
-   {  4930, -1 }, /* TexCoord2fVertex3fSUN */
-   {  5348, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
-   {  5825, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
-   {  6583, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
-   {  7363, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
-   {  7722, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
-   {  9248, -1 }, /* Color3fVertex3fSUN */
-   { 10447, -1 }, /* Color3fVertex3fvSUN */
-   { 10912, -1 }, /* Color4fNormal3fVertex3fvSUN */
-   { 11741, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 13252, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
-   { 14878, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
-   { 15404, -1 }, /* TexCoord2fColor3fVertex3fSUN */
-   { 16483, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
-   { 16925, -1 }, /* Color4ubVertex2fvSUN */
-   { 17289, -1 }, /* Normal3fVertex3fSUN */
-   { 18436, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
-   { 18788, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 19095, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
-   { 19771, -1 }, /* TexCoord2fVertex3fvSUN */
-   { 20601, -1 }, /* Color4ubVertex2fSUN */
-   { 20839, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
-   { 22873, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
-   { 23354, -1 }, /* Normal3fVertex3fvSUN */
-   { 23846, -1 }, /* Color4fNormal3fVertex3fSUN */
-   { 24847, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
-   { 27004, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
-   { 28395, -1 }, /* TexCoord4fVertex4fSUN */
-   { 28841, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
-   { 29228, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
-   { 29355, -1 }, /* TexCoord4fVertex4fvSUN */
-   { 30089, -1 }, /* ReplacementCodeuiVertex3fSUN */
+   {  4836, -1 }, /* Color4ubVertex3fSUN */
+   {  4959, -1 }, /* TexCoord2fVertex3fSUN */
+   {  5377, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
+   {  5854, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
+   {  6612, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
+   {  7392, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
+   {  7751, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
+   {  9277, -1 }, /* Color3fVertex3fSUN */
+   { 10476, -1 }, /* Color3fVertex3fvSUN */
+   { 10941, -1 }, /* Color4fNormal3fVertex3fvSUN */
+   { 11770, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 13245, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
+   { 14871, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
+   { 15397, -1 }, /* TexCoord2fColor3fVertex3fSUN */
+   { 16476, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
+   { 16918, -1 }, /* Color4ubVertex2fvSUN */
+   { 17282, -1 }, /* Normal3fVertex3fSUN */
+   { 18429, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
+   { 18781, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 19088, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
+   { 19764, -1 }, /* TexCoord2fVertex3fvSUN */
+   { 20594, -1 }, /* Color4ubVertex2fSUN */
+   { 20832, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
+   { 22866, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
+   { 23347, -1 }, /* Normal3fVertex3fvSUN */
+   { 23839, -1 }, /* Color4fNormal3fVertex3fSUN */
+   { 24840, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
+   { 26997, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
+   { 28388, -1 }, /* TexCoord4fVertex4fSUN */
+   { 28834, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
+   { 29221, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
+   { 29348, -1 }, /* TexCoord4fVertex4fvSUN */
+   { 30082, -1 }, /* ReplacementCodeuiVertex3fSUN */
    {    -1, -1 }
 };
 #endif
@@ -6717,38 +6713,38 @@ static const struct gl_function_remap GL_SUN_vertex_functions[] = {
 static const struct gl_function_remap GL_VERSION_1_3_functions[] = {
    {   425, _gloffset_MultiTexCoord3sARB },
    {   657, _gloffset_ActiveTextureARB },
-   {  4378, _gloffset_MultiTexCoord1fvARB },
-   {  6474, _gloffset_MultiTexCoord3dARB },
-   {  6519, _gloffset_MultiTexCoord2iARB },
-   {  6643, _gloffset_MultiTexCoord2svARB },
-   {  8653, _gloffset_MultiTexCoord2fARB },
-   { 10748, _gloffset_MultiTexCoord3fvARB },
-   { 11350, _gloffset_MultiTexCoord4sARB },
-   { 12031, _gloffset_MultiTexCoord2dvARB },
-   { 12438, _gloffset_MultiTexCoord1svARB },
-   { 12839, _gloffset_MultiTexCoord3svARB },
-   { 12900, _gloffset_MultiTexCoord4iARB },
-   { 13731, _gloffset_MultiTexCoord3iARB },
-   { 14601, _gloffset_MultiTexCoord1dARB },
-   { 14833, _gloffset_MultiTexCoord3dvARB },
-   { 16112, _gloffset_MultiTexCoord3ivARB },
-   { 16157, _gloffset_MultiTexCoord2sARB },
-   { 17689, _gloffset_MultiTexCoord4ivARB },
-   { 19897, _gloffset_ClientActiveTextureARB },
-   { 22260, _gloffset_MultiTexCoord2dARB },
-   { 22697, _gloffset_MultiTexCoord4dvARB },
-   { 23074, _gloffset_MultiTexCoord4fvARB },
-   { 24078, _gloffset_MultiTexCoord3fARB },
-   { 26695, _gloffset_MultiTexCoord4dARB },
-   { 26961, _gloffset_MultiTexCoord1sARB },
-   { 27165, _gloffset_MultiTexCoord1dvARB },
-   { 28141, _gloffset_MultiTexCoord1ivARB },
-   { 28234, _gloffset_MultiTexCoord2ivARB },
-   { 28573, _gloffset_MultiTexCoord1iARB },
-   { 29957, _gloffset_MultiTexCoord4svARB },
-   { 30581, _gloffset_MultiTexCoord1fARB },
-   { 30844, _gloffset_MultiTexCoord4fARB },
-   { 33313, _gloffset_MultiTexCoord2fvARB },
+   {  4407, _gloffset_MultiTexCoord1fvARB },
+   {  6503, _gloffset_MultiTexCoord3dARB },
+   {  6548, _gloffset_MultiTexCoord2iARB },
+   {  6672, _gloffset_MultiTexCoord2svARB },
+   {  8682, _gloffset_MultiTexCoord2fARB },
+   { 10777, _gloffset_MultiTexCoord3fvARB },
+   { 11379, _gloffset_MultiTexCoord4sARB },
+   { 12060, _gloffset_MultiTexCoord2dvARB },
+   { 12467, _gloffset_MultiTexCoord1svARB },
+   { 12832, _gloffset_MultiTexCoord3svARB },
+   { 12893, _gloffset_MultiTexCoord4iARB },
+   { 13724, _gloffset_MultiTexCoord3iARB },
+   { 14594, _gloffset_MultiTexCoord1dARB },
+   { 14826, _gloffset_MultiTexCoord3dvARB },
+   { 16105, _gloffset_MultiTexCoord3ivARB },
+   { 16150, _gloffset_MultiTexCoord2sARB },
+   { 17682, _gloffset_MultiTexCoord4ivARB },
+   { 19890, _gloffset_ClientActiveTextureARB },
+   { 22253, _gloffset_MultiTexCoord2dARB },
+   { 22690, _gloffset_MultiTexCoord4dvARB },
+   { 23067, _gloffset_MultiTexCoord4fvARB },
+   { 24071, _gloffset_MultiTexCoord3fARB },
+   { 26688, _gloffset_MultiTexCoord4dARB },
+   { 26954, _gloffset_MultiTexCoord1sARB },
+   { 27158, _gloffset_MultiTexCoord1dvARB },
+   { 28134, _gloffset_MultiTexCoord1ivARB },
+   { 28227, _gloffset_MultiTexCoord2ivARB },
+   { 28566, _gloffset_MultiTexCoord1iARB },
+   { 29950, _gloffset_MultiTexCoord4svARB },
+   { 30574, _gloffset_MultiTexCoord1fARB },
+   { 30837, _gloffset_MultiTexCoord4fARB },
+   { 33306, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 #endif
diff --git a/mesalib/src/mesa/main/shared.c b/mesalib/src/mesa/main/shared.c
index d84f59690..8b7159db0 100644
--- a/mesalib/src/mesa/main/shared.c
+++ b/mesalib/src/mesa/main/shared.c
@@ -200,7 +200,7 @@ delete_bufferobj_cb(GLuint id, void *data, void *userData)
    struct gl_buffer_object *bufObj = (struct gl_buffer_object *) data;
    struct gl_context *ctx = (struct gl_context *) userData;
    if (_mesa_bufferobj_mapped(bufObj)) {
-      ctx->Driver.UnmapBuffer(ctx, 0, bufObj);
+      ctx->Driver.UnmapBuffer(ctx, bufObj);
       bufObj->Pointer = NULL;
    }
    _mesa_reference_buffer_object(ctx, &bufObj, NULL);
diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c
index 26c2ff98b..b2ebb0de4 100644
--- a/mesalib/src/mesa/main/texgetimage.c
+++ b/mesalib/src/mesa/main/texgetimage.c
@@ -441,8 +441,8 @@ _mesa_get_teximage(struct gl_context *ctx, GLenum target, GLint level,
        * texture data to the PBO if the PBO is in VRAM along with the texture.
        */
       GLubyte *buf = (GLubyte *)
-         ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                               GL_WRITE_ONLY_ARB, ctx->Pack.BufferObj);
+         ctx->Driver.MapBufferRange(ctx, 0, ctx->Pack.BufferObj->Size,
+				    GL_MAP_WRITE_BIT, ctx->Pack.BufferObj);
       if (!buf) {
          /* out of memory or other unexpected error */
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGetTexImage(map PBO failed)");
@@ -474,8 +474,7 @@ _mesa_get_teximage(struct gl_context *ctx, GLenum target, GLint level,
    }
 
    if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
+      ctx->Driver.UnmapBuffer(ctx, ctx->Pack.BufferObj);
    }
 }
 
@@ -500,8 +499,8 @@ _mesa_get_compressed_teximage(struct gl_context *ctx, GLenum target, GLint level
    if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
       /* pack texture image into a PBO */
       GLubyte *buf = (GLubyte *)
-         ctx->Driver.MapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                               GL_WRITE_ONLY_ARB, ctx->Pack.BufferObj);
+         ctx->Driver.MapBufferRange(ctx, 0, ctx->Pack.BufferObj->Size,
+				    GL_MAP_WRITE_BIT, ctx->Pack.BufferObj);
       if (!buf) {
          /* out of memory or other unexpected error */
          _mesa_error(ctx, GL_OUT_OF_MEMORY,
@@ -531,8 +530,7 @@ _mesa_get_compressed_teximage(struct gl_context *ctx, GLenum target, GLint level
    }
 
    if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
-      ctx->Driver.UnmapBuffer(ctx, GL_PIXEL_PACK_BUFFER_EXT,
-                              ctx->Pack.BufferObj);
+      ctx->Driver.UnmapBuffer(ctx, ctx->Pack.BufferObj);
    }
 }
 
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 27717cfb0..a005d2935 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -571,6 +571,8 @@ _mesa_set_tex_image(struct gl_texture_object *tObj,
 
    /* Set the 'back' pointer */
    texImage->TexObject = tObj;
+   texImage->Level = level;
+   texImage->Face = face;
 }
 
 
diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c
index 1329af4cd..cda840fe2 100644
--- a/mesalib/src/mesa/main/uniforms.c
+++ b/mesalib/src/mesa/main/uniforms.c
@@ -454,9 +454,9 @@ get_uniform(struct gl_context *ctx, GLuint program, GLint location,
             for (i = 0; i < rows; i++) {
                const int base = paramPos + offset + i;
                for (j = 0; j < cols; j++ ) {
-                  params[k++] = ctx->Const.GLSLVersion <= 120 ? 
-                     (GLint) prog->Parameters->ParameterValues[base][j].f : 
-                     prog->Parameters->ParameterValues[base][j].i;
+                  params[k++] = ctx->Const.NativeIntegers ?
+                     prog->Parameters->ParameterValues[base][j].i :
+                     (GLint) prog->Parameters->ParameterValues[base][j].f;
                }
             }
          }
@@ -468,9 +468,9 @@ get_uniform(struct gl_context *ctx, GLuint program, GLint location,
             for (i = 0; i < rows; i++) {
                const int base = paramPos + offset + i;
                for (j = 0; j < cols; j++ ) {
-                  params[k++] = ctx->Const.GLSLVersion <= 120 ? 
-                     (GLuint) prog->Parameters->ParameterValues[base][j].f : 
-                     prog->Parameters->ParameterValues[base][j].u;
+                  params[k++] = ctx->Const.NativeIntegers ?
+                     prog->Parameters->ParameterValues[base][j].u :
+                     (GLuint) prog->Parameters->ParameterValues[base][j].f;
                }
             }
          }
@@ -750,7 +750,7 @@ set_program_uniform(struct gl_context *ctx, struct gl_program *program,
          if (basicType == GL_INT) {
             const GLint *iValues = ((const GLint *) values) + k * elems;
             for (i = 0; i < elems; i++) {
-               if (ctx->Const.GLSLVersion <= 120)
+               if (!ctx->Const.NativeIntegers)
                   uniformVal[i].f = (GLfloat) iValues[i];
                else
                   uniformVal[i].i = iValues[i];
@@ -759,7 +759,7 @@ set_program_uniform(struct gl_context *ctx, struct gl_program *program,
          else if (basicType == GL_UNSIGNED_INT) {
             const GLuint *iValues = ((const GLuint *) values) + k * elems;
             for (i = 0; i < elems; i++) {
-               if (ctx->Const.GLSLVersion <= 120)
+               if (!ctx->Const.NativeIntegers)
                   uniformVal[i].f = (GLfloat)(GLuint) iValues[i];
                else
                   uniformVal[i].u = iValues[i];
@@ -781,7 +781,7 @@ set_program_uniform(struct gl_context *ctx, struct gl_program *program,
                else
                   uniformVal[i].b = uniformVal[i].u ? 1 : 0;
                
-               if (ctx->Const.GLSLVersion <= 120)
+               if (!ctx->Const.NativeIntegers)
                   uniformVal[i].f = uniformVal[i].b ? 1.0f : 0.0f;
             }
          }