svn merge ^/branches/released .

author: marha <marha@users.sourceforge.net> 2011-04-06 21:03:59 +0000
committer: marha <marha@users.sourceforge.net> 2011-04-06 21:03:59 +0000
commit: e2b908c356746281aba48128da7dc15a28f5a773 (patch)
tree: 5f0a12dfa33c059d8fe09d9a5a792792f44189a6 /mesalib/src/mesa
parent: 1fc1b7f67928082b9e922463be25c232d9bcba6a (diff)
parent: 704e01fc69ebf6302aa1876906805147248abdaa (diff)
download: vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.gz
vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.bz2
vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.zip
32 files changed, 5610 insertions, 5216 deletions
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript
index 3ea84fd01..c6c3ddd12 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -390,6 +390,18 @@ if env['gcc'] and env['platform'] != 'windows':
         # build dir) to the include path
         env.Append(CPPPATH = [matypes[0].dir])
 
+
+# Create the git_sha1.h file if it doesn't exist already
+try:
+    f = open('main/git_sha1.h', 'r')
+    f.close()
+except IOError:
+    f = open('main/git_sha1.h', 'w')
+    f.close()
+# and update CPPPATH so the git_sha1.h header can be found
+env.Append(CPPPATH = ["#" + env['build_dir'] + "/mesa/main"])
+
+
 #
 # Libraries
 #
diff --git a/mesalib/src/mesa/drivers/dri/common/utils.c b/mesalib/src/mesa/drivers/dri/common/utils.c
index a36f65da4..2df2386ff 100644
--- a/mesalib/src/mesa/drivers/dri/common/utils.c
+++ b/mesalib/src/mesa/drivers/dri/common/utils.c
@@ -96,7 +96,6 @@ driParseDebugString( const char * debug,
  * 
  * \param buffer         Buffer to hold the \c GL_RENDERER string.
  * \param hardware_name  Name of the hardware.
- * \param driver_date    Driver date.
  * \param agp_mode       AGP mode (speed).
  * 
  * \returns
@@ -105,12 +104,12 @@ driParseDebugString( const char * debug,
  */
 unsigned
 driGetRendererString( char * buffer, const char * hardware_name,
-		      const char * driver_date, GLuint agp_mode )
+		      GLuint agp_mode )
 {
    unsigned offset;
    char *cpu;
 
-   offset = sprintf( buffer, "Mesa DRI %s %s", hardware_name, driver_date );
+   offset = sprintf( buffer, "Mesa DRI %s", hardware_name );
 
    /* Append any AGP-specific information.
     */
diff --git a/mesalib/src/mesa/drivers/dri/common/utils.h b/mesalib/src/mesa/drivers/dri/common/utils.h
index 2c952dc19..10fb23de9 100644
--- a/mesalib/src/mesa/drivers/dri/common/utils.h
+++ b/mesalib/src/mesa/drivers/dri/common/utils.h
@@ -76,7 +76,7 @@ extern unsigned driParseDebugString( const char * debug,
     const struct dri_debug_control * control );
 
 extern unsigned driGetRendererString( char * buffer,
-    const char * hardware_name, const char * driver_date, GLuint agp_mode );
+    const char * hardware_name, GLuint agp_mode );
 
 extern void driInitExtensions( struct gl_context * ctx, 
     const struct dri_extension * card_extensions, GLboolean enable_imaging );
diff --git a/mesalib/src/mesa/main/api_exec.c b/mesalib/src/mesa/main/api_exec.c
index 5a5c8d829..c939758c6 100644
--- a/mesalib/src/mesa/main/api_exec.c
+++ b/mesalib/src/mesa/main/api_exec.c
@@ -725,6 +725,9 @@ _mesa_create_exec_table(void)
    /* GL_NV_texture_barrier */
    SET_TextureBarrierNV(exec, _mesa_TextureBarrierNV);
  
+   /* GL_ARB_texture_buffer_object */
+   SET_TexBufferARB(exec, _mesa_TexBuffer);
+
    return exec;
 }
 
diff --git a/mesalib/src/mesa/main/attrib.c b/mesalib/src/mesa/main/attrib.c
index 363213c71..34cee5e32 100644
--- a/mesalib/src/mesa/main/attrib.c
+++ b/mesalib/src/mesa/main/attrib.c
@@ -790,6 +790,8 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate)
                   !ctx->Extensions.MESA_texture_array) {
             continue;
          }
+         else if (obj->Target == GL_TEXTURE_BUFFER)
+            continue;
 
          target = obj->Target;
 
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index 349288e73..1d64e63f9 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -93,6 +93,11 @@ get_buffer_target(struct gl_context *ctx, GLenum target)
       }
       break;
 #endif
+   case GL_TEXTURE_BUFFER:
+      if (ctx->Extensions.ARB_texture_buffer_object) {
+         return &ctx->Texture.BufferObject;
+      }
+      break;
    default:
       return NULL;
    }
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c
index d5baf4a29..4f6712a10 100644
--- a/mesalib/src/mesa/main/context.c
+++ b/mesalib/src/mesa/main/context.c
@@ -567,6 +567,7 @@ _mesa_init_constants(struct gl_context *ctx)
                                      ctx->Const.MaxTextureImageUnits);
    ctx->Const.MaxTextureMaxAnisotropy = MAX_TEXTURE_MAX_ANISOTROPY;
    ctx->Const.MaxTextureLodBias = MAX_TEXTURE_LOD_BIAS;
+   ctx->Const.MaxTextureBufferSize = 65536;
    ctx->Const.MaxArrayLockSize = MAX_ARRAY_LOCK_SIZE;
    ctx->Const.SubPixelBits = SUB_PIXEL_BITS;
    ctx->Const.MinPointSize = MIN_POINT_SIZE;
diff --git a/mesalib/src/mesa/main/debug.c b/mesalib/src/mesa/main/debug.c
index f82e32ed8..99030ac8e 100644
--- a/mesalib/src/mesa/main/debug.c
+++ b/mesalib/src/mesa/main/debug.c
@@ -183,7 +183,7 @@ static void add_debug_flags( const char *debug )
 
    MESA_VERBOSE = 0x0;
    for (i = 0; i < Elements(debug_opt); i++) {
-      if (strstr(debug, debug_opt[i].name))
+      if (strstr(debug, debug_opt[i].name) || strcmp(debug, "all") == 0)
          MESA_VERBOSE |= debug_opt[i].flag;
    }
 
diff --git a/mesalib/src/mesa/main/enums.c b/mesalib/src/mesa/main/enums.c
index ece02f41c..c4d8e4d40 100644
--- a/mesalib/src/mesa/main/enums.c
+++ b/mesalib/src/mesa/main/enums.c
@@ -1144,6 +1144,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_SHININESS_NV\0"
    "GL_MAX_SPOT_EXPONENT_NV\0"
    "GL_MAX_TEXTURE_BUFFER_SIZE\0"
+   "GL_MAX_TEXTURE_BUFFER_SIZE_ARB\0"
    "GL_MAX_TEXTURE_COORDS\0"
    "GL_MAX_TEXTURE_COORDS_ARB\0"
    "GL_MAX_TEXTURE_IMAGE_UNITS\0"
@@ -2012,6 +2013,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_BINDING_3D\0"
    "GL_TEXTURE_BINDING_3D_OES\0"
    "GL_TEXTURE_BINDING_BUFFER\0"
+   "GL_TEXTURE_BINDING_BUFFER_ARB\0"
    "GL_TEXTURE_BINDING_CUBE_MAP\0"
    "GL_TEXTURE_BINDING_CUBE_MAP_ARB\0"
    "GL_TEXTURE_BINDING_CUBE_MAP_OES\0"
@@ -2024,8 +2026,11 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TEXTURE_BORDER\0"
    "GL_TEXTURE_BORDER_COLOR\0"
    "GL_TEXTURE_BUFFER\0"
+   "GL_TEXTURE_BUFFER_ARB\0"
    "GL_TEXTURE_BUFFER_DATA_STORE_BINDING\0"
+   "GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB\0"
    "GL_TEXTURE_BUFFER_FORMAT\0"
+   "GL_TEXTURE_BUFFER_FORMAT_ARB\0"
    "GL_TEXTURE_CLIPMAP_CENTER_SGIX\0"
    "GL_TEXTURE_CLIPMAP_DEPTH_SGIX\0"
    "GL_TEXTURE_CLIPMAP_FRAME_SGIX\0"
@@ -2339,7 +2344,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[2300] =
+static const enum_elt all_enums[2305] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -3448,1199 +3453,1204 @@ static const enum_elt all_enums[2300] =
    { 24441, 0x00008504 }, /* GL_MAX_SHININESS_NV */
    { 24461, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
    { 24485, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE */
-   { 24512, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 24534, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 24560, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 24587, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 24618, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 24642, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS_EXT */
-   { 24670, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 24704, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 24724, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 24751, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 24772, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 24797, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 24822, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 24857, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
-   { 24906, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */
-   { 24959, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
-   { 25002, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */
-   { 25049, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
-   { 25095, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */
-   { 25145, 0x00008B4B }, /* GL_MAX_VARYING_COMPONENTS */
-   { 25171, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 25193, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 25219, 0x00008DFC }, /* GL_MAX_VARYING_VECTORS */
-   { 25242, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 25264, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 25290, 0x00009122 }, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
-   { 25322, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 25356, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 25394, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 25427, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 25464, 0x00008DFB }, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
-   { 25494, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 25518, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_OES */
-   { 25542, 0x00008DDE }, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
-   { 25579, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 25600, 0x00008DF1 }, /* GL_MEDIUM_FLOAT */
-   { 25616, 0x00008DF4 }, /* GL_MEDIUM_INT */
-   { 25630, 0x00008007 }, /* GL_MIN */
-   { 25637, 0x0000802E }, /* GL_MINMAX */
-   { 25647, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 25661, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 25678, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 25699, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 25714, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 25733, 0x0000821C }, /* GL_MINOR_VERSION */
-   { 25750, 0x00008007 }, /* GL_MIN_EXT */
-   { 25761, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
-   { 25789, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET_EXT */
-   { 25821, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 25840, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 25863, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 25886, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 25906, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 25926, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 25956, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 25984, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 26012, 0x00001700 }, /* GL_MODELVIEW */
-   { 26025, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 26043, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 26062, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 26081, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 26100, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 26119, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 26138, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 26157, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 26176, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 26195, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 26214, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 26233, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 26251, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 26270, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 26289, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 26308, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 26327, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 26346, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 26365, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 26384, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 26403, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 26422, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 26441, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 26459, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 26478, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 26497, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 26515, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 26533, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 26551, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 26569, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 26587, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 26605, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 26623, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 26643, 0x0000898D }, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 26685, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 26712, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 26737, 0x00002100 }, /* GL_MODULATE */
-   { 26749, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 26769, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 26796, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 26821, 0x00000103 }, /* GL_MULT */
-   { 26829, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 26844, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 26864, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 26883, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 26902, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 26926, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 26949, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 26979, 0x00002A25 }, /* GL_N3F_V3F */
-   { 26990, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 27010, 0x0000150E }, /* GL_NAND */
-   { 27018, 0x00002600 }, /* GL_NEAREST */
-   { 27029, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 27060, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 27092, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 27117, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 27143, 0x00000200 }, /* GL_NEVER */
-   { 27152, 0x00001102 }, /* GL_NICEST */
-   { 27162, 0x00000000 }, /* GL_NONE */
-   { 27170, 0x00000000 }, /* GL_NONE_OES */
-   { 27182, 0x00001505 }, /* GL_NOOP */
-   { 27190, 0x00001508 }, /* GL_NOR */
-   { 27197, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 27210, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 27226, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 27257, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 27292, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 27316, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 27339, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 27360, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 27374, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 27392, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 27409, 0x00008511 }, /* GL_NORMAL_MAP_OES */
-   { 27427, 0x00000205 }, /* GL_NOTEQUAL */
-   { 27439, 0x00000000 }, /* GL_NO_ERROR */
-   { 27451, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 27485, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 27523, 0x0000821D }, /* GL_NUM_EXTENSIONS */
-   { 27541, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
-   { 27575, 0x00008DF9 }, /* GL_NUM_SHADER_BINARY_FORMATS */
-   { 27604, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 27636, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 27678, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 27708, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 27748, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 27779, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 27808, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 27836, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 27866, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 27883, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 27909, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 27925, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 27960, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 27982, 0x00009112 }, /* GL_OBJECT_TYPE */
-   { 27997, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 28016, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 28046, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 28067, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 28095, 0x00000001 }, /* GL_ONE */
-   { 28102, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 28130, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 28162, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 28190, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 28222, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 28245, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 28268, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 28291, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 28314, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 28332, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 28354, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 28376, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 28392, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 28412, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 28432, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 28450, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 28472, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 28494, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 28510, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 28530, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 28550, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 28568, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 28590, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 28612, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 28628, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 28648, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 28668, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 28689, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 28708, 0x00001507 }, /* GL_OR */
-   { 28714, 0x00000A01 }, /* GL_ORDER */
-   { 28723, 0x0000150D }, /* GL_OR_INVERTED */
-   { 28738, 0x0000150B }, /* GL_OR_REVERSE */
-   { 28752, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 28769, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 28787, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 28808, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 28828, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 28846, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 28865, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 28885, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 28905, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 28923, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 28942, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 28967, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 28991, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 29012, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 29034, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 29056, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 29081, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 29105, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 29126, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 29148, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 29170, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 29192, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 29223, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 29243, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 29268, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 29288, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 29313, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 29333, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 29358, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 29378, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 29403, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 29423, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 29448, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 29468, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 29493, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 29513, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 29538, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 29558, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 29583, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 29603, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 29628, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 29648, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 29673, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 29691, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 29712, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 29741, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 29774, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 29799, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 29822, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 29853, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 29888, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 29915, 0x00001B00 }, /* GL_POINT */
-   { 29924, 0x00000000 }, /* GL_POINTS */
-   { 29934, 0x00000002 }, /* GL_POINT_BIT */
-   { 29947, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 29977, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 30011, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 30045, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 30080, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 30109, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 30142, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 30175, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 30209, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 30223, 0x00008B9F }, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-   { 30262, 0x00008B9C }, /* GL_POINT_SIZE_ARRAY_OES */
-   { 30286, 0x0000898C }, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
-   { 30318, 0x0000898B }, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
-   { 30349, 0x0000898A }, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
-   { 30378, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 30404, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 30422, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 30444, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 30466, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 30489, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 30507, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 30529, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 30551, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 30574, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 30594, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 30610, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 30631, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 30647, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 30667, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 30696, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 30715, 0x00008861 }, /* GL_POINT_SPRITE_OES */
-   { 30735, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 30761, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 30776, 0x00000009 }, /* GL_POLYGON */
-   { 30787, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 30802, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 30818, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 30841, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 30866, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 30889, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 30912, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 30936, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 30960, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 30978, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 31001, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 31020, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 31043, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 31060, 0x00001203 }, /* GL_POSITION */
-   { 31072, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 31104, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 31140, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 31173, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 31210, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 31241, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 31276, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 31308, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 31344, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 31377, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 31409, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 31445, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 31478, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 31515, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 31545, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 31579, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 31610, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 31645, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 31676, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 31711, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 31743, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 31779, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 31809, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 31843, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 31874, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 31909, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 31941, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 31972, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 32007, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 32039, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 32075, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 32104, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 32137, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 32167, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 32201, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 32240, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 32273, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 32313, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 32347, 0x00008578 }, /* GL_PREVIOUS */
-   { 32359, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 32375, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 32391, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 32408, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 32429, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 32450, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED */
-   { 32474, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */
-   { 32502, 0x00008F9D }, /* GL_PRIMITIVE_RESTART */
-   { 32523, 0x00008F9E }, /* GL_PRIMITIVE_RESTART_INDEX */
-   { 32550, 0x00008559 }, /* GL_PRIMITIVE_RESTART_INDEX_NV */
-   { 32580, 0x00008558 }, /* GL_PRIMITIVE_RESTART_NV */
-   { 32604, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 32637, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 32669, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 32692, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
-   { 32722, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
-   { 32751, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 32774, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 32804, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 32833, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 32861, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 32883, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 32911, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 32939, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 32961, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 32982, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 33022, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 33061, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 33091, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 33126, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 33159, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 33193, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 33232, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 33271, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 33293, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 33319, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 33343, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE */
-   { 33365, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
-   { 33391, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 33414, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 33436, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 33457, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 33478, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 33505, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 33537, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 33569, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 33604, 0x00001701 }, /* GL_PROJECTION */
-   { 33618, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 33639, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 33682, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 33708, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
-   { 33728, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
-   { 33752, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 33773, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 33792, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 33815, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 33854, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 33892, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 33912, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY */
-   { 33938, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 33968, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 33992, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 34012, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY */
-   { 34038, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 34068, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 34092, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 34112, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 34145, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 34171, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 34201, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE */
-   { 34228, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 34259, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 34289, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
-   { 34308, 0x00002003 }, /* GL_Q */
-   { 34313, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 34338, 0x00000007 }, /* GL_QUADS */
-   { 34347, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-   { 34391, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-   { 34439, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 34456, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 34470, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT */
-   { 34497, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
-   { 34527, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT */
-   { 34551, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
-   { 34578, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 34600, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 34626, 0x00008E14 }, /* GL_QUERY_NO_WAIT */
-   { 34643, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
-   { 34663, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 34679, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 34699, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 34725, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 34755, 0x00008E13 }, /* GL_QUERY_WAIT */
-   { 34769, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
-   { 34786, 0x00002002 }, /* GL_R */
-   { 34791, 0x00008C3A }, /* GL_R11F_G11F_B10F */
-   { 34809, 0x00008F98 }, /* GL_R16_SNORM */
-   { 34822, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 34834, 0x00008F94 }, /* GL_R8_SNORM */
-   { 34846, 0x00008C89 }, /* GL_RASTERIZER_DISCARD */
-   { 34868, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
-   { 34894, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 34927, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 34942, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 34962, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
-   { 34990, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 35022, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 35046, 0x000088B8 }, /* GL_READ_ONLY */
-   { 35059, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 35076, 0x000088BA }, /* GL_READ_WRITE */
-   { 35090, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 35108, 0x00001903 }, /* GL_RED */
-   { 35115, 0x00008016 }, /* GL_REDUCE */
-   { 35125, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 35139, 0x00000D15 }, /* GL_RED_BIAS */
-   { 35151, 0x00000D52 }, /* GL_RED_BITS */
-   { 35163, 0x00008D94 }, /* GL_RED_INTEGER */
-   { 35178, 0x00008D94 }, /* GL_RED_INTEGER_EXT */
-   { 35197, 0x00000D14 }, /* GL_RED_SCALE */
-   { 35210, 0x00008F90 }, /* GL_RED_SNORM */
-   { 35223, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 35241, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 35263, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 35284, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
-   { 35306, 0x00008A19 }, /* GL_RELEASED_APPLE */
-   { 35324, 0x00001C00 }, /* GL_RENDER */
-   { 35334, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 35350, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 35377, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
-   { 35408, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
-   { 35432, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 35460, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
-   { 35488, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 35514, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
-   { 35544, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 35571, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
-   { 35602, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 35622, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 35649, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
-   { 35680, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 35703, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 35730, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
-   { 35757, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 35789, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 35825, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
-   { 35861, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
-   { 35881, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 35906, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
-   { 35935, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 35959, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
-   { 35987, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 36016, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
-   { 36049, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 36071, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 36097, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
-   { 36123, 0x00001F01 }, /* GL_RENDERER */
-   { 36135, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 36150, 0x00002901 }, /* GL_REPEAT */
-   { 36160, 0x00001E01 }, /* GL_REPLACE */
-   { 36171, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 36186, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 36209, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 36227, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 36249, 0x00008A1B }, /* GL_RETAINED_APPLE */
-   { 36267, 0x00000102 }, /* GL_RETURN */
-   { 36277, 0x00008F99 }, /* GL_RG16_SNORM */
-   { 36291, 0x00008F95 }, /* GL_RG8_SNORM */
-   { 36304, 0x00001907 }, /* GL_RGB */
-   { 36311, 0x00008052 }, /* GL_RGB10 */
-   { 36320, 0x00008059 }, /* GL_RGB10_A2 */
-   { 36332, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 36348, 0x00008052 }, /* GL_RGB10_EXT */
-   { 36361, 0x00008053 }, /* GL_RGB12 */
-   { 36370, 0x00008053 }, /* GL_RGB12_EXT */
-   { 36383, 0x00008054 }, /* GL_RGB16 */
-   { 36392, 0x0000881B }, /* GL_RGB16F */
-   { 36402, 0x00008D89 }, /* GL_RGB16I */
-   { 36412, 0x00008D89 }, /* GL_RGB16I_EXT */
-   { 36426, 0x00008D77 }, /* GL_RGB16UI */
-   { 36437, 0x00008D77 }, /* GL_RGB16UI_EXT */
-   { 36452, 0x00008054 }, /* GL_RGB16_EXT */
-   { 36465, 0x00008F9A }, /* GL_RGB16_SNORM */
-   { 36480, 0x0000804E }, /* GL_RGB2_EXT */
-   { 36492, 0x00008815 }, /* GL_RGB32F */
-   { 36502, 0x00008D83 }, /* GL_RGB32I */
-   { 36512, 0x00008D83 }, /* GL_RGB32I_EXT */
-   { 36526, 0x00008D71 }, /* GL_RGB32UI */
-   { 36537, 0x00008D71 }, /* GL_RGB32UI_EXT */
-   { 36552, 0x0000804F }, /* GL_RGB4 */
-   { 36560, 0x0000804F }, /* GL_RGB4_EXT */
-   { 36572, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 36585, 0x00008050 }, /* GL_RGB5 */
-   { 36593, 0x00008D62 }, /* GL_RGB565 */
-   { 36603, 0x00008D62 }, /* GL_RGB565_OES */
-   { 36617, 0x00008057 }, /* GL_RGB5_A1 */
-   { 36628, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 36643, 0x00008057 }, /* GL_RGB5_A1_OES */
-   { 36658, 0x00008050 }, /* GL_RGB5_EXT */
-   { 36670, 0x00008051 }, /* GL_RGB8 */
-   { 36678, 0x00008D8F }, /* GL_RGB8I */
-   { 36687, 0x00008D8F }, /* GL_RGB8I_EXT */
-   { 36700, 0x00008D7D }, /* GL_RGB8UI */
-   { 36710, 0x00008D7D }, /* GL_RGB8UI_EXT */
-   { 36724, 0x00008051 }, /* GL_RGB8_EXT */
-   { 36736, 0x00008051 }, /* GL_RGB8_OES */
-   { 36748, 0x00008F96 }, /* GL_RGB8_SNORM */
-   { 36762, 0x00008C3D }, /* GL_RGB9_E5 */
-   { 36773, 0x00001908 }, /* GL_RGBA */
-   { 36781, 0x0000805A }, /* GL_RGBA12 */
-   { 36791, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 36805, 0x0000805B }, /* GL_RGBA16 */
-   { 36815, 0x0000881A }, /* GL_RGBA16F */
-   { 36826, 0x00008D88 }, /* GL_RGBA16I */
-   { 36837, 0x00008D88 }, /* GL_RGBA16I_EXT */
-   { 36852, 0x00008D76 }, /* GL_RGBA16UI */
-   { 36864, 0x00008D76 }, /* GL_RGBA16UI_EXT */
-   { 36880, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 36894, 0x00008F9B }, /* GL_RGBA16_SNORM */
-   { 36910, 0x00008055 }, /* GL_RGBA2 */
-   { 36919, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 36932, 0x00008814 }, /* GL_RGBA32F */
-   { 36943, 0x00008D82 }, /* GL_RGBA32I */
-   { 36954, 0x00008D82 }, /* GL_RGBA32I_EXT */
-   { 36969, 0x00008D70 }, /* GL_RGBA32UI */
-   { 36981, 0x00008D70 }, /* GL_RGBA32UI_EXT */
-   { 36997, 0x00008056 }, /* GL_RGBA4 */
-   { 37006, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 37025, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 37038, 0x00008056 }, /* GL_RGBA4_OES */
-   { 37051, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 37065, 0x00008058 }, /* GL_RGBA8 */
-   { 37074, 0x00008D8E }, /* GL_RGBA8I */
-   { 37084, 0x00008D8E }, /* GL_RGBA8I_EXT */
-   { 37098, 0x00008D7C }, /* GL_RGBA8UI */
-   { 37109, 0x00008D7C }, /* GL_RGBA8UI_EXT */
-   { 37124, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 37137, 0x00008058 }, /* GL_RGBA8_OES */
-   { 37150, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 37165, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 37183, 0x00008820 }, /* GL_RGBA_FLOAT_MODE_ARB */
-   { 37206, 0x00008D99 }, /* GL_RGBA_INTEGER */
-   { 37222, 0x00008D99 }, /* GL_RGBA_INTEGER_EXT */
-   { 37242, 0x00008D9E }, /* GL_RGBA_INTEGER_MODE_EXT */
-   { 37267, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 37280, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 37293, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 37307, 0x00008D98 }, /* GL_RGB_INTEGER */
-   { 37322, 0x00008D98 }, /* GL_RGB_INTEGER_EXT */
-   { 37341, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 37353, 0x00008573 }, /* GL_RGB_SCALE */
-   { 37366, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 37383, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 37400, 0x00008F92 }, /* GL_RGB_SNORM */
-   { 37413, 0x00008F91 }, /* GL_RG_SNORM */
-   { 37425, 0x00000407 }, /* GL_RIGHT */
-   { 37434, 0x00002000 }, /* GL_S */
-   { 37439, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 37453, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY */
-   { 37473, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY_EXT */
-   { 37497, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW */
-   { 37524, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW_EXT */
-   { 37555, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 37576, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 37590, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY */
-   { 37610, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY_EXT */
-   { 37634, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW */
-   { 37661, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW_EXT */
-   { 37692, 0x00008B63 }, /* GL_SAMPLER_2D_RECT */
-   { 37711, 0x00008B64 }, /* GL_SAMPLER_2D_RECT_SHADOW */
-   { 37737, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 37758, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 37772, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
-   { 37790, 0x00008DC2 }, /* GL_SAMPLER_BUFFER */
-   { 37808, 0x00008DC2 }, /* GL_SAMPLER_BUFFER_EXT */
-   { 37830, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 37846, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW */
-   { 37869, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW_EXT */
-   { 37896, 0x000080A9 }, /* GL_SAMPLES */
-   { 37907, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 37923, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 37938, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 37956, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 37978, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 38006, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 38038, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 38061, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 38088, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 38106, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 38129, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 38151, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 38170, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 38193, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 38219, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 38249, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 38274, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 38303, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 38318, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 38333, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 38349, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 38374, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 38414, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 38458, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 38491, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 38521, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 38553, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 38583, 0x00001C02 }, /* GL_SELECT */
-   { 38593, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 38621, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 38646, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 38662, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS */
-   { 38682, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
-   { 38706, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 38733, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 38764, 0x0000150F }, /* GL_SET */
-   { 38771, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
-   { 38796, 0x00008DFA }, /* GL_SHADER_COMPILER */
-   { 38815, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 38836, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 38860, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 38875, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 38890, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 38918, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 38941, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 38971, 0x00001601 }, /* GL_SHININESS */
-   { 38984, 0x00001402 }, /* GL_SHORT */
-   { 38993, 0x00009119 }, /* GL_SIGNALED */
-   { 39005, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 39026, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 39042, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 39062, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 39081, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 39095, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 39110, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 39132, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 39152, 0x00001D01 }, /* GL_SMOOTH */
-   { 39162, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 39195, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 39222, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 39255, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 39282, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 39299, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 39320, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 39341, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 39356, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 39375, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 39394, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 39411, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 39432, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 39453, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 39468, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 39487, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 39506, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 39523, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 39544, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 39565, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 39580, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 39599, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 39618, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 39638, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 39656, 0x00001202 }, /* GL_SPECULAR */
-   { 39668, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 39682, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 39697, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 39715, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 39732, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 39746, 0x00008580 }, /* GL_SRC0_RGB */
-   { 39758, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 39772, 0x00008581 }, /* GL_SRC1_RGB */
-   { 39784, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 39798, 0x00008582 }, /* GL_SRC2_RGB */
-   { 39810, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 39823, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 39845, 0x00000300 }, /* GL_SRC_COLOR */
-   { 39858, 0x00008C40 }, /* GL_SRGB */
-   { 39866, 0x00008C41 }, /* GL_SRGB8 */
-   { 39875, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 39891, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 39905, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 39923, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 39942, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 39957, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 39976, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 39991, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 40010, 0x000088E5 }, /* GL_STATIC_READ */
-   { 40025, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 40044, 0x00001802 }, /* GL_STENCIL */
-   { 40055, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 40077, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 40103, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
-   { 40129, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 40150, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 40175, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 40196, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 40221, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 40253, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 40289, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 40321, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 40357, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 40377, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 40404, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 40430, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 40446, 0x00008224 }, /* GL_STENCIL_BUFFER */
-   { 40464, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 40486, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 40509, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 40525, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 40541, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 40558, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
-   { 40576, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
-   { 40595, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 40618, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 40640, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
-   { 40662, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
-   { 40680, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 40702, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
-   { 40724, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
-   { 40742, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 40764, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
-   { 40786, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 40807, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 40834, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 40861, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 40876, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 40892, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 40921, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 40943, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 40964, 0x00000C33 }, /* GL_STEREO */
-   { 40974, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
-   { 40998, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
-   { 41023, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
-   { 41047, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 41062, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 41081, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 41096, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 41115, 0x000088E1 }, /* GL_STREAM_READ */
-   { 41130, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 41149, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 41166, 0x000084E7 }, /* GL_SUBTRACT */
-   { 41178, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 41194, 0x00009113 }, /* GL_SYNC_CONDITION */
-   { 41212, 0x00009116 }, /* GL_SYNC_FENCE */
-   { 41226, 0x00009115 }, /* GL_SYNC_FLAGS */
-   { 41240, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
-   { 41267, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-   { 41297, 0x00009114 }, /* GL_SYNC_STATUS */
-   { 41312, 0x00002001 }, /* GL_T */
-   { 41317, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 41332, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 41351, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 41367, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 41382, 0x00002A27 }, /* GL_T2F_V3F */
-   { 41393, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 41412, 0x00002A28 }, /* GL_T4F_V4F */
-   { 41423, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 41446, 0x00001702 }, /* GL_TEXTURE */
-   { 41457, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 41469, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 41485, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 41497, 0x000084CA }, /* GL_TEXTURE10 */
-   { 41510, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 41527, 0x000084CB }, /* GL_TEXTURE11 */
-   { 41540, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 41557, 0x000084CC }, /* GL_TEXTURE12 */
-   { 41570, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 41587, 0x000084CD }, /* GL_TEXTURE13 */
-   { 41600, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 41617, 0x000084CE }, /* GL_TEXTURE14 */
-   { 41630, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 41647, 0x000084CF }, /* GL_TEXTURE15 */
-   { 41660, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 41677, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 41690, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 41707, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 41720, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 41737, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 41750, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 41767, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 41780, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 41797, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 41813, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 41825, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 41838, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 41855, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 41868, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 41885, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 41898, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 41915, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 41928, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 41945, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 41958, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 41975, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 41988, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 42005, 0x000084DA }, /* GL_TEXTURE26 */
-   { 42018, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 42035, 0x000084DB }, /* GL_TEXTURE27 */
-   { 42048, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 42065, 0x000084DC }, /* GL_TEXTURE28 */
-   { 42078, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 42095, 0x000084DD }, /* GL_TEXTURE29 */
-   { 42108, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 42125, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 42141, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 42153, 0x000084DE }, /* GL_TEXTURE30 */
-   { 42166, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 42183, 0x000084DF }, /* GL_TEXTURE31 */
-   { 42196, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 42213, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 42229, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 42241, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 42257, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 42269, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 42285, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 42297, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 42313, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 42325, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 42341, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 42353, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 42369, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 42381, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 42397, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 42411, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY */
-   { 42431, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 42455, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 42469, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY */
-   { 42489, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 42513, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 42527, 0x0000806F }, /* GL_TEXTURE_3D_OES */
-   { 42545, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 42567, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 42593, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 42615, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 42637, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY */
-   { 42665, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 42697, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 42719, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY */
-   { 42747, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 42779, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 42801, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
-   { 42827, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER */
-   { 42853, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 42881, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 42913, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
-   { 42945, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE */
-   { 42974, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 43007, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 43039, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 43054, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 43075, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 43100, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 43118, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 43142, 0x00008C2A }, /* GL_TEXTURE_BUFFER */
-   { 43160, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
-   { 43197, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT */
-   { 43222, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 43253, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 43283, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 43313, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 43348, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 43379, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 43417, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 43444, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 43476, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 43510, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 43534, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 43562, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 43586, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 43614, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 43647, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 43671, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 43693, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 43715, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 43741, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 43775, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 43808, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 43845, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 43873, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 43905, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 43928, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 43966, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 44008, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 44039, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 44067, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 44097, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 44125, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
-   { 44150, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 44170, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 44194, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 44225, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 44260, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
-   { 44295, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 44326, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 44361, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
-   { 44396, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 44427, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 44462, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
-   { 44497, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
-   { 44521, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 44552, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 44587, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
-   { 44622, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 44653, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 44688, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
-   { 44723, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 44754, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 44789, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
-   { 44824, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-   { 44853, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 44870, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 44892, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 44918, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 44933, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 44954, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 44974, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 45000, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
-   { 45030, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 45050, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
-   { 45074, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 45091, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 45108, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 45125, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
-   { 45148, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 45165, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 45190, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 45212, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 45238, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 45256, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 45282, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 45308, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 45338, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 45365, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 45390, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 45410, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 45434, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 45461, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 45488, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 45515, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 45541, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 45571, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 45593, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 45611, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 45651, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 45681, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 45709, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 45737, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 45765, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 45786, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 45805, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 45827, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 45846, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 45866, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-   { 45896, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-   { 45927, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE */
-   { 45948, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 45973, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 45997, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 46017, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 46041, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 46061, 0x00008C3F }, /* GL_TEXTURE_SHARED_SIZE */
-   { 46084, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 46107, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 46131, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
-   { 46159, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-   { 46189, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 46214, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 46248, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 46265, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 46283, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
-   { 46305, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 46323, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 46341, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
-   { 46360, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 46380, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 46399, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 46428, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 46445, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
-   { 46467, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
-   { 46497, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER */
-   { 46526, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-   { 46562, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
-   { 46599, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
-   { 46640, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
-   { 46673, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
-   { 46707, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
-   { 46745, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-   { 46781, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
-   { 46815, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
-   { 46853, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
-   { 46888, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
-   { 46927, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
-   { 46968, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
-   { 47013, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
-   { 47044, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
-   { 47079, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
-   { 47120, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
-   { 47165, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 47191, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 47221, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 47253, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 47283, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 47317, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 47333, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 47364, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 47399, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 47427, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 47459, 0x00000004 }, /* GL_TRIANGLES */
-   { 47472, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY */
-   { 47495, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
-   { 47522, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 47538, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 47559, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 47577, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY */
-   { 47605, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
-   { 47637, 0x00000001 }, /* GL_TRUE */
-   { 47645, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
-   { 47664, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 47684, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 47707, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 47727, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 47748, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 47770, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 47792, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 47812, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 47833, 0x00009118 }, /* GL_UNSIGNALED */
-   { 47847, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 47864, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 47891, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 47914, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 47930, 0x00008C3B }, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
-   { 47962, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 47989, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
-   { 48020, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 48041, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
-   { 48066, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 48090, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
-   { 48115, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 48146, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
-   { 48181, 0x00008C3E }, /* GL_UNSIGNED_INT_5_9_9_9_REV */
-   { 48209, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 48233, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 48261, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D */
-   { 48288, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
-   { 48321, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT */
-   { 48358, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D_EXT */
-   { 48389, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D */
-   { 48416, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
-   { 48449, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT */
-   { 48486, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D_EXT */
-   { 48517, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
-   { 48549, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT */
-   { 48585, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D */
-   { 48612, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D_EXT */
-   { 48643, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
-   { 48674, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT */
-   { 48709, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
-   { 48738, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE_EXT */
-   { 48771, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2 */
-   { 48792, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2_EXT */
-   { 48817, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3 */
-   { 48838, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3_EXT */
-   { 48863, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4 */
-   { 48884, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4_EXT */
-   { 48909, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 48932, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 48950, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 48980, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
-   { 49014, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 49040, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 49070, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
-   { 49104, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 49130, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 49154, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 49182, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 49210, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 49237, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 49269, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 49300, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 49314, 0x00002A20 }, /* GL_V2F */
-   { 49321, 0x00002A21 }, /* GL_V3F */
-   { 49328, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 49347, 0x00001F00 }, /* GL_VENDOR */
-   { 49357, 0x00001F02 }, /* GL_VERSION */
-   { 49368, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 49384, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 49408, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 49438, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 49469, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 49504, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 49528, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 49549, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 49572, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 49593, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 49620, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 49648, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 49676, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 49704, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 49732, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 49760, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 49788, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 49815, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 49842, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 49869, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 49896, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 49923, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 49950, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 49977, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 50004, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 50031, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 50069, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 50111, 0x000088FE }, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
-   { 50146, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 50177, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 50212, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
-   { 50243, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT */
-   { 50278, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 50312, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 50350, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 50381, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 50416, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 50444, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 50476, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 50506, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 50540, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 50568, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 50600, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 50620, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 50642, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 50671, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 50692, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 50721, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 50754, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 50786, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 50813, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 50844, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 50874, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 50891, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 50912, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 50939, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 50951, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 50967, 0x00008A1A }, /* GL_VOLATILE_APPLE */
-   { 50985, 0x0000911D }, /* GL_WAIT_FAILED */
-   { 51000, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 51020, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 51051, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 51086, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
-   { 51121, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
-   { 51141, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 51169, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
-   { 51197, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 51222, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
-   { 51247, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 51274, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
-   { 51301, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 51326, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
-   { 51351, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 51375, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 51394, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 51408, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 51426, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
-   { 51444, 0x00001506 }, /* GL_XOR */
-   { 51451, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 51470, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 51484, 0x00000000 }, /* GL_ZERO */
-   { 51492, 0x00000D16 }, /* GL_ZOOM_X */
-   { 51502, 0x00000D17 }, /* GL_ZOOM_Y */
+   { 24512, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE_ARB */
+   { 24543, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 24565, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 24591, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 24618, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 24649, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 24673, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS_EXT */
+   { 24701, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 24735, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 24755, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 24782, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 24803, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 24828, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 24853, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 24888, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
+   { 24937, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */
+   { 24990, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
+   { 25033, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */
+   { 25080, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
+   { 25126, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */
+   { 25176, 0x00008B4B }, /* GL_MAX_VARYING_COMPONENTS */
+   { 25202, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 25224, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 25250, 0x00008DFC }, /* GL_MAX_VARYING_VECTORS */
+   { 25273, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 25295, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 25321, 0x00009122 }, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
+   { 25353, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 25387, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 25425, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 25458, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 25495, 0x00008DFB }, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
+   { 25525, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 25549, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_OES */
+   { 25573, 0x00008DDE }, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
+   { 25610, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 25631, 0x00008DF1 }, /* GL_MEDIUM_FLOAT */
+   { 25647, 0x00008DF4 }, /* GL_MEDIUM_INT */
+   { 25661, 0x00008007 }, /* GL_MIN */
+   { 25668, 0x0000802E }, /* GL_MINMAX */
+   { 25678, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 25692, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 25709, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 25730, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 25745, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 25764, 0x0000821C }, /* GL_MINOR_VERSION */
+   { 25781, 0x00008007 }, /* GL_MIN_EXT */
+   { 25792, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
+   { 25820, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET_EXT */
+   { 25852, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 25871, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 25894, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 25917, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 25937, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 25957, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 25987, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 26015, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 26043, 0x00001700 }, /* GL_MODELVIEW */
+   { 26056, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 26074, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 26093, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 26112, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 26131, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 26150, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 26169, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 26188, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 26207, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 26226, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 26245, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 26264, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 26282, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 26301, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 26320, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 26339, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 26358, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 26377, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 26396, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 26415, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 26434, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 26453, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 26472, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 26490, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 26509, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 26528, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 26546, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 26564, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 26582, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 26600, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 26618, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 26636, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 26654, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 26674, 0x0000898D }, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 26716, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 26743, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 26768, 0x00002100 }, /* GL_MODULATE */
+   { 26780, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 26800, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 26827, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 26852, 0x00000103 }, /* GL_MULT */
+   { 26860, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 26875, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 26895, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 26914, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 26933, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 26957, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 26980, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 27010, 0x00002A25 }, /* GL_N3F_V3F */
+   { 27021, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 27041, 0x0000150E }, /* GL_NAND */
+   { 27049, 0x00002600 }, /* GL_NEAREST */
+   { 27060, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 27091, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 27123, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 27148, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 27174, 0x00000200 }, /* GL_NEVER */
+   { 27183, 0x00001102 }, /* GL_NICEST */
+   { 27193, 0x00000000 }, /* GL_NONE */
+   { 27201, 0x00000000 }, /* GL_NONE_OES */
+   { 27213, 0x00001505 }, /* GL_NOOP */
+   { 27221, 0x00001508 }, /* GL_NOR */
+   { 27228, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 27241, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 27257, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 27288, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 27323, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 27347, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 27370, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 27391, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 27405, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 27423, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 27440, 0x00008511 }, /* GL_NORMAL_MAP_OES */
+   { 27458, 0x00000205 }, /* GL_NOTEQUAL */
+   { 27470, 0x00000000 }, /* GL_NO_ERROR */
+   { 27482, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 27516, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 27554, 0x0000821D }, /* GL_NUM_EXTENSIONS */
+   { 27572, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
+   { 27606, 0x00008DF9 }, /* GL_NUM_SHADER_BINARY_FORMATS */
+   { 27635, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 27667, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 27709, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 27739, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 27779, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 27810, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 27839, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 27867, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 27897, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 27914, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 27940, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 27956, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 27991, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 28013, 0x00009112 }, /* GL_OBJECT_TYPE */
+   { 28028, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 28047, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 28077, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 28098, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 28126, 0x00000001 }, /* GL_ONE */
+   { 28133, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 28161, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 28193, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 28221, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 28253, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 28276, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 28299, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 28322, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 28345, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 28363, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 28385, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 28407, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 28423, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 28443, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 28463, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 28481, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 28503, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 28525, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 28541, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 28561, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 28581, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 28599, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 28621, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 28643, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 28659, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 28679, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 28699, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 28720, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 28739, 0x00001507 }, /* GL_OR */
+   { 28745, 0x00000A01 }, /* GL_ORDER */
+   { 28754, 0x0000150D }, /* GL_OR_INVERTED */
+   { 28769, 0x0000150B }, /* GL_OR_REVERSE */
+   { 28783, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 28800, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 28818, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 28839, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 28859, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 28877, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 28896, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 28916, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 28936, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 28954, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 28973, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 28998, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 29022, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 29043, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 29065, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 29087, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 29112, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 29136, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 29157, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 29179, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 29201, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 29223, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 29254, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 29274, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 29299, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 29319, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 29344, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 29364, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 29389, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 29409, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 29434, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 29454, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 29479, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 29499, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 29524, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 29544, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 29569, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 29589, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 29614, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 29634, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 29659, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 29679, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 29704, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 29722, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 29743, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 29772, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 29805, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 29830, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 29853, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 29884, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 29919, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 29946, 0x00001B00 }, /* GL_POINT */
+   { 29955, 0x00000000 }, /* GL_POINTS */
+   { 29965, 0x00000002 }, /* GL_POINT_BIT */
+   { 29978, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 30008, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 30042, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 30076, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 30111, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 30140, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 30173, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 30206, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 30240, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 30254, 0x00008B9F }, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
+   { 30293, 0x00008B9C }, /* GL_POINT_SIZE_ARRAY_OES */
+   { 30317, 0x0000898C }, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
+   { 30349, 0x0000898B }, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
+   { 30380, 0x0000898A }, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
+   { 30409, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 30435, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 30453, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 30475, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 30497, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 30520, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 30538, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 30560, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 30582, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 30605, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 30625, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 30641, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 30662, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 30678, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 30698, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 30727, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 30746, 0x00008861 }, /* GL_POINT_SPRITE_OES */
+   { 30766, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 30792, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 30807, 0x00000009 }, /* GL_POLYGON */
+   { 30818, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 30833, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 30849, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 30872, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 30897, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 30920, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 30943, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 30967, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 30991, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 31009, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 31032, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 31051, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 31074, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 31091, 0x00001203 }, /* GL_POSITION */
+   { 31103, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 31135, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 31171, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 31204, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 31241, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 31272, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 31307, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 31339, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 31375, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 31408, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 31440, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 31476, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 31509, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 31546, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 31576, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 31610, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 31641, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 31676, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 31707, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 31742, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 31774, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 31810, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 31840, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 31874, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 31905, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 31940, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 31972, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 32003, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 32038, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 32070, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 32106, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 32135, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 32168, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 32198, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 32232, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 32271, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 32304, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 32344, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 32378, 0x00008578 }, /* GL_PREVIOUS */
+   { 32390, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 32406, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 32422, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 32439, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 32460, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 32481, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED */
+   { 32505, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */
+   { 32533, 0x00008F9D }, /* GL_PRIMITIVE_RESTART */
+   { 32554, 0x00008F9E }, /* GL_PRIMITIVE_RESTART_INDEX */
+   { 32581, 0x00008559 }, /* GL_PRIMITIVE_RESTART_INDEX_NV */
+   { 32611, 0x00008558 }, /* GL_PRIMITIVE_RESTART_NV */
+   { 32635, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 32668, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 32700, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 32723, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
+   { 32753, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
+   { 32782, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 32805, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 32835, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 32864, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 32892, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 32914, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 32942, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 32970, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 32992, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 33013, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 33053, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 33092, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 33122, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 33157, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 33190, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 33224, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 33263, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 33302, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 33324, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 33350, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 33374, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE */
+   { 33396, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
+   { 33422, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 33445, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 33467, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 33488, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 33509, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 33536, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 33568, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 33600, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 33635, 0x00001701 }, /* GL_PROJECTION */
+   { 33649, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 33670, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 33713, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 33739, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
+   { 33759, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
+   { 33783, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 33804, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 33823, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 33846, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 33885, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 33923, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 33943, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY */
+   { 33969, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 33999, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 34023, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 34043, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY */
+   { 34069, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 34099, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 34123, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 34143, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 34176, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 34202, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 34232, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE */
+   { 34259, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 34290, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 34320, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
+   { 34339, 0x00002003 }, /* GL_Q */
+   { 34344, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 34369, 0x00000007 }, /* GL_QUADS */
+   { 34378, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+   { 34422, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+   { 34470, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 34487, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 34501, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT */
+   { 34528, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
+   { 34558, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT */
+   { 34582, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
+   { 34609, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 34631, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 34657, 0x00008E14 }, /* GL_QUERY_NO_WAIT */
+   { 34674, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
+   { 34694, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 34710, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 34730, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 34756, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 34786, 0x00008E13 }, /* GL_QUERY_WAIT */
+   { 34800, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
+   { 34817, 0x00002002 }, /* GL_R */
+   { 34822, 0x00008C3A }, /* GL_R11F_G11F_B10F */
+   { 34840, 0x00008F98 }, /* GL_R16_SNORM */
+   { 34853, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 34865, 0x00008F94 }, /* GL_R8_SNORM */
+   { 34877, 0x00008C89 }, /* GL_RASTERIZER_DISCARD */
+   { 34899, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
+   { 34925, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 34958, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 34973, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 34993, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
+   { 35021, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 35053, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 35077, 0x000088B8 }, /* GL_READ_ONLY */
+   { 35090, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 35107, 0x000088BA }, /* GL_READ_WRITE */
+   { 35121, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 35139, 0x00001903 }, /* GL_RED */
+   { 35146, 0x00008016 }, /* GL_REDUCE */
+   { 35156, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 35170, 0x00000D15 }, /* GL_RED_BIAS */
+   { 35182, 0x00000D52 }, /* GL_RED_BITS */
+   { 35194, 0x00008D94 }, /* GL_RED_INTEGER */
+   { 35209, 0x00008D94 }, /* GL_RED_INTEGER_EXT */
+   { 35228, 0x00000D14 }, /* GL_RED_SCALE */
+   { 35241, 0x00008F90 }, /* GL_RED_SNORM */
+   { 35254, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 35272, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 35294, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 35315, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
+   { 35337, 0x00008A19 }, /* GL_RELEASED_APPLE */
+   { 35355, 0x00001C00 }, /* GL_RENDER */
+   { 35365, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 35381, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 35408, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
+   { 35439, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
+   { 35463, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 35491, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
+   { 35519, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 35545, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
+   { 35575, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 35602, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
+   { 35633, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 35653, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 35680, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
+   { 35711, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 35734, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 35761, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
+   { 35788, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 35820, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 35856, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
+   { 35892, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
+   { 35912, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 35937, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
+   { 35966, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 35990, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
+   { 36018, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 36047, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
+   { 36080, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 36102, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 36128, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
+   { 36154, 0x00001F01 }, /* GL_RENDERER */
+   { 36166, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 36181, 0x00002901 }, /* GL_REPEAT */
+   { 36191, 0x00001E01 }, /* GL_REPLACE */
+   { 36202, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 36217, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 36240, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 36258, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 36280, 0x00008A1B }, /* GL_RETAINED_APPLE */
+   { 36298, 0x00000102 }, /* GL_RETURN */
+   { 36308, 0x00008F99 }, /* GL_RG16_SNORM */
+   { 36322, 0x00008F95 }, /* GL_RG8_SNORM */
+   { 36335, 0x00001907 }, /* GL_RGB */
+   { 36342, 0x00008052 }, /* GL_RGB10 */
+   { 36351, 0x00008059 }, /* GL_RGB10_A2 */
+   { 36363, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 36379, 0x00008052 }, /* GL_RGB10_EXT */
+   { 36392, 0x00008053 }, /* GL_RGB12 */
+   { 36401, 0x00008053 }, /* GL_RGB12_EXT */
+   { 36414, 0x00008054 }, /* GL_RGB16 */
+   { 36423, 0x0000881B }, /* GL_RGB16F */
+   { 36433, 0x00008D89 }, /* GL_RGB16I */
+   { 36443, 0x00008D89 }, /* GL_RGB16I_EXT */
+   { 36457, 0x00008D77 }, /* GL_RGB16UI */
+   { 36468, 0x00008D77 }, /* GL_RGB16UI_EXT */
+   { 36483, 0x00008054 }, /* GL_RGB16_EXT */
+   { 36496, 0x00008F9A }, /* GL_RGB16_SNORM */
+   { 36511, 0x0000804E }, /* GL_RGB2_EXT */
+   { 36523, 0x00008815 }, /* GL_RGB32F */
+   { 36533, 0x00008D83 }, /* GL_RGB32I */
+   { 36543, 0x00008D83 }, /* GL_RGB32I_EXT */
+   { 36557, 0x00008D71 }, /* GL_RGB32UI */
+   { 36568, 0x00008D71 }, /* GL_RGB32UI_EXT */
+   { 36583, 0x0000804F }, /* GL_RGB4 */
+   { 36591, 0x0000804F }, /* GL_RGB4_EXT */
+   { 36603, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 36616, 0x00008050 }, /* GL_RGB5 */
+   { 36624, 0x00008D62 }, /* GL_RGB565 */
+   { 36634, 0x00008D62 }, /* GL_RGB565_OES */
+   { 36648, 0x00008057 }, /* GL_RGB5_A1 */
+   { 36659, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 36674, 0x00008057 }, /* GL_RGB5_A1_OES */
+   { 36689, 0x00008050 }, /* GL_RGB5_EXT */
+   { 36701, 0x00008051 }, /* GL_RGB8 */
+   { 36709, 0x00008D8F }, /* GL_RGB8I */
+   { 36718, 0x00008D8F }, /* GL_RGB8I_EXT */
+   { 36731, 0x00008D7D }, /* GL_RGB8UI */
+   { 36741, 0x00008D7D }, /* GL_RGB8UI_EXT */
+   { 36755, 0x00008051 }, /* GL_RGB8_EXT */
+   { 36767, 0x00008051 }, /* GL_RGB8_OES */
+   { 36779, 0x00008F96 }, /* GL_RGB8_SNORM */
+   { 36793, 0x00008C3D }, /* GL_RGB9_E5 */
+   { 36804, 0x00001908 }, /* GL_RGBA */
+   { 36812, 0x0000805A }, /* GL_RGBA12 */
+   { 36822, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 36836, 0x0000805B }, /* GL_RGBA16 */
+   { 36846, 0x0000881A }, /* GL_RGBA16F */
+   { 36857, 0x00008D88 }, /* GL_RGBA16I */
+   { 36868, 0x00008D88 }, /* GL_RGBA16I_EXT */
+   { 36883, 0x00008D76 }, /* GL_RGBA16UI */
+   { 36895, 0x00008D76 }, /* GL_RGBA16UI_EXT */
+   { 36911, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 36925, 0x00008F9B }, /* GL_RGBA16_SNORM */
+   { 36941, 0x00008055 }, /* GL_RGBA2 */
+   { 36950, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 36963, 0x00008814 }, /* GL_RGBA32F */
+   { 36974, 0x00008D82 }, /* GL_RGBA32I */
+   { 36985, 0x00008D82 }, /* GL_RGBA32I_EXT */
+   { 37000, 0x00008D70 }, /* GL_RGBA32UI */
+   { 37012, 0x00008D70 }, /* GL_RGBA32UI_EXT */
+   { 37028, 0x00008056 }, /* GL_RGBA4 */
+   { 37037, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 37056, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 37069, 0x00008056 }, /* GL_RGBA4_OES */
+   { 37082, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 37096, 0x00008058 }, /* GL_RGBA8 */
+   { 37105, 0x00008D8E }, /* GL_RGBA8I */
+   { 37115, 0x00008D8E }, /* GL_RGBA8I_EXT */
+   { 37129, 0x00008D7C }, /* GL_RGBA8UI */
+   { 37140, 0x00008D7C }, /* GL_RGBA8UI_EXT */
+   { 37155, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 37168, 0x00008058 }, /* GL_RGBA8_OES */
+   { 37181, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 37196, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 37214, 0x00008820 }, /* GL_RGBA_FLOAT_MODE_ARB */
+   { 37237, 0x00008D99 }, /* GL_RGBA_INTEGER */
+   { 37253, 0x00008D99 }, /* GL_RGBA_INTEGER_EXT */
+   { 37273, 0x00008D9E }, /* GL_RGBA_INTEGER_MODE_EXT */
+   { 37298, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 37311, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 37324, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 37338, 0x00008D98 }, /* GL_RGB_INTEGER */
+   { 37353, 0x00008D98 }, /* GL_RGB_INTEGER_EXT */
+   { 37372, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 37384, 0x00008573 }, /* GL_RGB_SCALE */
+   { 37397, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 37414, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 37431, 0x00008F92 }, /* GL_RGB_SNORM */
+   { 37444, 0x00008F91 }, /* GL_RG_SNORM */
+   { 37456, 0x00000407 }, /* GL_RIGHT */
+   { 37465, 0x00002000 }, /* GL_S */
+   { 37470, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 37484, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY */
+   { 37504, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY_EXT */
+   { 37528, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW */
+   { 37555, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW_EXT */
+   { 37586, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 37607, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 37621, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY */
+   { 37641, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY_EXT */
+   { 37665, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW */
+   { 37692, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW_EXT */
+   { 37723, 0x00008B63 }, /* GL_SAMPLER_2D_RECT */
+   { 37742, 0x00008B64 }, /* GL_SAMPLER_2D_RECT_SHADOW */
+   { 37768, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 37789, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 37803, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
+   { 37821, 0x00008DC2 }, /* GL_SAMPLER_BUFFER */
+   { 37839, 0x00008DC2 }, /* GL_SAMPLER_BUFFER_EXT */
+   { 37861, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 37877, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW */
+   { 37900, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW_EXT */
+   { 37927, 0x000080A9 }, /* GL_SAMPLES */
+   { 37938, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 37954, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 37969, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 37987, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 38009, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 38037, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 38069, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 38092, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 38119, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 38137, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 38160, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 38182, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 38201, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 38224, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 38250, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 38280, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 38305, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 38334, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 38349, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 38364, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 38380, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 38405, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 38445, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 38489, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 38522, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 38552, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 38584, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 38614, 0x00001C02 }, /* GL_SELECT */
+   { 38624, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 38652, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 38677, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 38693, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS */
+   { 38713, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
+   { 38737, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 38764, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 38795, 0x0000150F }, /* GL_SET */
+   { 38802, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
+   { 38827, 0x00008DFA }, /* GL_SHADER_COMPILER */
+   { 38846, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 38867, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 38891, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 38906, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 38921, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 38949, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 38972, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 39002, 0x00001601 }, /* GL_SHININESS */
+   { 39015, 0x00001402 }, /* GL_SHORT */
+   { 39024, 0x00009119 }, /* GL_SIGNALED */
+   { 39036, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 39057, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 39073, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 39093, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 39112, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 39126, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 39141, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 39163, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 39183, 0x00001D01 }, /* GL_SMOOTH */
+   { 39193, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 39226, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 39253, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 39286, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 39313, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 39330, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 39351, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 39372, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 39387, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 39406, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 39425, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 39442, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 39463, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 39484, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 39499, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 39518, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 39537, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 39554, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 39575, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 39596, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 39611, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 39630, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 39649, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 39669, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 39687, 0x00001202 }, /* GL_SPECULAR */
+   { 39699, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 39713, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 39728, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 39746, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 39763, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 39777, 0x00008580 }, /* GL_SRC0_RGB */
+   { 39789, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 39803, 0x00008581 }, /* GL_SRC1_RGB */
+   { 39815, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 39829, 0x00008582 }, /* GL_SRC2_RGB */
+   { 39841, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 39854, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 39876, 0x00000300 }, /* GL_SRC_COLOR */
+   { 39889, 0x00008C40 }, /* GL_SRGB */
+   { 39897, 0x00008C41 }, /* GL_SRGB8 */
+   { 39906, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 39922, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 39936, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 39954, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 39973, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 39988, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 40007, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 40022, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 40041, 0x000088E5 }, /* GL_STATIC_READ */
+   { 40056, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 40075, 0x00001802 }, /* GL_STENCIL */
+   { 40086, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 40108, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 40134, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
+   { 40160, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 40181, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 40206, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 40227, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 40252, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 40284, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 40320, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 40352, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 40388, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 40408, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 40435, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 40461, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 40477, 0x00008224 }, /* GL_STENCIL_BUFFER */
+   { 40495, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 40517, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 40540, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 40556, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 40572, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 40589, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
+   { 40607, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
+   { 40626, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 40649, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 40671, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
+   { 40693, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
+   { 40711, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 40733, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
+   { 40755, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
+   { 40773, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 40795, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
+   { 40817, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 40838, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 40865, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 40892, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 40907, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 40923, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 40952, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 40974, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 40995, 0x00000C33 }, /* GL_STEREO */
+   { 41005, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
+   { 41029, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
+   { 41054, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
+   { 41078, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 41093, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 41112, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 41127, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 41146, 0x000088E1 }, /* GL_STREAM_READ */
+   { 41161, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 41180, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 41197, 0x000084E7 }, /* GL_SUBTRACT */
+   { 41209, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 41225, 0x00009113 }, /* GL_SYNC_CONDITION */
+   { 41243, 0x00009116 }, /* GL_SYNC_FENCE */
+   { 41257, 0x00009115 }, /* GL_SYNC_FLAGS */
+   { 41271, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
+   { 41298, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+   { 41328, 0x00009114 }, /* GL_SYNC_STATUS */
+   { 41343, 0x00002001 }, /* GL_T */
+   { 41348, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 41363, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 41382, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 41398, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 41413, 0x00002A27 }, /* GL_T2F_V3F */
+   { 41424, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 41443, 0x00002A28 }, /* GL_T4F_V4F */
+   { 41454, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 41477, 0x00001702 }, /* GL_TEXTURE */
+   { 41488, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 41500, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 41516, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 41528, 0x000084CA }, /* GL_TEXTURE10 */
+   { 41541, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 41558, 0x000084CB }, /* GL_TEXTURE11 */
+   { 41571, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 41588, 0x000084CC }, /* GL_TEXTURE12 */
+   { 41601, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 41618, 0x000084CD }, /* GL_TEXTURE13 */
+   { 41631, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 41648, 0x000084CE }, /* GL_TEXTURE14 */
+   { 41661, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 41678, 0x000084CF }, /* GL_TEXTURE15 */
+   { 41691, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 41708, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 41721, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 41738, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 41751, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 41768, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 41781, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 41798, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 41811, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 41828, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 41844, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 41856, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 41869, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 41886, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 41899, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 41916, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 41929, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 41946, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 41959, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 41976, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 41989, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 42006, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 42019, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 42036, 0x000084DA }, /* GL_TEXTURE26 */
+   { 42049, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 42066, 0x000084DB }, /* GL_TEXTURE27 */
+   { 42079, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 42096, 0x000084DC }, /* GL_TEXTURE28 */
+   { 42109, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 42126, 0x000084DD }, /* GL_TEXTURE29 */
+   { 42139, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 42156, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 42172, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 42184, 0x000084DE }, /* GL_TEXTURE30 */
+   { 42197, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 42214, 0x000084DF }, /* GL_TEXTURE31 */
+   { 42227, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 42244, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 42260, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 42272, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 42288, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 42300, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 42316, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 42328, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 42344, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 42356, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 42372, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 42384, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 42400, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 42412, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 42428, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 42442, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY */
+   { 42462, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 42486, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 42500, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY */
+   { 42520, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 42544, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 42558, 0x0000806F }, /* GL_TEXTURE_3D_OES */
+   { 42576, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 42598, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 42624, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 42646, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 42668, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY */
+   { 42696, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 42728, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 42750, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY */
+   { 42778, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 42810, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 42832, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
+   { 42858, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER */
+   { 42884, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER_ARB */
+   { 42914, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 42942, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 42974, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
+   { 43006, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE */
+   { 43035, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 43068, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 43100, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 43115, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 43136, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 43161, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 43179, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 43203, 0x00008C2A }, /* GL_TEXTURE_BUFFER */
+   { 43221, 0x00008C2A }, /* GL_TEXTURE_BUFFER_ARB */
+   { 43243, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
+   { 43280, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB */
+   { 43321, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT */
+   { 43346, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT_ARB */
+   { 43375, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 43406, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 43436, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 43466, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 43501, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 43532, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 43570, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 43597, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 43629, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 43663, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 43687, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 43715, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 43739, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 43767, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 43800, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 43824, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 43846, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 43868, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 43894, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 43928, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 43961, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 43998, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 44026, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 44058, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 44081, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 44119, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 44161, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 44192, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 44220, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 44250, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 44278, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
+   { 44303, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 44323, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 44347, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 44378, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 44413, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
+   { 44448, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 44479, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 44514, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
+   { 44549, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 44580, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 44615, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
+   { 44650, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
+   { 44674, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 44705, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 44740, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
+   { 44775, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 44806, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 44841, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
+   { 44876, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 44907, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 44942, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
+   { 44977, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+   { 45006, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 45023, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 45045, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 45071, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 45086, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 45107, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 45127, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 45153, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
+   { 45183, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 45203, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
+   { 45227, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 45244, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 45261, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 45278, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
+   { 45301, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 45318, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 45343, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 45365, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 45391, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 45409, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 45435, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 45461, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 45491, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 45518, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 45543, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 45563, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 45587, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 45614, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 45641, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 45668, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 45694, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 45724, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 45746, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 45764, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 45804, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 45834, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 45862, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 45890, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 45918, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 45939, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 45958, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 45980, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 45999, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 46019, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+   { 46049, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+   { 46080, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE */
+   { 46101, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 46126, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 46150, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 46170, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 46194, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 46214, 0x00008C3F }, /* GL_TEXTURE_SHARED_SIZE */
+   { 46237, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 46260, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 46284, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
+   { 46312, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+   { 46342, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 46367, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 46401, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 46418, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 46436, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
+   { 46458, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 46476, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 46494, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
+   { 46513, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 46533, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 46552, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 46581, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 46598, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
+   { 46620, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
+   { 46650, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER */
+   { 46679, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+   { 46715, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
+   { 46752, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
+   { 46793, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
+   { 46826, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
+   { 46860, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
+   { 46898, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+   { 46934, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
+   { 46968, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
+   { 47006, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
+   { 47041, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
+   { 47080, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
+   { 47121, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
+   { 47166, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
+   { 47197, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
+   { 47232, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
+   { 47273, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
+   { 47318, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 47344, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 47374, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 47406, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 47436, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 47470, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 47486, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 47517, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 47552, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 47580, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 47612, 0x00000004 }, /* GL_TRIANGLES */
+   { 47625, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY */
+   { 47648, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
+   { 47675, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 47691, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 47712, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 47730, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY */
+   { 47758, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
+   { 47790, 0x00000001 }, /* GL_TRUE */
+   { 47798, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
+   { 47817, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 47837, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 47860, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 47880, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 47901, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 47923, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 47945, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 47965, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 47986, 0x00009118 }, /* GL_UNSIGNALED */
+   { 48000, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 48017, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 48044, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 48067, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 48083, 0x00008C3B }, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
+   { 48115, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 48142, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+   { 48173, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 48194, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
+   { 48219, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 48243, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
+   { 48268, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 48299, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
+   { 48334, 0x00008C3E }, /* GL_UNSIGNED_INT_5_9_9_9_REV */
+   { 48362, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 48386, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 48414, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D */
+   { 48441, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
+   { 48474, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT */
+   { 48511, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D_EXT */
+   { 48542, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D */
+   { 48569, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
+   { 48602, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT */
+   { 48639, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D_EXT */
+   { 48670, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
+   { 48702, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT */
+   { 48738, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D */
+   { 48765, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D_EXT */
+   { 48796, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
+   { 48827, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT */
+   { 48862, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
+   { 48891, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE_EXT */
+   { 48924, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2 */
+   { 48945, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2_EXT */
+   { 48970, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3 */
+   { 48991, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3_EXT */
+   { 49016, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4 */
+   { 49037, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4_EXT */
+   { 49062, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 49085, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 49103, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 49133, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
+   { 49167, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 49193, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 49223, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
+   { 49257, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 49283, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 49307, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 49335, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 49363, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 49390, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 49422, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 49453, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 49467, 0x00002A20 }, /* GL_V2F */
+   { 49474, 0x00002A21 }, /* GL_V3F */
+   { 49481, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 49500, 0x00001F00 }, /* GL_VENDOR */
+   { 49510, 0x00001F02 }, /* GL_VERSION */
+   { 49521, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 49537, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 49561, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 49591, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 49622, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 49657, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 49681, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 49702, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 49725, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 49746, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 49773, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 49801, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 49829, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 49857, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 49885, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 49913, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 49941, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 49968, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 49995, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 50022, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 50049, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 50076, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 50103, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 50130, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 50157, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 50184, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 50222, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 50264, 0x000088FE }, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
+   { 50299, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 50330, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 50365, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
+   { 50396, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT */
+   { 50431, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 50465, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 50503, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 50534, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 50569, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 50597, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 50629, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 50659, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 50693, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 50721, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 50753, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 50773, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 50795, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 50824, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 50845, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 50874, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 50907, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 50939, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 50966, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 50997, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 51027, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 51044, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 51065, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 51092, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 51104, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 51120, 0x00008A1A }, /* GL_VOLATILE_APPLE */
+   { 51138, 0x0000911D }, /* GL_WAIT_FAILED */
+   { 51153, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 51173, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 51204, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 51239, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
+   { 51274, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
+   { 51294, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 51322, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
+   { 51350, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 51375, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
+   { 51400, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 51427, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
+   { 51454, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 51479, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
+   { 51504, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 51528, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 51547, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 51561, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 51579, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
+   { 51597, 0x00001506 }, /* GL_XOR */
+   { 51604, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 51623, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 51637, 0x00000000 }, /* GL_ZERO */
+   { 51645, 0x00000D16 }, /* GL_ZOOM_X */
+   { 51655, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
 static const unsigned reduced_enums[1555] =
@@ -4649,42 +4659,42 @@ static const unsigned reduced_enums[1555] =
        831, /* GL_LINES */
        835, /* GL_LINE_LOOP */
        842, /* GL_LINE_STRIP */
-      2140, /* GL_TRIANGLES */
-      2145, /* GL_TRIANGLE_STRIP */
-      2143, /* GL_TRIANGLE_FAN */
-      1511, /* GL_QUADS */
-      1515, /* GL_QUAD_STRIP */
-      1382, /* GL_POLYGON */
+      2145, /* GL_TRIANGLES */
+      2150, /* GL_TRIANGLE_STRIP */
+      2148, /* GL_TRIANGLE_FAN */
+      1512, /* GL_QUADS */
+      1516, /* GL_QUAD_STRIP */
+      1383, /* GL_POLYGON */
        832, /* GL_LINES_ADJACENCY */
        843, /* GL_LINE_STRIP_ADJACENCY */
-      2141, /* GL_TRIANGLES_ADJACENCY */
-      2146, /* GL_TRIANGLE_STRIP_ADJACENCY */
-      1394, /* GL_POLYGON_STIPPLE_BIT */
-      1337, /* GL_PIXEL_MODE_BIT */
+      2146, /* GL_TRIANGLES_ADJACENCY */
+      2151, /* GL_TRIANGLE_STRIP_ADJACENCY */
+      1395, /* GL_POLYGON_STIPPLE_BIT */
+      1338, /* GL_PIXEL_MODE_BIT */
        818, /* GL_LIGHTING_BIT */
        572, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
        854, /* GL_LOAD */
-      1600, /* GL_RETURN */
-      1204, /* GL_MULT */
+      1601, /* GL_RETURN */
+      1205, /* GL_MULT */
         24, /* GL_ADD */
-      1220, /* GL_NEVER */
+      1221, /* GL_NEVER */
        808, /* GL_LESS */
        528, /* GL_EQUAL */
        807, /* GL_LEQUAL */
        695, /* GL_GREATER */
-      1237, /* GL_NOTEQUAL */
+      1238, /* GL_NOTEQUAL */
        694, /* GL_GEQUAL */
         55, /* GL_ALWAYS */
-      1808, /* GL_SRC_COLOR */
-      1270, /* GL_ONE_MINUS_SRC_COLOR */
-      1806, /* GL_SRC_ALPHA */
-      1269, /* GL_ONE_MINUS_SRC_ALPHA */
+      1809, /* GL_SRC_COLOR */
+      1271, /* GL_ONE_MINUS_SRC_COLOR */
+      1807, /* GL_SRC_ALPHA */
+      1270, /* GL_ONE_MINUS_SRC_ALPHA */
        507, /* GL_DST_ALPHA */
-      1267, /* GL_ONE_MINUS_DST_ALPHA */
+      1268, /* GL_ONE_MINUS_DST_ALPHA */
        508, /* GL_DST_COLOR */
-      1268, /* GL_ONE_MINUS_DST_COLOR */
-      1807, /* GL_SRC_ALPHA_SATURATE */
+      1269, /* GL_ONE_MINUS_DST_COLOR */
+      1808, /* GL_SRC_ALPHA_SATURATE */
        671, /* GL_FRONT_LEFT */
        672, /* GL_FRONT_RIGHT */
         77, /* GL_BACK_LEFT */
@@ -4692,7 +4702,7 @@ static const unsigned reduced_enums[1555] =
        668, /* GL_FRONT */
         76, /* GL_BACK */
        806, /* GL_LEFT */
-      1690, /* GL_RIGHT */
+      1691, /* GL_RIGHT */
        669, /* GL_FRONT_AND_BACK */
         71, /* GL_AUX0 */
         72, /* GL_AUX1 */
@@ -4701,19 +4711,19 @@ static const unsigned reduced_enums[1555] =
        794, /* GL_INVALID_ENUM */
        799, /* GL_INVALID_VALUE */
        798, /* GL_INVALID_OPERATION */
-      1813, /* GL_STACK_OVERFLOW */
-      1814, /* GL_STACK_UNDERFLOW */
-      1295, /* GL_OUT_OF_MEMORY */
+      1814, /* GL_STACK_OVERFLOW */
+      1815, /* GL_STACK_UNDERFLOW */
+      1296, /* GL_OUT_OF_MEMORY */
        795, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1315, /* GL_PASS_THROUGH_TOKEN */
-      1381, /* GL_POINT_TOKEN */
+      1316, /* GL_PASS_THROUGH_TOKEN */
+      1382, /* GL_POINT_TOKEN */
        845, /* GL_LINE_TOKEN */
-      1395, /* GL_POLYGON_TOKEN */
+      1396, /* GL_POLYGON_TOKEN */
         87, /* GL_BITMAP_TOKEN */
        506, /* GL_DRAW_PIXEL_TOKEN */
        352, /* GL_COPY_PIXEL_TOKEN */
@@ -4723,7 +4733,7 @@ static const unsigned reduced_enums[1555] =
        389, /* GL_CW */
        154, /* GL_CCW */
        187, /* GL_COEFF */
-      1292, /* GL_ORDER */
+      1293, /* GL_ORDER */
        443, /* GL_DOMAIN */
        362, /* GL_CURRENT_COLOR */
        365, /* GL_CURRENT_INDEX */
@@ -4735,10 +4745,10 @@ static const unsigned reduced_enums[1555] =
        380, /* GL_CURRENT_RASTER_POSITION */
        381, /* GL_CURRENT_RASTER_POSITION_VALID */
        378, /* GL_CURRENT_RASTER_DISTANCE */
-      1373, /* GL_POINT_SMOOTH */
-      1357, /* GL_POINT_SIZE */
-      1372, /* GL_POINT_SIZE_RANGE */
-      1363, /* GL_POINT_SIZE_GRANULARITY */
+      1374, /* GL_POINT_SMOOTH */
+      1358, /* GL_POINT_SIZE */
+      1373, /* GL_POINT_SIZE_RANGE */
+      1364, /* GL_POINT_SIZE_GRANULARITY */
        837, /* GL_LINE_SMOOTH */
        846, /* GL_LINE_WIDTH */
        848, /* GL_LINE_WIDTH_RANGE */
@@ -4750,9 +4760,9 @@ static const unsigned reduced_enums[1555] =
       1060, /* GL_MAX_LIST_NESTING */
        850, /* GL_LIST_BASE */
        852, /* GL_LIST_INDEX */
-      1384, /* GL_POLYGON_MODE */
-      1391, /* GL_POLYGON_SMOOTH */
-      1393, /* GL_POLYGON_STIPPLE */
+      1385, /* GL_POLYGON_MODE */
+      1392, /* GL_POLYGON_SMOOTH */
+      1394, /* GL_POLYGON_STIPPLE */
        517, /* GL_EDGE_FLAG */
        355, /* GL_CULL_FACE */
        356, /* GL_CULL_FACE_MODE */
@@ -4761,7 +4771,7 @@ static const unsigned reduced_enums[1555] =
        822, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
        823, /* GL_LIGHT_MODEL_TWO_SIDE */
        819, /* GL_LIGHT_MODEL_AMBIENT */
-      1755, /* GL_SHADE_MODEL */
+      1756, /* GL_SHADE_MODEL */
        235, /* GL_COLOR_MATERIAL_FACE */
        236, /* GL_COLOR_MATERIAL_PARAMETER */
        234, /* GL_COLOR_MATERIAL */
@@ -4778,24 +4788,24 @@ static const unsigned reduced_enums[1555] =
        413, /* GL_DEPTH_CLEAR_VALUE */
        427, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1858, /* GL_STENCIL_TEST */
-      1839, /* GL_STENCIL_CLEAR_VALUE */
-      1841, /* GL_STENCIL_FUNC */
-      1860, /* GL_STENCIL_VALUE_MASK */
-      1840, /* GL_STENCIL_FAIL */
-      1855, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1856, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1857, /* GL_STENCIL_REF */
-      1861, /* GL_STENCIL_WRITEMASK */
+      1859, /* GL_STENCIL_TEST */
+      1840, /* GL_STENCIL_CLEAR_VALUE */
+      1842, /* GL_STENCIL_FUNC */
+      1861, /* GL_STENCIL_VALUE_MASK */
+      1841, /* GL_STENCIL_FAIL */
+      1856, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1857, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1858, /* GL_STENCIL_REF */
+      1862, /* GL_STENCIL_WRITEMASK */
       1010, /* GL_MATRIX_MODE */
-      1226, /* GL_NORMALIZE */
-      2272, /* GL_VIEWPORT */
-      1199, /* GL_MODELVIEW_STACK_DEPTH */
-      1485, /* GL_PROJECTION_STACK_DEPTH */
-      2094, /* GL_TEXTURE_STACK_DEPTH */
-      1196, /* GL_MODELVIEW_MATRIX */
-      1483, /* GL_PROJECTION_MATRIX */
-      2074, /* GL_TEXTURE_MATRIX */
+      1227, /* GL_NORMALIZE */
+      2277, /* GL_VIEWPORT */
+      1200, /* GL_MODELVIEW_STACK_DEPTH */
+      1486, /* GL_PROJECTION_STACK_DEPTH */
+      2099, /* GL_TEXTURE_STACK_DEPTH */
+      1197, /* GL_MODELVIEW_MATRIX */
+      1484, /* GL_PROJECTION_MATRIX */
+      2079, /* GL_TEXTURE_MATRIX */
         69, /* GL_ATTRIB_STACK_DEPTH */
        169, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         51, /* GL_ALPHA_TEST */
@@ -4810,67 +4820,67 @@ static const unsigned reduced_enums[1555] =
        233, /* GL_COLOR_LOGIC_OP */
         75, /* GL_AUX_BUFFERS */
        453, /* GL_DRAW_BUFFER */
-      1538, /* GL_READ_BUFFER */
-      1732, /* GL_SCISSOR_BOX */
-      1733, /* GL_SCISSOR_TEST */
+      1539, /* GL_READ_BUFFER */
+      1733, /* GL_SCISSOR_BOX */
+      1734, /* GL_SCISSOR_TEST */
        742, /* GL_INDEX_CLEAR_VALUE */
        747, /* GL_INDEX_WRITEMASK */
        230, /* GL_COLOR_CLEAR_VALUE */
        272, /* GL_COLOR_WRITEMASK */
        744, /* GL_INDEX_MODE */
-      1679, /* GL_RGBA_MODE */
+      1680, /* GL_RGBA_MODE */
        452, /* GL_DOUBLEBUFFER */
-      1862, /* GL_STEREO */
-      1592, /* GL_RENDER_MODE */
-      1316, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1374, /* GL_POINT_SMOOTH_HINT */
+      1863, /* GL_STEREO */
+      1593, /* GL_RENDER_MODE */
+      1317, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1375, /* GL_POINT_SMOOTH_HINT */
        838, /* GL_LINE_SMOOTH_HINT */
-      1392, /* GL_POLYGON_SMOOTH_HINT */
+      1393, /* GL_POLYGON_SMOOTH_HINT */
        592, /* GL_FOG_HINT */
-      2054, /* GL_TEXTURE_GEN_S */
-      2056, /* GL_TEXTURE_GEN_T */
-      2053, /* GL_TEXTURE_GEN_R */
-      2052, /* GL_TEXTURE_GEN_Q */
-      1329, /* GL_PIXEL_MAP_I_TO_I */
-      1335, /* GL_PIXEL_MAP_S_TO_S */
-      1331, /* GL_PIXEL_MAP_I_TO_R */
-      1327, /* GL_PIXEL_MAP_I_TO_G */
-      1325, /* GL_PIXEL_MAP_I_TO_B */
-      1323, /* GL_PIXEL_MAP_I_TO_A */
-      1333, /* GL_PIXEL_MAP_R_TO_R */
-      1321, /* GL_PIXEL_MAP_G_TO_G */
-      1319, /* GL_PIXEL_MAP_B_TO_B */
-      1317, /* GL_PIXEL_MAP_A_TO_A */
-      1330, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1336, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1332, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1328, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1326, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1324, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1334, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1322, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1320, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1318, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      2157, /* GL_UNPACK_SWAP_BYTES */
-      2152, /* GL_UNPACK_LSB_FIRST */
-      2153, /* GL_UNPACK_ROW_LENGTH */
-      2156, /* GL_UNPACK_SKIP_ROWS */
-      2155, /* GL_UNPACK_SKIP_PIXELS */
-      2150, /* GL_UNPACK_ALIGNMENT */
-      1304, /* GL_PACK_SWAP_BYTES */
-      1299, /* GL_PACK_LSB_FIRST */
-      1300, /* GL_PACK_ROW_LENGTH */
-      1303, /* GL_PACK_SKIP_ROWS */
-      1302, /* GL_PACK_SKIP_PIXELS */
-      1296, /* GL_PACK_ALIGNMENT */
+      2059, /* GL_TEXTURE_GEN_S */
+      2061, /* GL_TEXTURE_GEN_T */
+      2058, /* GL_TEXTURE_GEN_R */
+      2057, /* GL_TEXTURE_GEN_Q */
+      1330, /* GL_PIXEL_MAP_I_TO_I */
+      1336, /* GL_PIXEL_MAP_S_TO_S */
+      1332, /* GL_PIXEL_MAP_I_TO_R */
+      1328, /* GL_PIXEL_MAP_I_TO_G */
+      1326, /* GL_PIXEL_MAP_I_TO_B */
+      1324, /* GL_PIXEL_MAP_I_TO_A */
+      1334, /* GL_PIXEL_MAP_R_TO_R */
+      1322, /* GL_PIXEL_MAP_G_TO_G */
+      1320, /* GL_PIXEL_MAP_B_TO_B */
+      1318, /* GL_PIXEL_MAP_A_TO_A */
+      1331, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1337, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1333, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1329, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1327, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1325, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1335, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1323, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1321, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1319, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      2162, /* GL_UNPACK_SWAP_BYTES */
+      2157, /* GL_UNPACK_LSB_FIRST */
+      2158, /* GL_UNPACK_ROW_LENGTH */
+      2161, /* GL_UNPACK_SKIP_ROWS */
+      2160, /* GL_UNPACK_SKIP_PIXELS */
+      2155, /* GL_UNPACK_ALIGNMENT */
+      1305, /* GL_PACK_SWAP_BYTES */
+      1300, /* GL_PACK_LSB_FIRST */
+      1301, /* GL_PACK_ROW_LENGTH */
+      1304, /* GL_PACK_SKIP_ROWS */
+      1303, /* GL_PACK_SKIP_PIXELS */
+      1297, /* GL_PACK_ALIGNMENT */
        951, /* GL_MAP_COLOR */
        956, /* GL_MAP_STENCIL */
        746, /* GL_INDEX_SHIFT */
        745, /* GL_INDEX_OFFSET */
-      1554, /* GL_RED_SCALE */
-      1550, /* GL_RED_BIAS */
-      2298, /* GL_ZOOM_X */
-      2299, /* GL_ZOOM_Y */
+      1555, /* GL_RED_SCALE */
+      1551, /* GL_RED_BIAS */
+      2303, /* GL_ZOOM_X */
+      2304, /* GL_ZOOM_Y */
        701, /* GL_GREEN_SCALE */
        697, /* GL_GREEN_BIAS */
        115, /* GL_BLUE_SCALE */
@@ -4882,28 +4892,28 @@ static const unsigned reduced_enums[1555] =
       1042, /* GL_MAX_EVAL_ORDER */
       1059, /* GL_MAX_LIGHTS */
       1022, /* GL_MAX_CLIP_DISTANCES */
-      1114, /* GL_MAX_TEXTURE_SIZE */
+      1115, /* GL_MAX_TEXTURE_SIZE */
       1066, /* GL_MAX_PIXEL_MAP_TABLE */
       1018, /* GL_MAX_ATTRIB_STACK_DEPTH */
       1062, /* GL_MAX_MODELVIEW_STACK_DEPTH */
       1063, /* GL_MAX_NAME_STACK_DEPTH */
       1094, /* GL_MAX_PROJECTION_STACK_DEPTH */
-      1115, /* GL_MAX_TEXTURE_STACK_DEPTH */
-      1141, /* GL_MAX_VIEWPORT_DIMS */
+      1116, /* GL_MAX_TEXTURE_STACK_DEPTH */
+      1142, /* GL_MAX_VIEWPORT_DIMS */
       1019, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1872, /* GL_SUBPIXEL_BITS */
+      1873, /* GL_SUBPIXEL_BITS */
        741, /* GL_INDEX_BITS */
-      1551, /* GL_RED_BITS */
+      1552, /* GL_RED_BITS */
        698, /* GL_GREEN_BITS */
        112, /* GL_BLUE_BITS */
         48, /* GL_ALPHA_BITS */
        406, /* GL_DEPTH_BITS */
-      1836, /* GL_STENCIL_BITS */
+      1837, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-      1213, /* GL_NAME_STACK_DEPTH */
+      1214, /* GL_NAME_STACK_DEPTH */
         70, /* GL_AUTO_NORMAL */
        897, /* GL_MAP1_COLOR_4 */
        900, /* GL_MAP1_INDEX */
@@ -4927,39 +4937,39 @@ static const unsigned reduced_enums[1555] =
        899, /* GL_MAP1_GRID_SEGMENTS */
        925, /* GL_MAP2_GRID_DOMAIN */
        926, /* GL_MAP2_GRID_SEGMENTS */
-      1955, /* GL_TEXTURE_1D */
-      1958, /* GL_TEXTURE_2D */
+      1956, /* GL_TEXTURE_1D */
+      1959, /* GL_TEXTURE_2D */
        541, /* GL_FEEDBACK_BUFFER_POINTER */
        542, /* GL_FEEDBACK_BUFFER_SIZE */
        543, /* GL_FEEDBACK_BUFFER_TYPE */
-      1742, /* GL_SELECTION_BUFFER_POINTER */
-      1743, /* GL_SELECTION_BUFFER_SIZE */
-      2100, /* GL_TEXTURE_WIDTH */
-      2060, /* GL_TEXTURE_HEIGHT */
-      2004, /* GL_TEXTURE_COMPONENTS */
-      1985, /* GL_TEXTURE_BORDER_COLOR */
-      1984, /* GL_TEXTURE_BORDER */
+      1743, /* GL_SELECTION_BUFFER_POINTER */
+      1744, /* GL_SELECTION_BUFFER_SIZE */
+      2105, /* GL_TEXTURE_WIDTH */
+      2065, /* GL_TEXTURE_HEIGHT */
+      2009, /* GL_TEXTURE_COMPONENTS */
+      1987, /* GL_TEXTURE_BORDER_COLOR */
+      1986, /* GL_TEXTURE_BORDER */
        444, /* GL_DONT_CARE */
        539, /* GL_FASTEST */
-      1221, /* GL_NICEST */
+      1222, /* GL_NICEST */
         56, /* GL_AMBIENT */
        441, /* GL_DIFFUSE */
-      1795, /* GL_SPECULAR */
-      1396, /* GL_POSITION */
-      1798, /* GL_SPOT_DIRECTION */
-      1799, /* GL_SPOT_EXPONENT */
-      1797, /* GL_SPOT_CUTOFF */
+      1796, /* GL_SPECULAR */
+      1397, /* GL_POSITION */
+      1799, /* GL_SPOT_DIRECTION */
+      1800, /* GL_SPOT_EXPONENT */
+      1798, /* GL_SPOT_CUTOFF */
        320, /* GL_CONSTANT_ATTENUATION */
        826, /* GL_LINEAR_ATTENUATION */
-      1510, /* GL_QUADRATIC_ATTENUATION */
+      1511, /* GL_QUADRATIC_ATTENUATION */
        287, /* GL_COMPILE */
        288, /* GL_COMPILE_AND_EXECUTE */
        149, /* GL_BYTE */
-      2159, /* GL_UNSIGNED_BYTE */
-      1760, /* GL_SHORT */
-      2198, /* GL_UNSIGNED_SHORT */
+      2164, /* GL_UNSIGNED_BYTE */
+      1761, /* GL_SHORT */
+      2203, /* GL_UNSIGNED_SHORT */
        749, /* GL_INT */
-      2162, /* GL_UNSIGNED_INT */
+      2167, /* GL_UNSIGNED_INT */
        552, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
@@ -4972,100 +4982,100 @@ static const unsigned reduced_enums[1555] =
         60, /* GL_AND_REVERSE */
        350, /* GL_COPY */
         59, /* GL_AND_INVERTED */
-      1224, /* GL_NOOP */
-      2294, /* GL_XOR */
-      1291, /* GL_OR */
-      1225, /* GL_NOR */
+      1225, /* GL_NOOP */
+      2299, /* GL_XOR */
+      1292, /* GL_OR */
+      1226, /* GL_NOR */
        529, /* GL_EQUIV */
        802, /* GL_INVERT */
-      1294, /* GL_OR_REVERSE */
+      1295, /* GL_OR_REVERSE */
        351, /* GL_COPY_INVERTED */
-      1293, /* GL_OR_INVERTED */
-      1214, /* GL_NAND */
-      1749, /* GL_SET */
+      1294, /* GL_OR_INVERTED */
+      1215, /* GL_NAND */
+      1750, /* GL_SET */
        526, /* GL_EMISSION */
-      1759, /* GL_SHININESS */
+      1760, /* GL_SHININESS */
         57, /* GL_AMBIENT_AND_DIFFUSE */
        232, /* GL_COLOR_INDEXES */
-      1163, /* GL_MODELVIEW */
-      1482, /* GL_PROJECTION */
-      1890, /* GL_TEXTURE */
+      1164, /* GL_MODELVIEW */
+      1483, /* GL_PROJECTION */
+      1891, /* GL_TEXTURE */
        188, /* GL_COLOR */
        398, /* GL_DEPTH */
-      1821, /* GL_STENCIL */
+      1822, /* GL_STENCIL */
        231, /* GL_COLOR_INDEX */
-      1842, /* GL_STENCIL_INDEX */
+      1843, /* GL_STENCIL_INDEX */
        414, /* GL_DEPTH_COMPONENT */
-      1547, /* GL_RED */
+      1548, /* GL_RED */
        696, /* GL_GREEN */
        110, /* GL_BLUE */
         32, /* GL_ALPHA */
-      1603, /* GL_RGB */
-      1643, /* GL_RGBA */
+      1604, /* GL_RGB */
+      1644, /* GL_RGBA */
        860, /* GL_LUMINANCE */
        887, /* GL_LUMINANCE_ALPHA */
         86, /* GL_BITMAP */
-      1346, /* GL_POINT */
+      1347, /* GL_POINT */
        824, /* GL_LINE */
        544, /* GL_FILL */
-      1561, /* GL_RENDER */
+      1562, /* GL_RENDER */
        540, /* GL_FEEDBACK */
-      1741, /* GL_SELECT */
+      1742, /* GL_SELECT */
        551, /* GL_FLAT */
-      1770, /* GL_SMOOTH */
+      1771, /* GL_SMOOTH */
        803, /* GL_KEEP */
-      1594, /* GL_REPLACE */
+      1595, /* GL_REPLACE */
        731, /* GL_INCR */
        394, /* GL_DECR */
-      2215, /* GL_VENDOR */
-      1591, /* GL_RENDERER */
-      2216, /* GL_VERSION */
+      2220, /* GL_VENDOR */
+      1592, /* GL_RENDERER */
+      2221, /* GL_VERSION */
        533, /* GL_EXTENSIONS */
-      1691, /* GL_S */
-      1881, /* GL_T */
-      1530, /* GL_R */
-      1509, /* GL_Q */
-      1200, /* GL_MODULATE */
+      1692, /* GL_S */
+      1882, /* GL_T */
+      1531, /* GL_R */
+      1510, /* GL_Q */
+      1201, /* GL_MODULATE */
        393, /* GL_DECAL */
-      2047, /* GL_TEXTURE_ENV_MODE */
-      2046, /* GL_TEXTURE_ENV_COLOR */
-      2045, /* GL_TEXTURE_ENV */
+      2052, /* GL_TEXTURE_ENV_MODE */
+      2051, /* GL_TEXTURE_ENV_COLOR */
+      2050, /* GL_TEXTURE_ENV */
        534, /* GL_EYE_LINEAR */
-      1252, /* GL_OBJECT_LINEAR */
-      1796, /* GL_SPHERE_MAP */
-      2050, /* GL_TEXTURE_GEN_MODE */
-      1254, /* GL_OBJECT_PLANE */
+      1253, /* GL_OBJECT_LINEAR */
+      1797, /* GL_SPHERE_MAP */
+      2055, /* GL_TEXTURE_GEN_MODE */
+      1255, /* GL_OBJECT_PLANE */
        535, /* GL_EYE_PLANE */
-      1215, /* GL_NEAREST */
+      1216, /* GL_NEAREST */
        825, /* GL_LINEAR */
-      1219, /* GL_NEAREST_MIPMAP_NEAREST */
+      1220, /* GL_NEAREST_MIPMAP_NEAREST */
        830, /* GL_LINEAR_MIPMAP_NEAREST */
-      1218, /* GL_NEAREST_MIPMAP_LINEAR */
+      1219, /* GL_NEAREST_MIPMAP_LINEAR */
        829, /* GL_LINEAR_MIPMAP_LINEAR */
-      2073, /* GL_TEXTURE_MAG_FILTER */
-      2082, /* GL_TEXTURE_MIN_FILTER */
-      2103, /* GL_TEXTURE_WRAP_S */
-      2104, /* GL_TEXTURE_WRAP_T */
+      2078, /* GL_TEXTURE_MAG_FILTER */
+      2087, /* GL_TEXTURE_MIN_FILTER */
+      2108, /* GL_TEXTURE_WRAP_S */
+      2109, /* GL_TEXTURE_WRAP_T */
        155, /* GL_CLAMP */
-      1593, /* GL_REPEAT */
-      1390, /* GL_POLYGON_OFFSET_UNITS */
-      1389, /* GL_POLYGON_OFFSET_POINT */
-      1388, /* GL_POLYGON_OFFSET_LINE */
-      1533, /* GL_R3_G3_B2 */
-      2212, /* GL_V2F */
-      2213, /* GL_V3F */
+      1594, /* GL_REPEAT */
+      1391, /* GL_POLYGON_OFFSET_UNITS */
+      1390, /* GL_POLYGON_OFFSET_POINT */
+      1389, /* GL_POLYGON_OFFSET_LINE */
+      1534, /* GL_R3_G3_B2 */
+      2217, /* GL_V2F */
+      2218, /* GL_V3F */
        152, /* GL_C4UB_V2F */
        153, /* GL_C4UB_V3F */
        150, /* GL_C3F_V3F */
-      1212, /* GL_N3F_V3F */
+      1213, /* GL_N3F_V3F */
        151, /* GL_C4F_N3F_V3F */
-      1886, /* GL_T2F_V3F */
-      1888, /* GL_T4F_V4F */
-      1884, /* GL_T2F_C4UB_V3F */
-      1882, /* GL_T2F_C3F_V3F */
-      1885, /* GL_T2F_N3F_V3F */
-      1883, /* GL_T2F_C4F_N3F_V3F */
-      1887, /* GL_T4F_C4F_N3F_V4F */
+      1887, /* GL_T2F_V3F */
+      1889, /* GL_T4F_V4F */
+      1885, /* GL_T2F_C4UB_V3F */
+      1883, /* GL_T2F_C3F_V3F */
+      1886, /* GL_T2F_N3F_V3F */
+      1884, /* GL_T2F_C4F_N3F_V3F */
+      1888, /* GL_T4F_C4F_N3F_V4F */
        172, /* GL_CLIP_DISTANCE0 */
        173, /* GL_CLIP_DISTANCE1 */
        174, /* GL_CLIP_DISTANCE2 */
@@ -5084,38 +5094,38 @@ static const unsigned reduced_enums[1555] =
        816, /* GL_LIGHT7 */
        706, /* GL_HINT_BIT */
        322, /* GL_CONSTANT_COLOR */
-      1265, /* GL_ONE_MINUS_CONSTANT_COLOR */
+      1266, /* GL_ONE_MINUS_CONSTANT_COLOR */
        317, /* GL_CONSTANT_ALPHA */
-      1263, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+      1264, /* GL_ONE_MINUS_CONSTANT_ALPHA */
         89, /* GL_BLEND_COLOR */
        673, /* GL_FUNC_ADD */
-      1144, /* GL_MIN */
+      1145, /* GL_MIN */
       1013, /* GL_MAX */
         96, /* GL_BLEND_EQUATION */
        679, /* GL_FUNC_SUBTRACT */
        676, /* GL_FUNC_REVERSE_SUBTRACT */
        330, /* GL_CONVOLUTION_1D */
        331, /* GL_CONVOLUTION_2D */
-      1744, /* GL_SEPARABLE_2D */
+      1745, /* GL_SEPARABLE_2D */
        334, /* GL_CONVOLUTION_BORDER_MODE */
        338, /* GL_CONVOLUTION_FILTER_SCALE */
        336, /* GL_CONVOLUTION_FILTER_BIAS */
-      1548, /* GL_REDUCE */
+      1549, /* GL_REDUCE */
        340, /* GL_CONVOLUTION_FORMAT */
        344, /* GL_CONVOLUTION_WIDTH */
        342, /* GL_CONVOLUTION_HEIGHT */
       1032, /* GL_MAX_CONVOLUTION_WIDTH */
       1030, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1429, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1425, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1420, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1416, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1427, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1423, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1418, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1414, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+      1430, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1426, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1421, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1417, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1428, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1424, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1419, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1415, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
        707, /* GL_HISTOGRAM */
-      1489, /* GL_PROXY_HISTOGRAM */
+      1490, /* GL_PROXY_HISTOGRAM */
        723, /* GL_HISTOGRAM_WIDTH */
        713, /* GL_HISTOGRAM_FORMAT */
        719, /* GL_HISTOGRAM_RED_SIZE */
@@ -5124,19 +5134,19 @@ static const unsigned reduced_enums[1555] =
        708, /* GL_HISTOGRAM_ALPHA_SIZE */
        717, /* GL_HISTOGRAM_LUMINANCE_SIZE */
        721, /* GL_HISTOGRAM_SINK */
-      1145, /* GL_MINMAX */
-      1147, /* GL_MINMAX_FORMAT */
-      1149, /* GL_MINMAX_SINK */
-      1889, /* GL_TABLE_TOO_LARGE_EXT */
-      2161, /* GL_UNSIGNED_BYTE_3_3_2 */
-      2201, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      2204, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      2173, /* GL_UNSIGNED_INT_8_8_8_8 */
-      2164, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1387, /* GL_POLYGON_OFFSET_FILL */
-      1386, /* GL_POLYGON_OFFSET_FACTOR */
-      1385, /* GL_POLYGON_OFFSET_BIAS */
-      1597, /* GL_RESCALE_NORMAL */
+      1146, /* GL_MINMAX */
+      1148, /* GL_MINMAX_FORMAT */
+      1150, /* GL_MINMAX_SINK */
+      1890, /* GL_TABLE_TOO_LARGE_EXT */
+      2166, /* GL_UNSIGNED_BYTE_3_3_2 */
+      2206, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      2209, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      2178, /* GL_UNSIGNED_INT_8_8_8_8 */
+      2169, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1388, /* GL_POLYGON_OFFSET_FILL */
+      1387, /* GL_POLYGON_OFFSET_FACTOR */
+      1386, /* GL_POLYGON_OFFSET_BIAS */
+      1598, /* GL_RESCALE_NORMAL */
         41, /* GL_ALPHA4 */
         43, /* GL_ALPHA8 */
         33, /* GL_ALPHA12 */
@@ -5156,102 +5166,102 @@ static const unsigned reduced_enums[1555] =
        761, /* GL_INTENSITY8 */
        751, /* GL_INTENSITY12 */
        753, /* GL_INTENSITY16 */
-      1618, /* GL_RGB2_EXT */
-      1624, /* GL_RGB4 */
-      1627, /* GL_RGB5 */
-      1634, /* GL_RGB8 */
-      1604, /* GL_RGB10 */
-      1608, /* GL_RGB12 */
-      1610, /* GL_RGB16 */
-      1654, /* GL_RGBA2 */
-      1661, /* GL_RGBA4 */
-      1630, /* GL_RGB5_A1 */
-      1666, /* GL_RGBA8 */
-      1605, /* GL_RGB10_A2 */
-      1644, /* GL_RGBA12 */
-      1646, /* GL_RGBA16 */
-      2090, /* GL_TEXTURE_RED_SIZE */
-      2058, /* GL_TEXTURE_GREEN_SIZE */
-      1982, /* GL_TEXTURE_BLUE_SIZE */
-      1963, /* GL_TEXTURE_ALPHA_SIZE */
-      2071, /* GL_TEXTURE_LUMINANCE_SIZE */
-      2062, /* GL_TEXTURE_INTENSITY_SIZE */
-      1595, /* GL_REPLACE_EXT */
-      1493, /* GL_PROXY_TEXTURE_1D */
-      1497, /* GL_PROXY_TEXTURE_2D */
-      2098, /* GL_TEXTURE_TOO_LARGE_EXT */
-      2084, /* GL_TEXTURE_PRIORITY */
-      2092, /* GL_TEXTURE_RESIDENT */
-      1966, /* GL_TEXTURE_BINDING_1D */
-      1969, /* GL_TEXTURE_BINDING_2D */
-      1972, /* GL_TEXTURE_BINDING_3D */
-      1301, /* GL_PACK_SKIP_IMAGES */
-      1297, /* GL_PACK_IMAGE_HEIGHT */
-      2154, /* GL_UNPACK_SKIP_IMAGES */
-      2151, /* GL_UNPACK_IMAGE_HEIGHT */
-      1961, /* GL_TEXTURE_3D */
-      1501, /* GL_PROXY_TEXTURE_3D */
-      2042, /* GL_TEXTURE_DEPTH */
-      2101, /* GL_TEXTURE_WRAP_R */
+      1619, /* GL_RGB2_EXT */
+      1625, /* GL_RGB4 */
+      1628, /* GL_RGB5 */
+      1635, /* GL_RGB8 */
+      1605, /* GL_RGB10 */
+      1609, /* GL_RGB12 */
+      1611, /* GL_RGB16 */
+      1655, /* GL_RGBA2 */
+      1662, /* GL_RGBA4 */
+      1631, /* GL_RGB5_A1 */
+      1667, /* GL_RGBA8 */
+      1606, /* GL_RGB10_A2 */
+      1645, /* GL_RGBA12 */
+      1647, /* GL_RGBA16 */
+      2095, /* GL_TEXTURE_RED_SIZE */
+      2063, /* GL_TEXTURE_GREEN_SIZE */
+      1984, /* GL_TEXTURE_BLUE_SIZE */
+      1964, /* GL_TEXTURE_ALPHA_SIZE */
+      2076, /* GL_TEXTURE_LUMINANCE_SIZE */
+      2067, /* GL_TEXTURE_INTENSITY_SIZE */
+      1596, /* GL_REPLACE_EXT */
+      1494, /* GL_PROXY_TEXTURE_1D */
+      1498, /* GL_PROXY_TEXTURE_2D */
+      2103, /* GL_TEXTURE_TOO_LARGE_EXT */
+      2089, /* GL_TEXTURE_PRIORITY */
+      2097, /* GL_TEXTURE_RESIDENT */
+      1967, /* GL_TEXTURE_BINDING_1D */
+      1970, /* GL_TEXTURE_BINDING_2D */
+      1973, /* GL_TEXTURE_BINDING_3D */
+      1302, /* GL_PACK_SKIP_IMAGES */
+      1298, /* GL_PACK_IMAGE_HEIGHT */
+      2159, /* GL_UNPACK_SKIP_IMAGES */
+      2156, /* GL_UNPACK_IMAGE_HEIGHT */
+      1962, /* GL_TEXTURE_3D */
+      1502, /* GL_PROXY_TEXTURE_3D */
+      2047, /* GL_TEXTURE_DEPTH */
+      2106, /* GL_TEXTURE_WRAP_R */
       1014, /* GL_MAX_3D_TEXTURE_SIZE */
-      2217, /* GL_VERTEX_ARRAY */
-      1227, /* GL_NORMAL_ARRAY */
+      2222, /* GL_VERTEX_ARRAY */
+      1228, /* GL_NORMAL_ARRAY */
        189, /* GL_COLOR_ARRAY */
        735, /* GL_INDEX_ARRAY */
-      2012, /* GL_TEXTURE_COORD_ARRAY */
+      2017, /* GL_TEXTURE_COORD_ARRAY */
        518, /* GL_EDGE_FLAG_ARRAY */
-      2223, /* GL_VERTEX_ARRAY_SIZE */
-      2225, /* GL_VERTEX_ARRAY_TYPE */
-      2224, /* GL_VERTEX_ARRAY_STRIDE */
-      1232, /* GL_NORMAL_ARRAY_TYPE */
-      1231, /* GL_NORMAL_ARRAY_STRIDE */
+      2228, /* GL_VERTEX_ARRAY_SIZE */
+      2230, /* GL_VERTEX_ARRAY_TYPE */
+      2229, /* GL_VERTEX_ARRAY_STRIDE */
+      1233, /* GL_NORMAL_ARRAY_TYPE */
+      1232, /* GL_NORMAL_ARRAY_STRIDE */
        193, /* GL_COLOR_ARRAY_SIZE */
        195, /* GL_COLOR_ARRAY_TYPE */
        194, /* GL_COLOR_ARRAY_STRIDE */
        740, /* GL_INDEX_ARRAY_TYPE */
        739, /* GL_INDEX_ARRAY_STRIDE */
-      2016, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      2018, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      2017, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+      2021, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      2023, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      2022, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
        522, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      2222, /* GL_VERTEX_ARRAY_POINTER */
-      1230, /* GL_NORMAL_ARRAY_POINTER */
+      2227, /* GL_VERTEX_ARRAY_POINTER */
+      1231, /* GL_NORMAL_ARRAY_POINTER */
        192, /* GL_COLOR_ARRAY_POINTER */
        738, /* GL_INDEX_ARRAY_POINTER */
-      2015, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+      2020, /* GL_TEXTURE_COORD_ARRAY_POINTER */
        521, /* GL_EDGE_FLAG_ARRAY_POINTER */
-      1205, /* GL_MULTISAMPLE */
-      1718, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1720, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1725, /* GL_SAMPLE_COVERAGE */
-      1722, /* GL_SAMPLE_BUFFERS */
-      1713, /* GL_SAMPLES */
-      1729, /* GL_SAMPLE_COVERAGE_VALUE */
-      1727, /* GL_SAMPLE_COVERAGE_INVERT */
+      1206, /* GL_MULTISAMPLE */
+      1719, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1721, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1726, /* GL_SAMPLE_COVERAGE */
+      1723, /* GL_SAMPLE_BUFFERS */
+      1714, /* GL_SAMPLES */
+      1730, /* GL_SAMPLE_COVERAGE_VALUE */
+      1728, /* GL_SAMPLE_COVERAGE_INVERT */
        237, /* GL_COLOR_MATRIX */
        239, /* GL_COLOR_MATRIX_STACK_DEPTH */
       1026, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1412, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1408, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1403, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1399, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1410, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1406, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1401, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1397, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1995, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1502, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1997, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+      1413, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1409, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1404, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1400, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1411, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1407, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1402, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1398, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      2000, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1503, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      2002, /* 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 */
-      1422, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1405, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1488, /* GL_PROXY_COLOR_TABLE */
-      1492, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1491, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+      1423, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1406, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1489, /* GL_PROXY_COLOR_TABLE */
+      1493, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1492, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
        267, /* GL_COLOR_TABLE_SCALE */
        247, /* GL_COLOR_TABLE_BIAS */
        252, /* GL_COLOR_TABLE_FORMAT */
@@ -5266,60 +5276,60 @@ static const unsigned reduced_enums[1555] =
         80, /* GL_BGRA */
       1041, /* GL_MAX_ELEMENTS_VERTICES */
       1040, /* GL_MAX_ELEMENTS_INDICES */
-      2061, /* GL_TEXTURE_INDEX_SIZE_EXT */
+      2066, /* GL_TEXTURE_INDEX_SIZE_EXT */
        186, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1368, /* GL_POINT_SIZE_MIN */
-      1364, /* GL_POINT_SIZE_MAX */
-      1353, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1349, /* GL_POINT_DISTANCE_ATTENUATION */
+      1369, /* GL_POINT_SIZE_MIN */
+      1365, /* GL_POINT_SIZE_MAX */
+      1354, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1350, /* GL_POINT_DISTANCE_ATTENUATION */
        159, /* GL_CLAMP_TO_BORDER */
        162, /* GL_CLAMP_TO_EDGE */
-      2083, /* GL_TEXTURE_MIN_LOD */
-      2081, /* GL_TEXTURE_MAX_LOD */
-      1965, /* GL_TEXTURE_BASE_LEVEL */
-      2080, /* GL_TEXTURE_MAX_LEVEL */
+      2088, /* GL_TEXTURE_MIN_LOD */
+      2086, /* GL_TEXTURE_MAX_LOD */
+      1966, /* GL_TEXTURE_BASE_LEVEL */
+      2085, /* GL_TEXTURE_MAX_LEVEL */
        726, /* GL_IGNORE_BORDER_HP */
        321, /* GL_CONSTANT_BORDER_HP */
-      1596, /* GL_REPLICATE_BORDER_HP */
+      1597, /* GL_REPLICATE_BORDER_HP */
        332, /* GL_CONVOLUTION_BORDER_COLOR */
-      1260, /* GL_OCCLUSION_TEST_HP */
-      1261, /* GL_OCCLUSION_TEST_RESULT_HP */
+      1261, /* GL_OCCLUSION_TEST_HP */
+      1262, /* GL_OCCLUSION_TEST_RESULT_HP */
        827, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1989, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1991, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1993, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1994, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1992, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1990, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+      1994, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1996, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1998, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      1999, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1997, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1995, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
       1020, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
       1021, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1432, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1434, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1431, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1433, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      2069, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      2070, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      2068, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+      1433, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1435, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1432, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1434, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      2074, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      2075, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      2073, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
        682, /* GL_GENERATE_MIPMAP */
        683, /* GL_GENERATE_MIPMAP_HINT */
        595, /* GL_FOG_OFFSET_SGIX */
        596, /* GL_FOG_OFFSET_VALUE_SGIX */
-      2003, /* GL_TEXTURE_COMPARE_SGIX */
-      2002, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      2065, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      2057, /* GL_TEXTURE_GEQUAL_R_SGIX */
+      2008, /* GL_TEXTURE_COMPARE_SGIX */
+      2007, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      2070, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      2062, /* GL_TEXTURE_GEQUAL_R_SGIX */
        415, /* GL_DEPTH_COMPONENT16 */
        419, /* GL_DEPTH_COMPONENT24 */
        423, /* GL_DEPTH_COMPONENT32 */
        357, /* GL_CULL_VERTEX_EXT */
        359, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
        358, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      2290, /* GL_WRAP_BORDER_SUN */
-      1996, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+      2295, /* GL_WRAP_BORDER_SUN */
+      2001, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
        820, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1763, /* GL_SINGLE_COLOR */
-      1747, /* GL_SEPARATE_SPECULAR_COLOR */
-      1758, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+      1764, /* GL_SINGLE_COLOR */
+      1748, /* GL_SEPARATE_SPECULAR_COLOR */
+      1759, /* GL_SHARED_TEXTURE_PALETTE_EXT */
        607, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
        608, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
        619, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
@@ -5332,37 +5342,37 @@ static const unsigned reduced_enums[1555] =
        664, /* GL_FRAMEBUFFER_UNDEFINED */
        431, /* GL_DEPTH_STENCIL_ATTACHMENT */
        896, /* GL_MAJOR_VERSION */
-      1151, /* GL_MINOR_VERSION */
-      1241, /* GL_NUM_EXTENSIONS */
+      1152, /* GL_MINOR_VERSION */
+      1242, /* GL_NUM_EXTENSIONS */
        327, /* GL_CONTEXT_FLAGS */
        734, /* GL_INDEX */
        409, /* GL_DEPTH_BUFFER */
-      1837, /* GL_STENCIL_BUFFER */
+      1838, /* GL_STENCIL_BUFFER */
        298, /* GL_COMPRESSED_RED */
        299, /* GL_COMPRESSED_RG */
-      2160, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      2205, /* GL_UNSIGNED_SHORT_5_6_5 */
-      2206, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      2202, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      2199, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      2174, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      2170, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      2078, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      2079, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      2077, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-      1155, /* GL_MIRRORED_REPEAT */
-      1684, /* GL_RGB_S3TC */
-      1626, /* GL_RGB4_S3TC */
-      1680, /* GL_RGBA_S3TC */
-      1665, /* GL_RGBA4_S3TC */
-      1674, /* GL_RGBA_DXT5_S3TC */
-      1662, /* GL_RGBA4_DXT5_S3TC */
+      2165, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      2210, /* GL_UNSIGNED_SHORT_5_6_5 */
+      2211, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      2207, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      2204, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      2179, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      2175, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      2083, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      2084, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      2082, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+      1156, /* GL_MIRRORED_REPEAT */
+      1685, /* GL_RGB_S3TC */
+      1627, /* GL_RGB4_S3TC */
+      1681, /* GL_RGBA_S3TC */
+      1666, /* GL_RGBA4_S3TC */
+      1675, /* GL_RGBA_DXT5_S3TC */
+      1663, /* 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 */
        306, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-      1217, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-      1216, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+      1218, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+      1217, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
        828, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
        582, /* GL_FOG_COORDINATE_SOURCE */
        574, /* GL_FOG_COORD */
@@ -5374,54 +5384,54 @@ static const unsigned reduced_enums[1555] =
        576, /* GL_FOG_COORDINATE_ARRAY */
        241, /* GL_COLOR_SUM */
        384, /* GL_CURRENT_SECONDARY_COLOR */
-      1738, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1740, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1739, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1737, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1734, /* GL_SECONDARY_COLOR_ARRAY */
+      1739, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1741, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1740, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1738, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1735, /* GL_SECONDARY_COLOR_ARRAY */
        382, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         29, /* GL_ALIASED_POINT_SIZE_RANGE */
         28, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1891, /* GL_TEXTURE0 */
-      1893, /* GL_TEXTURE1 */
-      1915, /* GL_TEXTURE2 */
-      1937, /* GL_TEXTURE3 */
-      1943, /* GL_TEXTURE4 */
-      1945, /* GL_TEXTURE5 */
-      1947, /* GL_TEXTURE6 */
-      1949, /* GL_TEXTURE7 */
-      1951, /* GL_TEXTURE8 */
-      1953, /* GL_TEXTURE9 */
-      1894, /* GL_TEXTURE10 */
-      1896, /* GL_TEXTURE11 */
-      1898, /* GL_TEXTURE12 */
-      1900, /* GL_TEXTURE13 */
-      1902, /* GL_TEXTURE14 */
-      1904, /* GL_TEXTURE15 */
-      1906, /* GL_TEXTURE16 */
-      1908, /* GL_TEXTURE17 */
-      1910, /* GL_TEXTURE18 */
-      1912, /* GL_TEXTURE19 */
-      1916, /* GL_TEXTURE20 */
-      1918, /* GL_TEXTURE21 */
-      1920, /* GL_TEXTURE22 */
-      1922, /* GL_TEXTURE23 */
-      1924, /* GL_TEXTURE24 */
-      1926, /* GL_TEXTURE25 */
-      1928, /* GL_TEXTURE26 */
-      1930, /* GL_TEXTURE27 */
-      1932, /* GL_TEXTURE28 */
-      1934, /* GL_TEXTURE29 */
-      1938, /* GL_TEXTURE30 */
-      1940, /* GL_TEXTURE31 */
+      1892, /* GL_TEXTURE0 */
+      1894, /* GL_TEXTURE1 */
+      1916, /* GL_TEXTURE2 */
+      1938, /* GL_TEXTURE3 */
+      1944, /* GL_TEXTURE4 */
+      1946, /* GL_TEXTURE5 */
+      1948, /* GL_TEXTURE6 */
+      1950, /* GL_TEXTURE7 */
+      1952, /* GL_TEXTURE8 */
+      1954, /* GL_TEXTURE9 */
+      1895, /* GL_TEXTURE10 */
+      1897, /* GL_TEXTURE11 */
+      1899, /* GL_TEXTURE12 */
+      1901, /* GL_TEXTURE13 */
+      1903, /* GL_TEXTURE14 */
+      1905, /* GL_TEXTURE15 */
+      1907, /* GL_TEXTURE16 */
+      1909, /* GL_TEXTURE17 */
+      1911, /* GL_TEXTURE18 */
+      1913, /* GL_TEXTURE19 */
+      1917, /* GL_TEXTURE20 */
+      1919, /* GL_TEXTURE21 */
+      1921, /* GL_TEXTURE22 */
+      1923, /* GL_TEXTURE23 */
+      1925, /* GL_TEXTURE24 */
+      1927, /* GL_TEXTURE25 */
+      1929, /* GL_TEXTURE26 */
+      1931, /* GL_TEXTURE27 */
+      1933, /* GL_TEXTURE28 */
+      1935, /* GL_TEXTURE29 */
+      1939, /* GL_TEXTURE30 */
+      1941, /* GL_TEXTURE31 */
         19, /* GL_ACTIVE_TEXTURE */
        166, /* GL_CLIENT_ACTIVE_TEXTURE */
-      1116, /* GL_MAX_TEXTURE_UNITS */
-      2133, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      2136, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      2138, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      2130, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1873, /* GL_SUBTRACT */
+      1117, /* GL_MAX_TEXTURE_UNITS */
+      2138, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      2141, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      2143, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      2135, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1874, /* GL_SUBTRACT */
       1098, /* GL_MAX_RENDERBUFFER_SIZE */
        290, /* GL_COMPRESSED_ALPHA */
        294, /* GL_COMPRESSED_LUMINANCE */
@@ -5429,94 +5439,94 @@ static const unsigned reduced_enums[1555] =
        292, /* GL_COMPRESSED_INTENSITY */
        300, /* GL_COMPRESSED_RGB */
        301, /* GL_COMPRESSED_RGBA */
-      2010, /* GL_TEXTURE_COMPRESSION_HINT */
-      2087, /* GL_TEXTURE_RECTANGLE */
-      1978, /* GL_TEXTURE_BINDING_RECTANGLE */
-      1505, /* GL_PROXY_TEXTURE_RECTANGLE */
+      2015, /* GL_TEXTURE_COMPRESSION_HINT */
+      2092, /* GL_TEXTURE_RECTANGLE */
+      1980, /* GL_TEXTURE_BINDING_RECTANGLE */
+      1506, /* GL_PROXY_TEXTURE_RECTANGLE */
       1095, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
        430, /* GL_DEPTH_STENCIL */
-      2166, /* GL_UNSIGNED_INT_24_8 */
-      1111, /* GL_MAX_TEXTURE_LOD_BIAS */
-      2076, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-      1113, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      2048, /* GL_TEXTURE_FILTER_CONTROL */
-      2066, /* GL_TEXTURE_LOD_BIAS */
+      2171, /* GL_UNSIGNED_INT_24_8 */
+      1112, /* GL_MAX_TEXTURE_LOD_BIAS */
+      2081, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+      1114, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      2053, /* GL_TEXTURE_FILTER_CONTROL */
+      2071, /* GL_TEXTURE_LOD_BIAS */
        274, /* GL_COMBINE4 */
       1104, /* GL_MAX_SHININESS_NV */
       1105, /* GL_MAX_SPOT_EXPONENT_NV */
        732, /* GL_INCR_WRAP */
        395, /* GL_DECR_WRAP */
-      1175, /* GL_MODELVIEW1_ARB */
-      1233, /* GL_NORMAL_MAP */
-      1556, /* GL_REFLECTION_MAP */
-      2020, /* GL_TEXTURE_CUBE_MAP */
-      1975, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      2032, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      2022, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      2035, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      2025, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      2038, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      2028, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1503, /* GL_PROXY_TEXTURE_CUBE_MAP */
+      1176, /* GL_MODELVIEW1_ARB */
+      1234, /* GL_NORMAL_MAP */
+      1557, /* GL_REFLECTION_MAP */
+      2025, /* GL_TEXTURE_CUBE_MAP */
+      1977, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      2037, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      2027, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      2040, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      2030, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      2043, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      2033, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1504, /* GL_PROXY_TEXTURE_CUBE_MAP */
       1034, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-      1211, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-      1446, /* GL_PRIMITIVE_RESTART_NV */
-      1445, /* GL_PRIMITIVE_RESTART_INDEX_NV */
+      1212, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+      1447, /* GL_PRIMITIVE_RESTART_NV */
+      1446, /* GL_PRIMITIVE_RESTART_INDEX_NV */
        590, /* GL_FOG_DISTANCE_MODE_NV */
        537, /* GL_EYE_RADIAL_NV */
        536, /* GL_EYE_PLANE_ABSOLUTE_NV */
        273, /* GL_COMBINE */
        280, /* GL_COMBINE_RGB */
        275, /* GL_COMBINE_ALPHA */
-      1685, /* GL_RGB_SCALE */
+      1686, /* GL_RGB_SCALE */
         25, /* GL_ADD_SIGNED */
        768, /* GL_INTERPOLATE */
        316, /* GL_CONSTANT */
-      1438, /* GL_PRIMARY_COLOR */
-      1435, /* GL_PREVIOUS */
-      1778, /* GL_SOURCE0_RGB */
-      1784, /* GL_SOURCE1_RGB */
-      1790, /* GL_SOURCE2_RGB */
-      1794, /* GL_SOURCE3_RGB_NV */
-      1775, /* GL_SOURCE0_ALPHA */
-      1781, /* GL_SOURCE1_ALPHA */
-      1787, /* GL_SOURCE2_ALPHA */
-      1793, /* GL_SOURCE3_ALPHA_NV */
-      1274, /* GL_OPERAND0_RGB */
-      1280, /* GL_OPERAND1_RGB */
-      1286, /* GL_OPERAND2_RGB */
-      1290, /* GL_OPERAND3_RGB_NV */
-      1271, /* GL_OPERAND0_ALPHA */
-      1277, /* GL_OPERAND1_ALPHA */
-      1283, /* GL_OPERAND2_ALPHA */
-      1289, /* GL_OPERAND3_ALPHA_NV */
+      1439, /* GL_PRIMARY_COLOR */
+      1436, /* GL_PREVIOUS */
+      1779, /* GL_SOURCE0_RGB */
+      1785, /* GL_SOURCE1_RGB */
+      1791, /* GL_SOURCE2_RGB */
+      1795, /* GL_SOURCE3_RGB_NV */
+      1776, /* GL_SOURCE0_ALPHA */
+      1782, /* GL_SOURCE1_ALPHA */
+      1788, /* GL_SOURCE2_ALPHA */
+      1794, /* GL_SOURCE3_ALPHA_NV */
+      1275, /* GL_OPERAND0_RGB */
+      1281, /* GL_OPERAND1_RGB */
+      1287, /* GL_OPERAND2_RGB */
+      1291, /* GL_OPERAND3_RGB_NV */
+      1272, /* GL_OPERAND0_ALPHA */
+      1278, /* GL_OPERAND1_ALPHA */
+      1284, /* GL_OPERAND2_ALPHA */
+      1290, /* GL_OPERAND3_ALPHA_NV */
        137, /* GL_BUFFER_OBJECT_APPLE */
-      2218, /* GL_VERTEX_ARRAY_BINDING */
-      2085, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-      2086, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-      2295, /* GL_YCBCR_422_APPLE */
-      2207, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      2209, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      2097, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-      1864, /* GL_STORAGE_PRIVATE_APPLE */
-      1863, /* GL_STORAGE_CACHED_APPLE */
-      1865, /* GL_STORAGE_SHARED_APPLE */
-      1765, /* GL_SLICE_ACCUM_SUN */
-      1514, /* GL_QUAD_MESH_SUN */
-      2144, /* GL_TRIANGLE_MESH_SUN */
-      2260, /* GL_VERTEX_PROGRAM_ARB */
-      2271, /* GL_VERTEX_STATE_PROGRAM_NV */
-      2245, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      2253, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      2255, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      2257, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+      2223, /* GL_VERTEX_ARRAY_BINDING */
+      2090, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+      2091, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+      2300, /* GL_YCBCR_422_APPLE */
+      2212, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      2214, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      2102, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+      1865, /* GL_STORAGE_PRIVATE_APPLE */
+      1864, /* GL_STORAGE_CACHED_APPLE */
+      1866, /* GL_STORAGE_SHARED_APPLE */
+      1766, /* GL_SLICE_ACCUM_SUN */
+      1515, /* GL_QUAD_MESH_SUN */
+      2149, /* GL_TRIANGLE_MESH_SUN */
+      2265, /* GL_VERTEX_PROGRAM_ARB */
+      2276, /* GL_VERTEX_STATE_PROGRAM_NV */
+      2250, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      2258, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      2260, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      2262, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
        386, /* GL_CURRENT_VERTEX_ATTRIB */
-      1459, /* GL_PROGRAM_LENGTH_ARB */
-      1475, /* GL_PROGRAM_STRING_ARB */
-      1198, /* GL_MODELVIEW_PROJECTION_NV */
+      1460, /* GL_PROGRAM_LENGTH_ARB */
+      1476, /* GL_PROGRAM_STRING_ARB */
+      1199, /* GL_MODELVIEW_PROJECTION_NV */
        725, /* GL_IDENTITY_NV */
        800, /* GL_INVERSE_NV */
-      2135, /* GL_TRANSPOSE_NV */
+      2140, /* GL_TRANSPOSE_NV */
        801, /* GL_INVERSE_TRANSPOSE_NV */
       1079, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
       1078, /* GL_MAX_PROGRAM_MATRICES_ARB */
@@ -5530,33 +5540,33 @@ static const unsigned reduced_enums[1555] =
        996, /* GL_MATRIX7_NV */
        369, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
        366, /* GL_CURRENT_MATRIX_ARB */
-      1472, /* GL_PROGRAM_POINT_SIZE */
-      2266, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1471, /* GL_PROGRAM_PARAMETER_NV */
-      2251, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1477, /* GL_PROGRAM_TARGET_NV */
-      1474, /* GL_PROGRAM_RESIDENT_NV */
-      2107, /* GL_TRACK_MATRIX_NV */
-      2108, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      2261, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1453, /* GL_PROGRAM_ERROR_POSITION_ARB */
+      1473, /* GL_PROGRAM_POINT_SIZE */
+      2271, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1472, /* GL_PROGRAM_PARAMETER_NV */
+      2256, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1478, /* GL_PROGRAM_TARGET_NV */
+      1475, /* GL_PROGRAM_RESIDENT_NV */
+      2112, /* GL_TRACK_MATRIX_NV */
+      2113, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      2266, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1454, /* GL_PROGRAM_ERROR_POSITION_ARB */
        411, /* GL_DEPTH_CLAMP */
-      2226, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      2233, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      2234, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      2235, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      2236, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      2237, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      2238, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      2239, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      2240, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      2241, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      2227, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      2228, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      2229, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      2230, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      2231, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      2232, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+      2231, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      2238, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      2239, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      2240, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      2241, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      2242, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      2243, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      2244, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      2245, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      2246, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      2232, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      2233, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      2234, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      2235, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      2236, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      2237, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
        908, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
        915, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
        916, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
@@ -5580,7 +5590,7 @@ static const unsigned reduced_enums[1555] =
        945, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
        946, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
        947, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1452, /* GL_PROGRAM_BINDING_ARB */
+      1453, /* GL_PROGRAM_BINDING_ARB */
        949, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
        950, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
        936, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
@@ -5589,66 +5599,66 @@ static const unsigned reduced_enums[1555] =
        939, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
        940, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
        941, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      2008, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      2005, /* GL_TEXTURE_COMPRESSED */
-      1239, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+      2013, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      2010, /* GL_TEXTURE_COMPRESSED */
+      1240, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
        314, /* GL_COMPRESSED_TEXTURE_FORMATS */
-      1138, /* GL_MAX_VERTEX_UNITS_ARB */
+      1139, /* GL_MAX_VERTEX_UNITS_ARB */
         23, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      2289, /* GL_WEIGHT_SUM_UNITY_ARB */
-      2259, /* GL_VERTEX_BLEND_ARB */
+      2294, /* GL_WEIGHT_SUM_UNITY_ARB */
+      2264, /* GL_VERTEX_BLEND_ARB */
        388, /* GL_CURRENT_WEIGHT_ARB */
-      2287, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      2285, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      2283, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      2281, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      2276, /* GL_WEIGHT_ARRAY_ARB */
+      2292, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      2290, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      2288, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      2286, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      2281, /* GL_WEIGHT_ARRAY_ARB */
        445, /* GL_DOT3_RGB */
        446, /* GL_DOT3_RGBA */
        308, /* GL_COMPRESSED_RGB_FXT1_3DFX */
        303, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-      1206, /* GL_MULTISAMPLE_3DFX */
-      1723, /* GL_SAMPLE_BUFFERS_3DFX */
-      1714, /* GL_SAMPLES_3DFX */
-      1186, /* GL_MODELVIEW2_ARB */
-      1189, /* GL_MODELVIEW3_ARB */
-      1190, /* GL_MODELVIEW4_ARB */
-      1191, /* GL_MODELVIEW5_ARB */
-      1192, /* GL_MODELVIEW6_ARB */
-      1193, /* GL_MODELVIEW7_ARB */
-      1194, /* GL_MODELVIEW8_ARB */
-      1195, /* GL_MODELVIEW9_ARB */
-      1165, /* GL_MODELVIEW10_ARB */
-      1166, /* GL_MODELVIEW11_ARB */
-      1167, /* GL_MODELVIEW12_ARB */
-      1168, /* GL_MODELVIEW13_ARB */
-      1169, /* GL_MODELVIEW14_ARB */
-      1170, /* GL_MODELVIEW15_ARB */
-      1171, /* GL_MODELVIEW16_ARB */
-      1172, /* GL_MODELVIEW17_ARB */
-      1173, /* GL_MODELVIEW18_ARB */
-      1174, /* GL_MODELVIEW19_ARB */
-      1176, /* GL_MODELVIEW20_ARB */
-      1177, /* GL_MODELVIEW21_ARB */
-      1178, /* GL_MODELVIEW22_ARB */
-      1179, /* GL_MODELVIEW23_ARB */
-      1180, /* GL_MODELVIEW24_ARB */
-      1181, /* GL_MODELVIEW25_ARB */
-      1182, /* GL_MODELVIEW26_ARB */
-      1183, /* GL_MODELVIEW27_ARB */
-      1184, /* GL_MODELVIEW28_ARB */
-      1185, /* GL_MODELVIEW29_ARB */
-      1187, /* GL_MODELVIEW30_ARB */
-      1188, /* GL_MODELVIEW31_ARB */
+      1207, /* GL_MULTISAMPLE_3DFX */
+      1724, /* GL_SAMPLE_BUFFERS_3DFX */
+      1715, /* GL_SAMPLES_3DFX */
+      1187, /* GL_MODELVIEW2_ARB */
+      1190, /* GL_MODELVIEW3_ARB */
+      1191, /* GL_MODELVIEW4_ARB */
+      1192, /* GL_MODELVIEW5_ARB */
+      1193, /* GL_MODELVIEW6_ARB */
+      1194, /* GL_MODELVIEW7_ARB */
+      1195, /* GL_MODELVIEW8_ARB */
+      1196, /* GL_MODELVIEW9_ARB */
+      1166, /* GL_MODELVIEW10_ARB */
+      1167, /* GL_MODELVIEW11_ARB */
+      1168, /* GL_MODELVIEW12_ARB */
+      1169, /* GL_MODELVIEW13_ARB */
+      1170, /* GL_MODELVIEW14_ARB */
+      1171, /* GL_MODELVIEW15_ARB */
+      1172, /* GL_MODELVIEW16_ARB */
+      1173, /* GL_MODELVIEW17_ARB */
+      1174, /* GL_MODELVIEW18_ARB */
+      1175, /* GL_MODELVIEW19_ARB */
+      1177, /* GL_MODELVIEW20_ARB */
+      1178, /* GL_MODELVIEW21_ARB */
+      1179, /* GL_MODELVIEW22_ARB */
+      1180, /* GL_MODELVIEW23_ARB */
+      1181, /* GL_MODELVIEW24_ARB */
+      1182, /* GL_MODELVIEW25_ARB */
+      1183, /* GL_MODELVIEW26_ARB */
+      1184, /* GL_MODELVIEW27_ARB */
+      1185, /* GL_MODELVIEW28_ARB */
+      1186, /* GL_MODELVIEW29_ARB */
+      1188, /* GL_MODELVIEW30_ARB */
+      1189, /* GL_MODELVIEW31_ARB */
        450, /* GL_DOT3_RGB_EXT */
        448, /* GL_DOT3_RGBA_EXT */
-      1159, /* GL_MIRROR_CLAMP_EXT */
-      1162, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-      1201, /* GL_MODULATE_ADD_ATI */
-      1202, /* GL_MODULATE_SIGNED_ADD_ATI */
-      1203, /* GL_MODULATE_SUBTRACT_ATI */
-      2296, /* GL_YCBCR_MESA */
-      1298, /* GL_PACK_INVERT_MESA */
+      1160, /* GL_MIRROR_CLAMP_EXT */
+      1163, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+      1202, /* GL_MODULATE_ADD_ATI */
+      1203, /* GL_MODULATE_SIGNED_ADD_ATI */
+      1204, /* GL_MODULATE_SUBTRACT_ATI */
+      2301, /* GL_YCBCR_MESA */
+      1299, /* GL_PACK_INVERT_MESA */
        391, /* GL_DEBUG_OBJECT_MESA */
        392, /* GL_DEBUG_PRINT_MESA */
        390, /* GL_DEBUG_ASSERT_MESA */
@@ -5662,30 +5672,30 @@ static const unsigned reduced_enums[1555] =
        509, /* GL_DU8DV8_ATI */
        143, /* GL_BUMP_ENVMAP_ATI */
        147, /* GL_BUMP_TARGET_ATI */
-      1242, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
-      1450, /* GL_PROGRAM_BINARY_FORMATS_OES */
-      1827, /* GL_STENCIL_BACK_FUNC */
-      1825, /* GL_STENCIL_BACK_FAIL */
-      1829, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1831, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+      1243, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
+      1451, /* GL_PROGRAM_BINARY_FORMATS_OES */
+      1828, /* GL_STENCIL_BACK_FUNC */
+      1826, /* GL_STENCIL_BACK_FAIL */
+      1830, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1832, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
        599, /* GL_FRAGMENT_PROGRAM_ARB */
-      1448, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1480, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1479, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1462, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1468, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1467, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+      1449, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1481, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1480, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1463, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1469, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1468, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
       1068, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
       1093, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
       1092, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
       1081, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
       1087, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
       1086, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-      1656, /* GL_RGBA32F */
-      1619, /* GL_RGB32F */
-      1647, /* GL_RGBA16F */
-      1611, /* GL_RGB16F */
-      1675, /* GL_RGBA_FLOAT_MODE_ARB */
+      1657, /* GL_RGBA32F */
+      1620, /* GL_RGB32F */
+      1648, /* GL_RGBA16F */
+      1612, /* GL_RGB16F */
+      1676, /* GL_RGBA_FLOAT_MODE_ARB */
       1037, /* GL_MAX_DRAW_BUFFERS */
        454, /* GL_DRAW_BUFFER0 */
        457, /* GL_DRAW_BUFFER1 */
@@ -5714,75 +5724,75 @@ static const unsigned reduced_enums[1555] =
       1008, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
       1006, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
       1002, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      2043, /* GL_TEXTURE_DEPTH_SIZE */
+      2048, /* GL_TEXTURE_DEPTH_SIZE */
        438, /* GL_DEPTH_TEXTURE_MODE */
-      2000, /* GL_TEXTURE_COMPARE_MODE */
-      1998, /* GL_TEXTURE_COMPARE_FUNC */
+      2005, /* GL_TEXTURE_COMPARE_MODE */
+      2003, /* GL_TEXTURE_COMPARE_FUNC */
        284, /* GL_COMPARE_REF_TO_TEXTURE */
-      1375, /* GL_POINT_SPRITE */
+      1376, /* GL_POINT_SPRITE */
        346, /* GL_COORD_REPLACE */
-      1380, /* GL_POINT_SPRITE_R_MODE_NV */
-      1520, /* GL_QUERY_COUNTER_BITS */
+      1381, /* GL_POINT_SPRITE_R_MODE_NV */
+      1521, /* GL_QUERY_COUNTER_BITS */
        375, /* GL_CURRENT_QUERY */
-      1524, /* GL_QUERY_RESULT */
-      1526, /* GL_QUERY_RESULT_AVAILABLE */
-      1130, /* GL_MAX_VERTEX_ATTRIBS */
-      2249, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+      1525, /* GL_QUERY_RESULT */
+      1527, /* GL_QUERY_RESULT_AVAILABLE */
+      1131, /* GL_MAX_VERTEX_ATTRIBS */
+      2254, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
        436, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
        435, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-      1107, /* GL_MAX_TEXTURE_COORDS */
-      1109, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1455, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1457, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1456, /* GL_PROGRAM_FORMAT_ARB */
-      2099, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+      1108, /* GL_MAX_TEXTURE_COORDS */
+      1110, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1456, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1458, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1457, /* GL_PROGRAM_FORMAT_ARB */
+      2104, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
        408, /* GL_DEPTH_BOUNDS_TEST_EXT */
        407, /* GL_DEPTH_BOUNDS_EXT */
         61, /* GL_ARRAY_BUFFER */
        523, /* GL_ELEMENT_ARRAY_BUFFER */
         62, /* GL_ARRAY_BUFFER_BINDING */
        524, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      2220, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-      1228, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+      2225, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1229, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        190, /* GL_COLOR_ARRAY_BUFFER_BINDING */
        736, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      2013, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+      2018, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
        519, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1735, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+      1736, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
        577, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      2277, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      2242, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1458, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+      2282, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      2247, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1459, /* GL_PROGRAM_INSTRUCTIONS_ARB */
       1074, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1464, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1465, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
       1083, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1478, /* GL_PROGRAM_TEMPORARIES_ARB */
+      1479, /* GL_PROGRAM_TEMPORARIES_ARB */
       1089, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1466, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1467, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
       1085, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1470, /* GL_PROGRAM_PARAMETERS_ARB */
+      1471, /* GL_PROGRAM_PARAMETERS_ARB */
       1088, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1465, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1466, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
       1084, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1449, /* GL_PROGRAM_ATTRIBS_ARB */
+      1450, /* GL_PROGRAM_ATTRIBS_ARB */
       1069, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1463, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1464, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
       1082, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1447, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1448, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
       1067, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1461, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+      1462, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
       1080, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
       1075, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
       1071, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1481, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      2132, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1543, /* GL_READ_ONLY */
-      2291, /* GL_WRITE_ONLY */
-      1545, /* GL_READ_WRITE */
+      1482, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      2137, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1544, /* GL_READ_ONLY */
+      2296, /* GL_WRITE_ONLY */
+      1546, /* GL_READ_WRITE */
        124, /* GL_BUFFER_ACCESS */
        129, /* GL_BUFFER_MAPPED */
        134, /* GL_BUFFER_MAP_POINTER */
-      2106, /* GL_TIME_ELAPSED_EXT */
+      2111, /* GL_TIME_ELAPSED_EXT */
        959, /* GL_MATRIX0_ARB */
        971, /* GL_MATRIX1_ARB */
        983, /* GL_MATRIX2_ARB */
@@ -5815,35 +5825,35 @@ static const unsigned reduced_enums[1555] =
        982, /* GL_MATRIX29_ARB */
        985, /* GL_MATRIX30_ARB */
        986, /* GL_MATRIX31_ARB */
-      1868, /* GL_STREAM_DRAW */
-      1870, /* GL_STREAM_READ */
-      1866, /* GL_STREAM_COPY */
-      1817, /* GL_STATIC_DRAW */
-      1819, /* GL_STATIC_READ */
-      1815, /* GL_STATIC_COPY */
+      1869, /* GL_STREAM_DRAW */
+      1871, /* GL_STREAM_READ */
+      1867, /* GL_STREAM_COPY */
+      1818, /* GL_STATIC_DRAW */
+      1820, /* GL_STATIC_READ */
+      1816, /* GL_STATIC_COPY */
        513, /* GL_DYNAMIC_DRAW */
        515, /* GL_DYNAMIC_READ */
        511, /* GL_DYNAMIC_COPY */
-      1338, /* GL_PIXEL_PACK_BUFFER */
-      1342, /* GL_PIXEL_UNPACK_BUFFER */
-      1339, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1343, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+      1339, /* GL_PIXEL_PACK_BUFFER */
+      1343, /* GL_PIXEL_UNPACK_BUFFER */
+      1340, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1344, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
        399, /* GL_DEPTH24_STENCIL8 */
-      2095, /* GL_TEXTURE_STENCIL_SIZE */
-      2041, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+      2100, /* GL_TEXTURE_STENCIL_SIZE */
+      2046, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
       1070, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
       1073, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
       1077, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
       1076, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-      2247, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
-      2244, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
+      2252, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
+      2249, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
       1016, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
-      1153, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
+      1154, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
       1090, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
-      1859, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      1860, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         18, /* GL_ACTIVE_STENCIL_FACE_EXT */
-      1160, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1716, /* GL_SAMPLES_PASSED */
+      1161, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1717, /* GL_SAMPLES_PASSED */
        692, /* GL_GEOMETRY_VERTICES_OUT */
        686, /* GL_GEOMETRY_INPUT_TYPE */
        688, /* GL_GEOMETRY_OUTPUT_TYPE */
@@ -5851,30 +5861,30 @@ static const unsigned reduced_enums[1555] =
        156, /* GL_CLAMP_FRAGMENT_COLOR_ARB */
        157, /* GL_CLAMP_READ_COLOR */
        549, /* GL_FIXED_ONLY */
-      1362, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
-      1361, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
-      1360, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
-      1197, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
-      1484, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-      2075, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+      1363, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
+      1362, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
+      1361, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
+      1198, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
+      1485, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+      2080, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
        138, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
        128, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-      1560, /* GL_RELEASED_APPLE */
-      2274, /* GL_VOLATILE_APPLE */
-      1599, /* GL_RETAINED_APPLE */
-      2149, /* GL_UNDEFINED_APPLE */
-      1508, /* GL_PURGEABLE_APPLE */
+      1561, /* GL_RELEASED_APPLE */
+      2279, /* GL_VOLATILE_APPLE */
+      1600, /* GL_RETAINED_APPLE */
+      2154, /* GL_UNDEFINED_APPLE */
+      1509, /* GL_PURGEABLE_APPLE */
        600, /* GL_FRAGMENT_SHADER */
-      2269, /* GL_VERTEX_SHADER */
-      1469, /* GL_PROGRAM_OBJECT_ARB */
-      1752, /* GL_SHADER_OBJECT_ARB */
+      2274, /* GL_VERTEX_SHADER */
+      1470, /* GL_PROGRAM_OBJECT_ARB */
+      1753, /* GL_SHADER_OBJECT_ARB */
       1045, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-      1135, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-      1126, /* GL_MAX_VARYING_COMPONENTS */
-      1133, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+      1136, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+      1127, /* GL_MAX_VARYING_COMPONENTS */
+      1134, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
       1028, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1258, /* GL_OBJECT_TYPE_ARB */
-      1754, /* GL_SHADER_TYPE */
+      1259, /* GL_OBJECT_TYPE_ARB */
+      1755, /* GL_SHADER_TYPE */
        565, /* GL_FLOAT_VEC2 */
        567, /* GL_FLOAT_VEC3 */
        569, /* GL_FLOAT_VEC4 */
@@ -5888,14 +5898,14 @@ static const unsigned reduced_enums[1555] =
        553, /* GL_FLOAT_MAT2 */
        557, /* GL_FLOAT_MAT3 */
        561, /* GL_FLOAT_MAT4 */
-      1692, /* GL_SAMPLER_1D */
-      1698, /* GL_SAMPLER_2D */
-      1706, /* GL_SAMPLER_3D */
-      1710, /* GL_SAMPLER_CUBE */
-      1697, /* GL_SAMPLER_1D_SHADOW */
-      1705, /* GL_SAMPLER_2D_SHADOW */
-      1703, /* GL_SAMPLER_2D_RECT */
-      1704, /* GL_SAMPLER_2D_RECT_SHADOW */
+      1693, /* GL_SAMPLER_1D */
+      1699, /* GL_SAMPLER_2D */
+      1707, /* GL_SAMPLER_3D */
+      1711, /* GL_SAMPLER_CUBE */
+      1698, /* GL_SAMPLER_1D_SHADOW */
+      1706, /* GL_SAMPLER_2D_SHADOW */
+      1704, /* GL_SAMPLER_2D_RECT */
+      1705, /* GL_SAMPLER_2D_RECT_SHADOW */
        555, /* GL_FLOAT_MAT2x3 */
        556, /* GL_FLOAT_MAT2x4 */
        559, /* GL_FLOAT_MAT3x2 */
@@ -5905,90 +5915,90 @@ static const unsigned reduced_enums[1555] =
        397, /* GL_DELETE_STATUS */
        289, /* GL_COMPILE_STATUS */
        849, /* GL_LINK_STATUS */
-      2214, /* GL_VALIDATE_STATUS */
+      2219, /* GL_VALIDATE_STATUS */
        748, /* GL_INFO_LOG_LENGTH */
         64, /* GL_ATTACHED_SHADERS */
         21, /* GL_ACTIVE_UNIFORMS */
         22, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1753, /* GL_SHADER_SOURCE_LENGTH */
+      1754, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
        602, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1756, /* GL_SHADING_LANGUAGE_VERSION */
+      1757, /* GL_SHADING_LANGUAGE_VERSION */
        374, /* GL_CURRENT_PROGRAM */
-      1307, /* GL_PALETTE4_RGB8_OES */
-      1309, /* GL_PALETTE4_RGBA8_OES */
-      1305, /* GL_PALETTE4_R5_G6_B5_OES */
-      1308, /* GL_PALETTE4_RGBA4_OES */
-      1306, /* GL_PALETTE4_RGB5_A1_OES */
-      1312, /* GL_PALETTE8_RGB8_OES */
-      1314, /* GL_PALETTE8_RGBA8_OES */
-      1310, /* GL_PALETTE8_R5_G6_B5_OES */
-      1313, /* GL_PALETTE8_RGBA4_OES */
-      1311, /* GL_PALETTE8_RGB5_A1_OES */
+      1308, /* GL_PALETTE4_RGB8_OES */
+      1310, /* GL_PALETTE4_RGBA8_OES */
+      1306, /* GL_PALETTE4_R5_G6_B5_OES */
+      1309, /* GL_PALETTE4_RGBA4_OES */
+      1307, /* GL_PALETTE4_RGB5_A1_OES */
+      1313, /* GL_PALETTE8_RGB8_OES */
+      1315, /* GL_PALETTE8_RGBA8_OES */
+      1311, /* GL_PALETTE8_R5_G6_B5_OES */
+      1314, /* GL_PALETTE8_RGBA4_OES */
+      1312, /* GL_PALETTE8_RGB5_A1_OES */
        729, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
        727, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
-      1359, /* GL_POINT_SIZE_ARRAY_OES */
-      2019, /* GL_TEXTURE_CROP_RECT_OES */
+      1360, /* GL_POINT_SIZE_ARRAY_OES */
+      2024, /* GL_TEXTURE_CROP_RECT_OES */
       1000, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
-      1358, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-      2197, /* GL_UNSIGNED_NORMALIZED */
-      1956, /* GL_TEXTURE_1D_ARRAY */
-      1494, /* GL_PROXY_TEXTURE_1D_ARRAY */
-      1959, /* GL_TEXTURE_2D_ARRAY */
-      1498, /* GL_PROXY_TEXTURE_2D_ARRAY */
-      1967, /* GL_TEXTURE_BINDING_1D_ARRAY */
-      1970, /* GL_TEXTURE_BINDING_2D_ARRAY */
+      1359, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
+      2202, /* GL_UNSIGNED_NORMALIZED */
+      1957, /* GL_TEXTURE_1D_ARRAY */
+      1495, /* GL_PROXY_TEXTURE_1D_ARRAY */
+      1960, /* GL_TEXTURE_2D_ARRAY */
+      1499, /* GL_PROXY_TEXTURE_2D_ARRAY */
+      1968, /* GL_TEXTURE_BINDING_1D_ARRAY */
+      1971, /* GL_TEXTURE_BINDING_2D_ARRAY */
       1052, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
-      1986, /* GL_TEXTURE_BUFFER */
+      1988, /* GL_TEXTURE_BUFFER */
       1106, /* GL_MAX_TEXTURE_BUFFER_SIZE */
-      1974, /* GL_TEXTURE_BINDING_BUFFER */
-      1987, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
-      1988, /* GL_TEXTURE_BUFFER_FORMAT */
-      1531, /* GL_R11F_G11F_B10F */
-      2163, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
-      1642, /* GL_RGB9_E5 */
-      2172, /* GL_UNSIGNED_INT_5_9_9_9_REV */
-      2093, /* GL_TEXTURE_SHARED_SIZE */
-      1809, /* GL_SRGB */
-      1810, /* GL_SRGB8 */
-      1812, /* GL_SRGB_ALPHA */
-      1811, /* GL_SRGB8_ALPHA8 */
-      1769, /* GL_SLUMINANCE_ALPHA */
-      1768, /* GL_SLUMINANCE8_ALPHA8 */
-      1766, /* GL_SLUMINANCE */
-      1767, /* GL_SLUMINANCE8 */
+      1975, /* GL_TEXTURE_BINDING_BUFFER */
+      1990, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
+      1992, /* GL_TEXTURE_BUFFER_FORMAT */
+      1532, /* GL_R11F_G11F_B10F */
+      2168, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
+      1643, /* GL_RGB9_E5 */
+      2177, /* GL_UNSIGNED_INT_5_9_9_9_REV */
+      2098, /* GL_TEXTURE_SHARED_SIZE */
+      1810, /* GL_SRGB */
+      1811, /* GL_SRGB8 */
+      1813, /* GL_SRGB_ALPHA */
+      1812, /* GL_SRGB8_ALPHA8 */
+      1770, /* GL_SLUMINANCE_ALPHA */
+      1769, /* GL_SLUMINANCE8_ALPHA8 */
+      1767, /* GL_SLUMINANCE */
+      1768, /* GL_SLUMINANCE8 */
        312, /* GL_COMPRESSED_SRGB */
        313, /* GL_COMPRESSED_SRGB_ALPHA */
        310, /* GL_COMPRESSED_SLUMINANCE */
        311, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      2128, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
-      2117, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
-      1124, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
-      2126, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
-      2122, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
-      2120, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
-      1441, /* GL_PRIMITIVES_GENERATED */
-      2124, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
-      1535, /* GL_RASTERIZER_DISCARD */
-      1120, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
-      1122, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
+      2133, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
+      2122, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
+      1125, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
+      2131, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
+      2127, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
+      2125, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
+      1442, /* GL_PRIMITIVES_GENERATED */
+      2129, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
+      1536, /* GL_RASTERIZER_DISCARD */
+      1121, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
+      1123, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
        766, /* GL_INTERLEAVED_ATTRIBS */
-      1745, /* GL_SEPARATE_ATTRIBS */
-      2112, /* GL_TRANSFORM_FEEDBACK_BUFFER */
-      2114, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
-      1377, /* GL_POINT_SPRITE_COORD_ORIGIN */
+      1746, /* GL_SEPARATE_ATTRIBS */
+      2117, /* GL_TRANSFORM_FEEDBACK_BUFFER */
+      2119, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
+      1378, /* GL_POINT_SPRITE_COORD_ORIGIN */
        857, /* GL_LOWER_LEFT */
-      2211, /* GL_UPPER_LEFT */
-      1833, /* GL_STENCIL_BACK_REF */
-      1834, /* GL_STENCIL_BACK_VALUE_MASK */
-      1835, /* GL_STENCIL_BACK_WRITEMASK */
+      2216, /* GL_UPPER_LEFT */
+      1834, /* GL_STENCIL_BACK_REF */
+      1835, /* GL_STENCIL_BACK_VALUE_MASK */
+      1836, /* GL_STENCIL_BACK_WRITEMASK */
        503, /* GL_DRAW_FRAMEBUFFER_BINDING */
-      1565, /* GL_RENDERBUFFER_BINDING */
-      1539, /* GL_READ_FRAMEBUFFER */
+      1566, /* GL_RENDERBUFFER_BINDING */
+      1540, /* GL_READ_FRAMEBUFFER */
        502, /* GL_DRAW_FRAMEBUFFER */
-      1540, /* GL_READ_FRAMEBUFFER_BINDING */
-      1584, /* GL_RENDERBUFFER_SAMPLES */
+      1541, /* GL_READ_FRAMEBUFFER_BINDING */
+      1585, /* GL_RENDERBUFFER_SAMPLES */
        616, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
        613, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
        628, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
@@ -6022,87 +6032,87 @@ static const unsigned reduced_enums[1555] =
        208, /* GL_COLOR_ATTACHMENT14 */
        210, /* GL_COLOR_ATTACHMENT15 */
        402, /* GL_DEPTH_ATTACHMENT */
-      1822, /* GL_STENCIL_ATTACHMENT */
+      1823, /* GL_STENCIL_ATTACHMENT */
        604, /* GL_FRAMEBUFFER */
-      1562, /* GL_RENDERBUFFER */
-      1588, /* GL_RENDERBUFFER_WIDTH */
-      1575, /* GL_RENDERBUFFER_HEIGHT */
-      1578, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1854, /* GL_STENCIL_INDEX_EXT */
-      1843, /* GL_STENCIL_INDEX1 */
-      1848, /* GL_STENCIL_INDEX4 */
-      1851, /* GL_STENCIL_INDEX8 */
-      1844, /* GL_STENCIL_INDEX16 */
-      1582, /* GL_RENDERBUFFER_RED_SIZE */
-      1573, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1568, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1563, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1570, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1586, /* GL_RENDERBUFFER_STENCIL_SIZE */
+      1563, /* GL_RENDERBUFFER */
+      1589, /* GL_RENDERBUFFER_WIDTH */
+      1576, /* GL_RENDERBUFFER_HEIGHT */
+      1579, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1855, /* GL_STENCIL_INDEX_EXT */
+      1844, /* GL_STENCIL_INDEX1 */
+      1849, /* GL_STENCIL_INDEX4 */
+      1852, /* GL_STENCIL_INDEX8 */
+      1845, /* GL_STENCIL_INDEX16 */
+      1583, /* GL_RENDERBUFFER_RED_SIZE */
+      1574, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1569, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1564, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1571, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1587, /* GL_RENDERBUFFER_STENCIL_SIZE */
        657, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
       1101, /* GL_MAX_SAMPLES */
-      2055, /* GL_TEXTURE_GEN_STR_OES */
+      2060, /* GL_TEXTURE_GEN_STR_OES */
        703, /* GL_HALF_FLOAT_OES */
-      1629, /* GL_RGB565_OES */
-      1659, /* GL_RGBA32UI */
-      1622, /* GL_RGB32UI */
+      1630, /* GL_RGB565_OES */
+      1660, /* GL_RGBA32UI */
+      1623, /* GL_RGB32UI */
         40, /* GL_ALPHA32UI_EXT */
        758, /* GL_INTENSITY32UI_EXT */
        874, /* GL_LUMINANCE32UI_EXT */
        891, /* GL_LUMINANCE_ALPHA32UI_EXT */
-      1650, /* GL_RGBA16UI */
-      1614, /* GL_RGB16UI */
+      1651, /* GL_RGBA16UI */
+      1615, /* GL_RGB16UI */
         37, /* GL_ALPHA16UI_EXT */
        755, /* GL_INTENSITY16UI_EXT */
        869, /* GL_LUMINANCE16UI_EXT */
        889, /* GL_LUMINANCE_ALPHA16UI_EXT */
-      1669, /* GL_RGBA8UI */
-      1637, /* GL_RGB8UI */
+      1670, /* GL_RGBA8UI */
+      1638, /* GL_RGB8UI */
         45, /* GL_ALPHA8UI_EXT */
        763, /* GL_INTENSITY8UI_EXT */
        883, /* GL_LUMINANCE8UI_EXT */
        893, /* GL_LUMINANCE_ALPHA8UI_EXT */
-      1657, /* GL_RGBA32I */
-      1620, /* GL_RGB32I */
+      1658, /* GL_RGBA32I */
+      1621, /* GL_RGB32I */
         39, /* GL_ALPHA32I_EXT */
        757, /* GL_INTENSITY32I_EXT */
        873, /* GL_LUMINANCE32I_EXT */
        890, /* GL_LUMINANCE_ALPHA32I_EXT */
-      1648, /* GL_RGBA16I */
-      1612, /* GL_RGB16I */
+      1649, /* GL_RGBA16I */
+      1613, /* GL_RGB16I */
         36, /* GL_ALPHA16I_EXT */
        754, /* GL_INTENSITY16I_EXT */
        868, /* GL_LUMINANCE16I_EXT */
        888, /* GL_LUMINANCE_ALPHA16I_EXT */
-      1667, /* GL_RGBA8I */
-      1635, /* GL_RGB8I */
+      1668, /* GL_RGBA8I */
+      1636, /* GL_RGB8I */
         44, /* GL_ALPHA8I_EXT */
        762, /* GL_INTENSITY8I_EXT */
        882, /* GL_LUMINANCE8I_EXT */
        892, /* GL_LUMINANCE_ALPHA8I_EXT */
-      1552, /* GL_RED_INTEGER */
+      1553, /* GL_RED_INTEGER */
        699, /* GL_GREEN_INTEGER */
        113, /* GL_BLUE_INTEGER */
         49, /* GL_ALPHA_INTEGER_EXT */
-      1682, /* GL_RGB_INTEGER */
-      1676, /* GL_RGBA_INTEGER */
+      1683, /* GL_RGB_INTEGER */
+      1677, /* GL_RGBA_INTEGER */
         84, /* GL_BGR_INTEGER */
         82, /* GL_BGRA_INTEGER */
        895, /* GL_LUMINANCE_INTEGER_EXT */
        894, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */
-      1678, /* GL_RGBA_INTEGER_MODE_EXT */
+      1679, /* GL_RGBA_INTEGER_MODE_EXT */
        611, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */
        652, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */
        651, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
-      1693, /* GL_SAMPLER_1D_ARRAY */
-      1699, /* GL_SAMPLER_2D_ARRAY */
-      1708, /* GL_SAMPLER_BUFFER */
-      1695, /* GL_SAMPLER_1D_ARRAY_SHADOW */
-      1701, /* GL_SAMPLER_2D_ARRAY_SHADOW */
-      1711, /* GL_SAMPLER_CUBE_SHADOW */
-      2191, /* GL_UNSIGNED_INT_VEC2 */
-      2193, /* GL_UNSIGNED_INT_VEC3 */
-      2195, /* GL_UNSIGNED_INT_VEC4 */
+      1694, /* GL_SAMPLER_1D_ARRAY */
+      1700, /* GL_SAMPLER_2D_ARRAY */
+      1709, /* GL_SAMPLER_BUFFER */
+      1696, /* GL_SAMPLER_1D_ARRAY_SHADOW */
+      1702, /* GL_SAMPLER_2D_ARRAY_SHADOW */
+      1712, /* GL_SAMPLER_CUBE_SHADOW */
+      2196, /* GL_UNSIGNED_INT_VEC2 */
+      2198, /* GL_UNSIGNED_INT_VEC3 */
+      2200, /* GL_UNSIGNED_INT_VEC4 */
        772, /* GL_INT_SAMPLER_1D */
        776, /* GL_INT_SAMPLER_2D */
        782, /* GL_INT_SAMPLER_3D */
@@ -6111,94 +6121,94 @@ static const unsigned reduced_enums[1555] =
        773, /* GL_INT_SAMPLER_1D_ARRAY */
        777, /* GL_INT_SAMPLER_2D_ARRAY */
        784, /* GL_INT_SAMPLER_BUFFER */
-      2175, /* GL_UNSIGNED_INT_SAMPLER_1D */
-      2179, /* GL_UNSIGNED_INT_SAMPLER_2D */
-      2185, /* GL_UNSIGNED_INT_SAMPLER_3D */
-      2189, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
-      2183, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
-      2176, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
-      2180, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
-      2187, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
+      2180, /* GL_UNSIGNED_INT_SAMPLER_1D */
+      2184, /* GL_UNSIGNED_INT_SAMPLER_2D */
+      2190, /* GL_UNSIGNED_INT_SAMPLER_3D */
+      2194, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
+      2188, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
+      2181, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
+      2185, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
+      2192, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
        690, /* GL_GEOMETRY_SHADER */
        693, /* GL_GEOMETRY_VERTICES_OUT_ARB */
        687, /* GL_GEOMETRY_INPUT_TYPE_ARB */
        689, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
       1058, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
-      1140, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
+      1141, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
       1056, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */
       1050, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */
       1054, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */
        858, /* GL_LOW_FLOAT */
-      1142, /* GL_MEDIUM_FLOAT */
+      1143, /* GL_MEDIUM_FLOAT */
        704, /* GL_HIGH_FLOAT */
        859, /* GL_LOW_INT */
-      1143, /* GL_MEDIUM_INT */
+      1144, /* GL_MEDIUM_INT */
        705, /* GL_HIGH_INT */
-      2165, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+      2170, /* GL_UNSIGNED_INT_10_10_10_2_OES */
        771, /* GL_INT_10_10_10_2_OES */
-      1750, /* GL_SHADER_BINARY_FORMATS */
-      1243, /* GL_NUM_SHADER_BINARY_FORMATS */
-      1751, /* GL_SHADER_COMPILER */
-      1137, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
-      1129, /* GL_MAX_VARYING_VECTORS */
+      1751, /* GL_SHADER_BINARY_FORMATS */
+      1244, /* GL_NUM_SHADER_BINARY_FORMATS */
+      1752, /* GL_SHADER_COMPILER */
+      1138, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
+      1130, /* GL_MAX_VARYING_VECTORS */
       1047, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
-      1528, /* GL_QUERY_WAIT */
-      1522, /* GL_QUERY_NO_WAIT */
-      1518, /* GL_QUERY_BY_REGION_WAIT */
-      1516, /* GL_QUERY_BY_REGION_NO_WAIT */
-      2110, /* GL_TRANSFORM_FEEDBACK */
-      2119, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-      2113, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-      2111, /* GL_TRANSFORM_FEEDBACK_BINDING */
-      1512, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+      1529, /* GL_QUERY_WAIT */
+      1523, /* GL_QUERY_NO_WAIT */
+      1519, /* GL_QUERY_BY_REGION_WAIT */
+      1517, /* GL_QUERY_BY_REGION_NO_WAIT */
+      2115, /* GL_TRANSFORM_FEEDBACK */
+      2124, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+      2118, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+      2116, /* GL_TRANSFORM_FEEDBACK_BINDING */
+      1513, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
        545, /* GL_FIRST_VERTEX_CONVENTION */
        804, /* GL_LAST_VERTEX_CONVENTION */
-      1486, /* GL_PROVOKING_VERTEX */
+      1487, /* GL_PROVOKING_VERTEX */
        353, /* GL_COPY_READ_BUFFER */
        354, /* GL_COPY_WRITE_BUFFER */
-      1555, /* GL_RED_SNORM */
-      1689, /* GL_RG_SNORM */
-      1688, /* GL_RGB_SNORM */
-      1681, /* GL_RGBA_SNORM */
-      1534, /* GL_R8_SNORM */
-      1602, /* GL_RG8_SNORM */
-      1641, /* GL_RGB8_SNORM */
-      1673, /* GL_RGBA8_SNORM */
-      1532, /* GL_R16_SNORM */
-      1601, /* GL_RG16_SNORM */
-      1617, /* GL_RGB16_SNORM */
-      1653, /* GL_RGBA16_SNORM */
-      1762, /* GL_SIGNED_NORMALIZED */
-      1443, /* GL_PRIMITIVE_RESTART */
-      1444, /* GL_PRIMITIVE_RESTART_INDEX */
+      1556, /* GL_RED_SNORM */
+      1690, /* GL_RG_SNORM */
+      1689, /* GL_RGB_SNORM */
+      1682, /* GL_RGBA_SNORM */
+      1535, /* GL_R8_SNORM */
+      1603, /* GL_RG8_SNORM */
+      1642, /* GL_RGB8_SNORM */
+      1674, /* GL_RGBA8_SNORM */
+      1533, /* GL_R16_SNORM */
+      1602, /* GL_RG16_SNORM */
+      1618, /* GL_RGB16_SNORM */
+      1654, /* GL_RGBA16_SNORM */
+      1763, /* GL_SIGNED_NORMALIZED */
+      1444, /* GL_PRIMITIVE_RESTART */
+      1445, /* GL_PRIMITIVE_RESTART_INDEX */
       1103, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-      1257, /* GL_OBJECT_TYPE */
-      1875, /* GL_SYNC_CONDITION */
-      1880, /* GL_SYNC_STATUS */
-      1877, /* GL_SYNC_FLAGS */
-      1876, /* GL_SYNC_FENCE */
-      1879, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-      2158, /* GL_UNSIGNALED */
-      1761, /* GL_SIGNALED */
+      1258, /* GL_OBJECT_TYPE */
+      1876, /* GL_SYNC_CONDITION */
+      1881, /* GL_SYNC_STATUS */
+      1878, /* GL_SYNC_FLAGS */
+      1877, /* GL_SYNC_FENCE */
+      1880, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+      2163, /* GL_UNSIGNALED */
+      1762, /* GL_SIGNALED */
         54, /* GL_ALREADY_SIGNALED */
-      2105, /* GL_TIMEOUT_EXPIRED */
+      2110, /* GL_TIMEOUT_EXPIRED */
        315, /* GL_CONDITION_SATISFIED */
-      2275, /* GL_WAIT_FAILED */
+      2280, /* GL_WAIT_FAILED */
        126, /* GL_BUFFER_ACCESS_FLAGS */
        132, /* GL_BUFFER_MAP_LENGTH */
        133, /* GL_BUFFER_MAP_OFFSET */
-      1132, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
+      1133, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
       1048, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */
       1049, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */
       1044, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */
        329, /* GL_CONTEXT_PROFILE_MASK */
        530, /* GL_EVAL_BIT */
-      1537, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+      1538, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
        851, /* GL_LIST_BIT */
-      1981, /* GL_TEXTURE_BIT */
-      1731, /* GL_SCISSOR_BIT */
+      1983, /* GL_TEXTURE_BIT */
+      1732, /* GL_SCISSOR_BIT */
         30, /* GL_ALL_ATTRIB_BITS */
-      1208, /* GL_MULTISAMPLE_BIT */
+      1209, /* GL_MULTISAMPLE_BIT */
         31, /* GL_ALL_CLIENT_ATTRIB_BITS */
 };
 
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index ce0b3b531..76493f1a8 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -335,7 +335,7 @@ _mesa_set_texture_attachment(struct gl_context *ctx,
    att->Zoffset = zoffset;
    att->Complete = GL_FALSE;
 
-   if (att->Texture->Image[att->CubeMapFace][att->TextureLevel]) {
+   if (_mesa_get_attachment_teximage(att)) {
       ctx->Driver.RenderTexture(ctx, fb, att);
    }
 
@@ -716,8 +716,8 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
       /* get width, height, format of the renderbuffer/texture
        */
       if (att->Type == GL_TEXTURE) {
-         const struct gl_texture_image *texImg
-            = att->Texture->Image[att->CubeMapFace][att->TextureLevel];
+         const struct gl_texture_image *texImg =
+            _mesa_get_attachment_teximage(att);
          minWidth = MIN2(minWidth, texImg->Width);
          maxWidth = MAX2(maxWidth, texImg->Width);
          minHeight = MIN2(minHeight, texImg->Height);
@@ -746,7 +746,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
          continue;
       }
 
-      if (numSamples < 0) {
+      if (att->Renderbuffer && numSamples < 0) {
          /* first buffer */
          numSamples = att->Renderbuffer->NumSamples;
       }
@@ -1496,9 +1496,7 @@ check_begin_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
 
    for (i = 0; i < BUFFER_COUNT; i++) {
       struct gl_renderbuffer_attachment *att = fb->Attachment + i;
-      struct gl_texture_object *texObj = att->Texture;
-      if (texObj
-          && texObj->Image[att->CubeMapFace][att->TextureLevel]) {
+      if (att->Texture && _mesa_get_attachment_teximage(att)) {
          ctx->Driver.RenderTexture(ctx, fb, att);
       }
    }
diff --git a/mesalib/src/mesa/main/fbobject.h b/mesalib/src/mesa/main/fbobject.h
index ba74a95b7..d9b06b9af 100644
--- a/mesalib/src/mesa/main/fbobject.h
+++ b/mesalib/src/mesa/main/fbobject.h
@@ -1,174 +1,195 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2008  Brian Paul   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.
- */
-
-
-#ifndef FBOBJECT_H
-#define FBOBJECT_H
-
-#include "glheader.h"
-
-struct gl_context;
-struct gl_texture_object;
-
-extern void
-_mesa_init_fbobjects(struct gl_context *ctx);
-
-extern struct gl_framebuffer *
-_mesa_get_incomplete_framebuffer(void);
-
-extern struct gl_renderbuffer *
-_mesa_lookup_renderbuffer(struct gl_context *ctx, GLuint id);
-
-extern struct gl_framebuffer *
-_mesa_lookup_framebuffer(struct gl_context *ctx, GLuint id);
-
-extern struct gl_renderbuffer_attachment *
-_mesa_get_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
-                     GLenum attachment);
-
-
-extern void
-_mesa_remove_attachment(struct gl_context *ctx,
-                        struct gl_renderbuffer_attachment *att);
-
-extern void
-_mesa_set_texture_attachment(struct gl_context *ctx,
-                             struct gl_framebuffer *fb,
-                             struct gl_renderbuffer_attachment *att,
-                             struct gl_texture_object *texObj,
-                             GLenum texTarget, GLuint level, GLuint zoffset);
-
-extern void
-_mesa_set_renderbuffer_attachment(struct gl_context *ctx,
-                                  struct gl_renderbuffer_attachment *att,
-                                  struct gl_renderbuffer *rb);
-
-extern void
-_mesa_framebuffer_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
-                               GLenum attachment, struct gl_renderbuffer *rb);
-
-extern void
-_mesa_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb);
-
-extern void
-_mesa_test_framebuffer_completeness(struct gl_context *ctx, struct gl_framebuffer *fb);
-
-extern GLboolean
-_mesa_is_legal_color_format(const struct gl_context *ctx, GLenum baseFormat);
-
-extern GLenum
-_mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsRenderbufferEXT(GLuint renderbuffer);
-
-extern void GLAPIENTRY
-_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer);
-
-extern void GLAPIENTRY
-_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers);
-
-extern void GLAPIENTRY
-_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers);
-
-extern void GLAPIENTRY
-_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalformat,
-                             GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
-                                     GLenum internalformat,
-                                     GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
-			   GLsizei width, GLsizei height);
-
-extern void GLAPIENTRY
-_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image);
-
-extern void GLAPIENTRY
-_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname,
-                                    GLint *params);
-
-extern GLboolean GLAPIENTRY
-_mesa_IsFramebufferEXT(GLuint framebuffer);
-
-extern void GLAPIENTRY
-_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer);
-
-extern void GLAPIENTRY
-_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers);
-
-extern void GLAPIENTRY
-_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers);
-
-extern GLenum GLAPIENTRY
-_mesa_CheckFramebufferStatusEXT(GLenum target);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
-                              GLenum textarget, GLuint texture, GLint level);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
-                              GLenum textarget, GLuint texture, GLint level);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
-                              GLenum textarget, GLuint texture,
-                              GLint level, GLint zoffset);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment,
-                                 GLuint texture, GLint level, GLint layer);
-
-extern void GLAPIENTRY
-_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
-                                 GLenum renderbuffertarget,
-                                 GLuint renderbuffer);
-
-extern void GLAPIENTRY
-_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
-                                             GLenum pname, GLint *params);
-
-extern void GLAPIENTRY
-_mesa_GenerateMipmapEXT(GLenum target);
-
-
-extern void GLAPIENTRY
-_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
-                         GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
-                         GLbitfield mask, GLenum filter);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTextureARB(GLenum target, GLenum attachment,
-                            GLuint texture, GLint level);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTextureFaceARB(GLenum target, GLenum attachment,
-                                GLuint texture, GLint level, GLenum face);
-
-
-#endif /* FBOBJECT_H */
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   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.
+ */
+
+
+#ifndef FBOBJECT_H
+#define FBOBJECT_H
+
+#include "compiler.h"
+#include "glheader.h"
+
+struct gl_context;
+struct gl_texture_object;
+
+extern void
+_mesa_init_fbobjects(struct gl_context *ctx);
+
+extern struct gl_framebuffer *
+_mesa_get_incomplete_framebuffer(void);
+
+extern struct gl_renderbuffer *
+_mesa_lookup_renderbuffer(struct gl_context *ctx, GLuint id);
+
+extern struct gl_framebuffer *
+_mesa_lookup_framebuffer(struct gl_context *ctx, GLuint id);
+
+extern struct gl_renderbuffer_attachment *
+_mesa_get_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
+                     GLenum attachment);
+
+
+/** Return the texture image for a renderbuffer attachment */
+static INLINE struct gl_texture_image *
+_mesa_get_attachment_teximage(struct gl_renderbuffer_attachment *att)
+{
+   assert(att->Type == GL_TEXTURE);
+   return att->Texture->Image[att->CubeMapFace][att->TextureLevel];
+}
+
+
+/** Return the (const) texture image for a renderbuffer attachment */
+static INLINE const struct gl_texture_image *
+_mesa_get_attachment_teximage_const(const struct gl_renderbuffer_attachment *att)
+{
+   assert(att->Type == GL_TEXTURE);
+   return att->Texture->Image[att->CubeMapFace][att->TextureLevel];
+}
+
+
+extern void
+_mesa_remove_attachment(struct gl_context *ctx,
+                        struct gl_renderbuffer_attachment *att);
+
+extern void
+_mesa_set_texture_attachment(struct gl_context *ctx,
+                             struct gl_framebuffer *fb,
+                             struct gl_renderbuffer_attachment *att,
+                             struct gl_texture_object *texObj,
+                             GLenum texTarget, GLuint level, GLuint zoffset);
+
+extern void
+_mesa_set_renderbuffer_attachment(struct gl_context *ctx,
+                                  struct gl_renderbuffer_attachment *att,
+                                  struct gl_renderbuffer *rb);
+
+extern void
+_mesa_framebuffer_renderbuffer(struct gl_context *ctx,
+                               struct gl_framebuffer *fb,
+                               GLenum attachment, struct gl_renderbuffer *rb);
+
+extern void
+_mesa_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb);
+
+extern void
+_mesa_test_framebuffer_completeness(struct gl_context *ctx,
+                                    struct gl_framebuffer *fb);
+
+extern GLboolean
+_mesa_is_legal_color_format(const struct gl_context *ctx, GLenum baseFormat);
+
+extern GLenum
+_mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat);
+
+extern GLboolean GLAPIENTRY
+_mesa_IsRenderbufferEXT(GLuint renderbuffer);
+
+extern void GLAPIENTRY
+_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer);
+
+extern void GLAPIENTRY
+_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers);
+
+extern void GLAPIENTRY
+_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers);
+
+extern void GLAPIENTRY
+_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalformat,
+                             GLsizei width, GLsizei height);
+
+extern void GLAPIENTRY
+_mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
+                                     GLenum internalformat,
+                                     GLsizei width, GLsizei height);
+
+extern void GLAPIENTRY
+_es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
+			   GLsizei width, GLsizei height);
+
+extern void GLAPIENTRY
+_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image);
+
+extern void GLAPIENTRY
+_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname,
+                                    GLint *params);
+
+extern GLboolean GLAPIENTRY
+_mesa_IsFramebufferEXT(GLuint framebuffer);
+
+extern void GLAPIENTRY
+_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer);
+
+extern void GLAPIENTRY
+_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers);
+
+extern void GLAPIENTRY
+_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers);
+
+extern GLenum GLAPIENTRY
+_mesa_CheckFramebufferStatusEXT(GLenum target);
+
+extern void GLAPIENTRY
+_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
+                              GLenum textarget, GLuint texture, GLint level);
+
+extern void GLAPIENTRY
+_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
+                              GLenum textarget, GLuint texture, GLint level);
+
+extern void GLAPIENTRY
+_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
+                              GLenum textarget, GLuint texture,
+                              GLint level, GLint zoffset);
+
+extern void GLAPIENTRY
+_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment,
+                                 GLuint texture, GLint level, GLint layer);
+
+extern void GLAPIENTRY
+_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
+                                 GLenum renderbuffertarget,
+                                 GLuint renderbuffer);
+
+extern void GLAPIENTRY
+_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
+                                             GLenum pname, GLint *params);
+
+extern void GLAPIENTRY
+_mesa_GenerateMipmapEXT(GLenum target);
+
+
+extern void GLAPIENTRY
+_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
+                         GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
+                         GLbitfield mask, GLenum filter);
+
+extern void GLAPIENTRY
+_mesa_FramebufferTextureARB(GLenum target, GLenum attachment,
+                            GLuint texture, GLint level);
+
+extern void GLAPIENTRY
+_mesa_FramebufferTextureFaceARB(GLenum target, GLenum attachment,
+                                GLuint texture, GLint level, GLenum face);
+
+
+#endif /* FBOBJECT_H */
diff --git a/mesalib/src/mesa/main/framebuffer.c b/mesalib/src/mesa/main/framebuffer.c
index 30af04c48..b741c51ab 100644
--- a/mesalib/src/mesa/main/framebuffer.c
+++ b/mesalib/src/mesa/main/framebuffer.c
@@ -1061,12 +1061,12 @@ _mesa_print_framebuffer(const struct gl_framebuffer *fb)
    for (i = 0; i < BUFFER_COUNT; i++) {
       const struct gl_renderbuffer_attachment *att = &fb->Attachment[i];
       if (att->Type == GL_TEXTURE) {
-         const struct gl_texture_image *texImage;
+         const struct gl_texture_image *texImage =
+            _mesa_get_attachment_teximage_const(att);
          fprintf(stderr,
                  "  %2d: Texture %u, level %u, face %u, slice %u, complete %d\n",
                  i, att->Texture->Name, att->TextureLevel, att->CubeMapFace,
                  att->Zoffset, att->Complete);
-         texImage = att->Texture->Image[att->CubeMapFace][att->TextureLevel];
          fprintf(stderr, "       Size: %u x %u x %u  Format %s\n",
                  texImage->Width, texImage->Height, texImage->Depth,
                  _mesa_get_format_name(texImage->TexFormat));
diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index 65a826b9e..eec22fc3f 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -323,6 +323,7 @@ EXTRA_EXT(ARB_vertex_buffer_object);
 EXTRA_EXT(ARB_geometry_shader4);
 EXTRA_EXT(ARB_copy_buffer);
 EXTRA_EXT(EXT_framebuffer_sRGB);
+EXTRA_EXT(ARB_texture_buffer_object);
 
 static const int
 extra_ARB_vertex_program_ARB_fragment_program_NV_vertex_program[] = {
@@ -1236,6 +1237,18 @@ static const struct value_desc values[] = {
      CONTEXT_INT(Const.MaxProgramTexelOffset),
      extra_EXT_gpu_shader4 },
 
+   /* GL_ARB_texture_buffer_object */
+   { GL_MAX_TEXTURE_BUFFER_SIZE_ARB, CONTEXT_INT(Const.MaxTextureBufferSize),
+     extra_ARB_texture_buffer_object },
+   { GL_TEXTURE_BINDING_BUFFER_ARB, LOC_CUSTOM, TYPE_INT, 0,
+     extra_ARB_texture_buffer_object },
+   { GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
+     TEXTURE_BUFFER_INDEX, extra_ARB_texture_buffer_object },
+   { GL_TEXTURE_BUFFER_FORMAT_ARB, LOC_CUSTOM, TYPE_INT, 0,
+     extra_ARB_texture_buffer_object },
+   { GL_TEXTURE_BUFFER_ARB, LOC_CUSTOM, TYPE_INT, 0,
+     extra_ARB_texture_buffer_object },
+
    /* GL 3.0 */
    { GL_NUM_EXTENSIONS, LOC_CUSTOM, TYPE_INT, 0, extra_version_30 },
    { GL_MAJOR_VERSION, CONTEXT_INT(VersionMajor), extra_version_30 },
@@ -1673,6 +1686,29 @@ find_custom_value(struct gl_context *ctx, const struct value_desc *d, union valu
    case GL_MAX_FRAGMENT_UNIFORM_VECTORS:
       v->value_int = ctx->Const.FragmentProgram.MaxUniformComponents / 4;
       break;
+
+   /* GL_ARB_texture_buffer_object */
+   case GL_TEXTURE_BUFFER_ARB:
+      v->value_int = ctx->Texture.BufferObject->Name;
+      break;
+   case GL_TEXTURE_BINDING_BUFFER_ARB:
+      unit = ctx->Texture.CurrentUnit;
+      v->value_int =
+         ctx->Texture.Unit[unit].CurrentTex[TEXTURE_BUFFER_INDEX]->Name;
+      break;
+   case GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB:
+      {
+         struct gl_buffer_object *buf =
+            ctx->Texture.Unit[ctx->Texture.CurrentUnit]
+            .CurrentTex[TEXTURE_BUFFER_INDEX]->BufferObject;
+         v->value_int = buf ? buf->Name : 0;
+      }
+      break;
+   case GL_TEXTURE_BUFFER_FORMAT_ARB:
+      v->value_int = ctx->Texture.Unit[ctx->Texture.CurrentUnit]
+         .CurrentTex[TEXTURE_BUFFER_INDEX]->BufferObjectFormat;
+      break;
+
    }   
 }
 
diff --git a/mesalib/src/mesa/main/glapidispatch.h b/mesalib/src/mesa/main/glapidispatch.h
index 87813c794..477f56a37 100644
--- a/mesalib/src/mesa/main/glapidispatch.h
+++ b/mesalib/src/mesa/main/glapidispatch.h
@@ -59,7 +59,7 @@
     } while(0)
 
 /* total number of offsets below */
-#define _gloffset_COUNT 893
+#define _gloffset_COUNT 894
 
 #define _gloffset_NewList 0
 #define _gloffset_EndList 1
@@ -646,321 +646,322 @@
 #define _gloffset_VertexAttribDivisorARB 579
 #define _gloffset_FlushMappedBufferRange 580
 #define _gloffset_MapBufferRange 581
-#define _gloffset_BindVertexArray 582
-#define _gloffset_GenVertexArrays 583
-#define _gloffset_CopyBufferSubData 584
-#define _gloffset_ClientWaitSync 585
-#define _gloffset_DeleteSync 586
-#define _gloffset_FenceSync 587
-#define _gloffset_GetInteger64v 588
-#define _gloffset_GetSynciv 589
-#define _gloffset_IsSync 590
-#define _gloffset_WaitSync 591
-#define _gloffset_DrawElementsBaseVertex 592
-#define _gloffset_DrawRangeElementsBaseVertex 593
-#define _gloffset_MultiDrawElementsBaseVertex 594
-#define _gloffset_BlendEquationSeparateiARB 595
-#define _gloffset_BlendEquationiARB 596
-#define _gloffset_BlendFuncSeparateiARB 597
-#define _gloffset_BlendFunciARB 598
-#define _gloffset_BindTransformFeedback 599
-#define _gloffset_DeleteTransformFeedbacks 600
-#define _gloffset_DrawTransformFeedback 601
-#define _gloffset_GenTransformFeedbacks 602
-#define _gloffset_IsTransformFeedback 603
-#define _gloffset_PauseTransformFeedback 604
-#define _gloffset_ResumeTransformFeedback 605
-#define _gloffset_ClearDepthf 606
-#define _gloffset_DepthRangef 607
-#define _gloffset_GetShaderPrecisionFormat 608
-#define _gloffset_ReleaseShaderCompiler 609
-#define _gloffset_ShaderBinary 610
-#define _gloffset_PolygonOffsetEXT 611
-#define _gloffset_GetPixelTexGenParameterfvSGIS 612
-#define _gloffset_GetPixelTexGenParameterivSGIS 613
-#define _gloffset_PixelTexGenParameterfSGIS 614
-#define _gloffset_PixelTexGenParameterfvSGIS 615
-#define _gloffset_PixelTexGenParameteriSGIS 616
-#define _gloffset_PixelTexGenParameterivSGIS 617
-#define _gloffset_SampleMaskSGIS 618
-#define _gloffset_SamplePatternSGIS 619
-#define _gloffset_ColorPointerEXT 620
-#define _gloffset_EdgeFlagPointerEXT 621
-#define _gloffset_IndexPointerEXT 622
-#define _gloffset_NormalPointerEXT 623
-#define _gloffset_TexCoordPointerEXT 624
-#define _gloffset_VertexPointerEXT 625
-#define _gloffset_PointParameterfEXT 626
-#define _gloffset_PointParameterfvEXT 627
-#define _gloffset_LockArraysEXT 628
-#define _gloffset_UnlockArraysEXT 629
-#define _gloffset_SecondaryColor3bEXT 630
-#define _gloffset_SecondaryColor3bvEXT 631
-#define _gloffset_SecondaryColor3dEXT 632
-#define _gloffset_SecondaryColor3dvEXT 633
-#define _gloffset_SecondaryColor3fEXT 634
-#define _gloffset_SecondaryColor3fvEXT 635
-#define _gloffset_SecondaryColor3iEXT 636
-#define _gloffset_SecondaryColor3ivEXT 637
-#define _gloffset_SecondaryColor3sEXT 638
-#define _gloffset_SecondaryColor3svEXT 639
-#define _gloffset_SecondaryColor3ubEXT 640
-#define _gloffset_SecondaryColor3ubvEXT 641
-#define _gloffset_SecondaryColor3uiEXT 642
-#define _gloffset_SecondaryColor3uivEXT 643
-#define _gloffset_SecondaryColor3usEXT 644
-#define _gloffset_SecondaryColor3usvEXT 645
-#define _gloffset_SecondaryColorPointerEXT 646
-#define _gloffset_MultiDrawArraysEXT 647
-#define _gloffset_MultiDrawElementsEXT 648
-#define _gloffset_FogCoordPointerEXT 649
-#define _gloffset_FogCoorddEXT 650
-#define _gloffset_FogCoorddvEXT 651
-#define _gloffset_FogCoordfEXT 652
-#define _gloffset_FogCoordfvEXT 653
-#define _gloffset_PixelTexGenSGIX 654
-#define _gloffset_BlendFuncSeparateEXT 655
-#define _gloffset_FlushVertexArrayRangeNV 656
-#define _gloffset_VertexArrayRangeNV 657
-#define _gloffset_CombinerInputNV 658
-#define _gloffset_CombinerOutputNV 659
-#define _gloffset_CombinerParameterfNV 660
-#define _gloffset_CombinerParameterfvNV 661
-#define _gloffset_CombinerParameteriNV 662
-#define _gloffset_CombinerParameterivNV 663
-#define _gloffset_FinalCombinerInputNV 664
-#define _gloffset_GetCombinerInputParameterfvNV 665
-#define _gloffset_GetCombinerInputParameterivNV 666
-#define _gloffset_GetCombinerOutputParameterfvNV 667
-#define _gloffset_GetCombinerOutputParameterivNV 668
-#define _gloffset_GetFinalCombinerInputParameterfvNV 669
-#define _gloffset_GetFinalCombinerInputParameterivNV 670
-#define _gloffset_ResizeBuffersMESA 671
-#define _gloffset_WindowPos2dMESA 672
-#define _gloffset_WindowPos2dvMESA 673
-#define _gloffset_WindowPos2fMESA 674
-#define _gloffset_WindowPos2fvMESA 675
-#define _gloffset_WindowPos2iMESA 676
-#define _gloffset_WindowPos2ivMESA 677
-#define _gloffset_WindowPos2sMESA 678
-#define _gloffset_WindowPos2svMESA 679
-#define _gloffset_WindowPos3dMESA 680
-#define _gloffset_WindowPos3dvMESA 681
-#define _gloffset_WindowPos3fMESA 682
-#define _gloffset_WindowPos3fvMESA 683
-#define _gloffset_WindowPos3iMESA 684
-#define _gloffset_WindowPos3ivMESA 685
-#define _gloffset_WindowPos3sMESA 686
-#define _gloffset_WindowPos3svMESA 687
-#define _gloffset_WindowPos4dMESA 688
-#define _gloffset_WindowPos4dvMESA 689
-#define _gloffset_WindowPos4fMESA 690
-#define _gloffset_WindowPos4fvMESA 691
-#define _gloffset_WindowPos4iMESA 692
-#define _gloffset_WindowPos4ivMESA 693
-#define _gloffset_WindowPos4sMESA 694
-#define _gloffset_WindowPos4svMESA 695
-#define _gloffset_MultiModeDrawArraysIBM 696
-#define _gloffset_MultiModeDrawElementsIBM 697
-#define _gloffset_DeleteFencesNV 698
-#define _gloffset_FinishFenceNV 699
-#define _gloffset_GenFencesNV 700
-#define _gloffset_GetFenceivNV 701
-#define _gloffset_IsFenceNV 702
-#define _gloffset_SetFenceNV 703
-#define _gloffset_TestFenceNV 704
-#define _gloffset_AreProgramsResidentNV 705
-#define _gloffset_BindProgramNV 706
-#define _gloffset_DeleteProgramsNV 707
-#define _gloffset_ExecuteProgramNV 708
-#define _gloffset_GenProgramsNV 709
-#define _gloffset_GetProgramParameterdvNV 710
-#define _gloffset_GetProgramParameterfvNV 711
-#define _gloffset_GetProgramStringNV 712
-#define _gloffset_GetProgramivNV 713
-#define _gloffset_GetTrackMatrixivNV 714
-#define _gloffset_GetVertexAttribPointervNV 715
-#define _gloffset_GetVertexAttribdvNV 716
-#define _gloffset_GetVertexAttribfvNV 717
-#define _gloffset_GetVertexAttribivNV 718
-#define _gloffset_IsProgramNV 719
-#define _gloffset_LoadProgramNV 720
-#define _gloffset_ProgramParameters4dvNV 721
-#define _gloffset_ProgramParameters4fvNV 722
-#define _gloffset_RequestResidentProgramsNV 723
-#define _gloffset_TrackMatrixNV 724
-#define _gloffset_VertexAttrib1dNV 725
-#define _gloffset_VertexAttrib1dvNV 726
-#define _gloffset_VertexAttrib1fNV 727
-#define _gloffset_VertexAttrib1fvNV 728
-#define _gloffset_VertexAttrib1sNV 729
-#define _gloffset_VertexAttrib1svNV 730
-#define _gloffset_VertexAttrib2dNV 731
-#define _gloffset_VertexAttrib2dvNV 732
-#define _gloffset_VertexAttrib2fNV 733
-#define _gloffset_VertexAttrib2fvNV 734
-#define _gloffset_VertexAttrib2sNV 735
-#define _gloffset_VertexAttrib2svNV 736
-#define _gloffset_VertexAttrib3dNV 737
-#define _gloffset_VertexAttrib3dvNV 738
-#define _gloffset_VertexAttrib3fNV 739
-#define _gloffset_VertexAttrib3fvNV 740
-#define _gloffset_VertexAttrib3sNV 741
-#define _gloffset_VertexAttrib3svNV 742
-#define _gloffset_VertexAttrib4dNV 743
-#define _gloffset_VertexAttrib4dvNV 744
-#define _gloffset_VertexAttrib4fNV 745
-#define _gloffset_VertexAttrib4fvNV 746
-#define _gloffset_VertexAttrib4sNV 747
-#define _gloffset_VertexAttrib4svNV 748
-#define _gloffset_VertexAttrib4ubNV 749
-#define _gloffset_VertexAttrib4ubvNV 750
-#define _gloffset_VertexAttribPointerNV 751
-#define _gloffset_VertexAttribs1dvNV 752
-#define _gloffset_VertexAttribs1fvNV 753
-#define _gloffset_VertexAttribs1svNV 754
-#define _gloffset_VertexAttribs2dvNV 755
-#define _gloffset_VertexAttribs2fvNV 756
-#define _gloffset_VertexAttribs2svNV 757
-#define _gloffset_VertexAttribs3dvNV 758
-#define _gloffset_VertexAttribs3fvNV 759
-#define _gloffset_VertexAttribs3svNV 760
-#define _gloffset_VertexAttribs4dvNV 761
-#define _gloffset_VertexAttribs4fvNV 762
-#define _gloffset_VertexAttribs4svNV 763
-#define _gloffset_VertexAttribs4ubvNV 764
-#define _gloffset_GetTexBumpParameterfvATI 765
-#define _gloffset_GetTexBumpParameterivATI 766
-#define _gloffset_TexBumpParameterfvATI 767
-#define _gloffset_TexBumpParameterivATI 768
-#define _gloffset_AlphaFragmentOp1ATI 769
-#define _gloffset_AlphaFragmentOp2ATI 770
-#define _gloffset_AlphaFragmentOp3ATI 771
-#define _gloffset_BeginFragmentShaderATI 772
-#define _gloffset_BindFragmentShaderATI 773
-#define _gloffset_ColorFragmentOp1ATI 774
-#define _gloffset_ColorFragmentOp2ATI 775
-#define _gloffset_ColorFragmentOp3ATI 776
-#define _gloffset_DeleteFragmentShaderATI 777
-#define _gloffset_EndFragmentShaderATI 778
-#define _gloffset_GenFragmentShadersATI 779
-#define _gloffset_PassTexCoordATI 780
-#define _gloffset_SampleMapATI 781
-#define _gloffset_SetFragmentShaderConstantATI 782
-#define _gloffset_PointParameteriNV 783
-#define _gloffset_PointParameterivNV 784
-#define _gloffset_ActiveStencilFaceEXT 785
-#define _gloffset_BindVertexArrayAPPLE 786
-#define _gloffset_DeleteVertexArraysAPPLE 787
-#define _gloffset_GenVertexArraysAPPLE 788
-#define _gloffset_IsVertexArrayAPPLE 789
-#define _gloffset_GetProgramNamedParameterdvNV 790
-#define _gloffset_GetProgramNamedParameterfvNV 791
-#define _gloffset_ProgramNamedParameter4dNV 792
-#define _gloffset_ProgramNamedParameter4dvNV 793
-#define _gloffset_ProgramNamedParameter4fNV 794
-#define _gloffset_ProgramNamedParameter4fvNV 795
-#define _gloffset_PrimitiveRestartIndexNV 796
-#define _gloffset_PrimitiveRestartNV 797
-#define _gloffset_DepthBoundsEXT 798
-#define _gloffset_BlendEquationSeparateEXT 799
-#define _gloffset_BindFramebufferEXT 800
-#define _gloffset_BindRenderbufferEXT 801
-#define _gloffset_CheckFramebufferStatusEXT 802
-#define _gloffset_DeleteFramebuffersEXT 803
-#define _gloffset_DeleteRenderbuffersEXT 804
-#define _gloffset_FramebufferRenderbufferEXT 805
-#define _gloffset_FramebufferTexture1DEXT 806
-#define _gloffset_FramebufferTexture2DEXT 807
-#define _gloffset_FramebufferTexture3DEXT 808
-#define _gloffset_GenFramebuffersEXT 809
-#define _gloffset_GenRenderbuffersEXT 810
-#define _gloffset_GenerateMipmapEXT 811
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 812
-#define _gloffset_GetRenderbufferParameterivEXT 813
-#define _gloffset_IsFramebufferEXT 814
-#define _gloffset_IsRenderbufferEXT 815
-#define _gloffset_RenderbufferStorageEXT 816
-#define _gloffset_BlitFramebufferEXT 817
-#define _gloffset_BufferParameteriAPPLE 818
-#define _gloffset_FlushMappedBufferRangeAPPLE 819
-#define _gloffset_BindFragDataLocationEXT 820
-#define _gloffset_GetFragDataLocationEXT 821
-#define _gloffset_GetUniformuivEXT 822
-#define _gloffset_GetVertexAttribIivEXT 823
-#define _gloffset_GetVertexAttribIuivEXT 824
-#define _gloffset_Uniform1uiEXT 825
-#define _gloffset_Uniform1uivEXT 826
-#define _gloffset_Uniform2uiEXT 827
-#define _gloffset_Uniform2uivEXT 828
-#define _gloffset_Uniform3uiEXT 829
-#define _gloffset_Uniform3uivEXT 830
-#define _gloffset_Uniform4uiEXT 831
-#define _gloffset_Uniform4uivEXT 832
-#define _gloffset_VertexAttribI1iEXT 833
-#define _gloffset_VertexAttribI1ivEXT 834
-#define _gloffset_VertexAttribI1uiEXT 835
-#define _gloffset_VertexAttribI1uivEXT 836
-#define _gloffset_VertexAttribI2iEXT 837
-#define _gloffset_VertexAttribI2ivEXT 838
-#define _gloffset_VertexAttribI2uiEXT 839
-#define _gloffset_VertexAttribI2uivEXT 840
-#define _gloffset_VertexAttribI3iEXT 841
-#define _gloffset_VertexAttribI3ivEXT 842
-#define _gloffset_VertexAttribI3uiEXT 843
-#define _gloffset_VertexAttribI3uivEXT 844
-#define _gloffset_VertexAttribI4bvEXT 845
-#define _gloffset_VertexAttribI4iEXT 846
-#define _gloffset_VertexAttribI4ivEXT 847
-#define _gloffset_VertexAttribI4svEXT 848
-#define _gloffset_VertexAttribI4ubvEXT 849
-#define _gloffset_VertexAttribI4uiEXT 850
-#define _gloffset_VertexAttribI4uivEXT 851
-#define _gloffset_VertexAttribI4usvEXT 852
-#define _gloffset_VertexAttribIPointerEXT 853
-#define _gloffset_FramebufferTextureLayerEXT 854
-#define _gloffset_ColorMaskIndexedEXT 855
-#define _gloffset_DisableIndexedEXT 856
-#define _gloffset_EnableIndexedEXT 857
-#define _gloffset_GetBooleanIndexedvEXT 858
-#define _gloffset_GetIntegerIndexedvEXT 859
-#define _gloffset_IsEnabledIndexedEXT 860
-#define _gloffset_ClearColorIiEXT 861
-#define _gloffset_ClearColorIuiEXT 862
-#define _gloffset_GetTexParameterIivEXT 863
-#define _gloffset_GetTexParameterIuivEXT 864
-#define _gloffset_TexParameterIivEXT 865
-#define _gloffset_TexParameterIuivEXT 866
-#define _gloffset_BeginConditionalRenderNV 867
-#define _gloffset_EndConditionalRenderNV 868
-#define _gloffset_BeginTransformFeedbackEXT 869
-#define _gloffset_BindBufferBaseEXT 870
-#define _gloffset_BindBufferOffsetEXT 871
-#define _gloffset_BindBufferRangeEXT 872
-#define _gloffset_EndTransformFeedbackEXT 873
-#define _gloffset_GetTransformFeedbackVaryingEXT 874
-#define _gloffset_TransformFeedbackVaryingsEXT 875
-#define _gloffset_ProvokingVertexEXT 876
-#define _gloffset_GetTexParameterPointervAPPLE 877
-#define _gloffset_TextureRangeAPPLE 878
-#define _gloffset_GetObjectParameterivAPPLE 879
-#define _gloffset_ObjectPurgeableAPPLE 880
-#define _gloffset_ObjectUnpurgeableAPPLE 881
-#define _gloffset_ActiveProgramEXT 882
-#define _gloffset_CreateShaderProgramEXT 883
-#define _gloffset_UseShaderProgramEXT 884
-#define _gloffset_TextureBarrierNV 885
-#define _gloffset_StencilFuncSeparateATI 886
-#define _gloffset_ProgramEnvParameters4fvEXT 887
-#define _gloffset_ProgramLocalParameters4fvEXT 888
-#define _gloffset_GetQueryObjecti64vEXT 889
-#define _gloffset_GetQueryObjectui64vEXT 890
-#define _gloffset_EGLImageTargetRenderbufferStorageOES 891
-#define _gloffset_EGLImageTargetTexture2DOES 892
+#define _gloffset_TexBufferARB 582
+#define _gloffset_BindVertexArray 583
+#define _gloffset_GenVertexArrays 584
+#define _gloffset_CopyBufferSubData 585
+#define _gloffset_ClientWaitSync 586
+#define _gloffset_DeleteSync 587
+#define _gloffset_FenceSync 588
+#define _gloffset_GetInteger64v 589
+#define _gloffset_GetSynciv 590
+#define _gloffset_IsSync 591
+#define _gloffset_WaitSync 592
+#define _gloffset_DrawElementsBaseVertex 593
+#define _gloffset_DrawRangeElementsBaseVertex 594
+#define _gloffset_MultiDrawElementsBaseVertex 595
+#define _gloffset_BlendEquationSeparateiARB 596
+#define _gloffset_BlendEquationiARB 597
+#define _gloffset_BlendFuncSeparateiARB 598
+#define _gloffset_BlendFunciARB 599
+#define _gloffset_BindTransformFeedback 600
+#define _gloffset_DeleteTransformFeedbacks 601
+#define _gloffset_DrawTransformFeedback 602
+#define _gloffset_GenTransformFeedbacks 603
+#define _gloffset_IsTransformFeedback 604
+#define _gloffset_PauseTransformFeedback 605
+#define _gloffset_ResumeTransformFeedback 606
+#define _gloffset_ClearDepthf 607
+#define _gloffset_DepthRangef 608
+#define _gloffset_GetShaderPrecisionFormat 609
+#define _gloffset_ReleaseShaderCompiler 610
+#define _gloffset_ShaderBinary 611
+#define _gloffset_PolygonOffsetEXT 612
+#define _gloffset_GetPixelTexGenParameterfvSGIS 613
+#define _gloffset_GetPixelTexGenParameterivSGIS 614
+#define _gloffset_PixelTexGenParameterfSGIS 615
+#define _gloffset_PixelTexGenParameterfvSGIS 616
+#define _gloffset_PixelTexGenParameteriSGIS 617
+#define _gloffset_PixelTexGenParameterivSGIS 618
+#define _gloffset_SampleMaskSGIS 619
+#define _gloffset_SamplePatternSGIS 620
+#define _gloffset_ColorPointerEXT 621
+#define _gloffset_EdgeFlagPointerEXT 622
+#define _gloffset_IndexPointerEXT 623
+#define _gloffset_NormalPointerEXT 624
+#define _gloffset_TexCoordPointerEXT 625
+#define _gloffset_VertexPointerEXT 626
+#define _gloffset_PointParameterfEXT 627
+#define _gloffset_PointParameterfvEXT 628
+#define _gloffset_LockArraysEXT 629
+#define _gloffset_UnlockArraysEXT 630
+#define _gloffset_SecondaryColor3bEXT 631
+#define _gloffset_SecondaryColor3bvEXT 632
+#define _gloffset_SecondaryColor3dEXT 633
+#define _gloffset_SecondaryColor3dvEXT 634
+#define _gloffset_SecondaryColor3fEXT 635
+#define _gloffset_SecondaryColor3fvEXT 636
+#define _gloffset_SecondaryColor3iEXT 637
+#define _gloffset_SecondaryColor3ivEXT 638
+#define _gloffset_SecondaryColor3sEXT 639
+#define _gloffset_SecondaryColor3svEXT 640
+#define _gloffset_SecondaryColor3ubEXT 641
+#define _gloffset_SecondaryColor3ubvEXT 642
+#define _gloffset_SecondaryColor3uiEXT 643
+#define _gloffset_SecondaryColor3uivEXT 644
+#define _gloffset_SecondaryColor3usEXT 645
+#define _gloffset_SecondaryColor3usvEXT 646
+#define _gloffset_SecondaryColorPointerEXT 647
+#define _gloffset_MultiDrawArraysEXT 648
+#define _gloffset_MultiDrawElementsEXT 649
+#define _gloffset_FogCoordPointerEXT 650
+#define _gloffset_FogCoorddEXT 651
+#define _gloffset_FogCoorddvEXT 652
+#define _gloffset_FogCoordfEXT 653
+#define _gloffset_FogCoordfvEXT 654
+#define _gloffset_PixelTexGenSGIX 655
+#define _gloffset_BlendFuncSeparateEXT 656
+#define _gloffset_FlushVertexArrayRangeNV 657
+#define _gloffset_VertexArrayRangeNV 658
+#define _gloffset_CombinerInputNV 659
+#define _gloffset_CombinerOutputNV 660
+#define _gloffset_CombinerParameterfNV 661
+#define _gloffset_CombinerParameterfvNV 662
+#define _gloffset_CombinerParameteriNV 663
+#define _gloffset_CombinerParameterivNV 664
+#define _gloffset_FinalCombinerInputNV 665
+#define _gloffset_GetCombinerInputParameterfvNV 666
+#define _gloffset_GetCombinerInputParameterivNV 667
+#define _gloffset_GetCombinerOutputParameterfvNV 668
+#define _gloffset_GetCombinerOutputParameterivNV 669
+#define _gloffset_GetFinalCombinerInputParameterfvNV 670
+#define _gloffset_GetFinalCombinerInputParameterivNV 671
+#define _gloffset_ResizeBuffersMESA 672
+#define _gloffset_WindowPos2dMESA 673
+#define _gloffset_WindowPos2dvMESA 674
+#define _gloffset_WindowPos2fMESA 675
+#define _gloffset_WindowPos2fvMESA 676
+#define _gloffset_WindowPos2iMESA 677
+#define _gloffset_WindowPos2ivMESA 678
+#define _gloffset_WindowPos2sMESA 679
+#define _gloffset_WindowPos2svMESA 680
+#define _gloffset_WindowPos3dMESA 681
+#define _gloffset_WindowPos3dvMESA 682
+#define _gloffset_WindowPos3fMESA 683
+#define _gloffset_WindowPos3fvMESA 684
+#define _gloffset_WindowPos3iMESA 685
+#define _gloffset_WindowPos3ivMESA 686
+#define _gloffset_WindowPos3sMESA 687
+#define _gloffset_WindowPos3svMESA 688
+#define _gloffset_WindowPos4dMESA 689
+#define _gloffset_WindowPos4dvMESA 690
+#define _gloffset_WindowPos4fMESA 691
+#define _gloffset_WindowPos4fvMESA 692
+#define _gloffset_WindowPos4iMESA 693
+#define _gloffset_WindowPos4ivMESA 694
+#define _gloffset_WindowPos4sMESA 695
+#define _gloffset_WindowPos4svMESA 696
+#define _gloffset_MultiModeDrawArraysIBM 697
+#define _gloffset_MultiModeDrawElementsIBM 698
+#define _gloffset_DeleteFencesNV 699
+#define _gloffset_FinishFenceNV 700
+#define _gloffset_GenFencesNV 701
+#define _gloffset_GetFenceivNV 702
+#define _gloffset_IsFenceNV 703
+#define _gloffset_SetFenceNV 704
+#define _gloffset_TestFenceNV 705
+#define _gloffset_AreProgramsResidentNV 706
+#define _gloffset_BindProgramNV 707
+#define _gloffset_DeleteProgramsNV 708
+#define _gloffset_ExecuteProgramNV 709
+#define _gloffset_GenProgramsNV 710
+#define _gloffset_GetProgramParameterdvNV 711
+#define _gloffset_GetProgramParameterfvNV 712
+#define _gloffset_GetProgramStringNV 713
+#define _gloffset_GetProgramivNV 714
+#define _gloffset_GetTrackMatrixivNV 715
+#define _gloffset_GetVertexAttribPointervNV 716
+#define _gloffset_GetVertexAttribdvNV 717
+#define _gloffset_GetVertexAttribfvNV 718
+#define _gloffset_GetVertexAttribivNV 719
+#define _gloffset_IsProgramNV 720
+#define _gloffset_LoadProgramNV 721
+#define _gloffset_ProgramParameters4dvNV 722
+#define _gloffset_ProgramParameters4fvNV 723
+#define _gloffset_RequestResidentProgramsNV 724
+#define _gloffset_TrackMatrixNV 725
+#define _gloffset_VertexAttrib1dNV 726
+#define _gloffset_VertexAttrib1dvNV 727
+#define _gloffset_VertexAttrib1fNV 728
+#define _gloffset_VertexAttrib1fvNV 729
+#define _gloffset_VertexAttrib1sNV 730
+#define _gloffset_VertexAttrib1svNV 731
+#define _gloffset_VertexAttrib2dNV 732
+#define _gloffset_VertexAttrib2dvNV 733
+#define _gloffset_VertexAttrib2fNV 734
+#define _gloffset_VertexAttrib2fvNV 735
+#define _gloffset_VertexAttrib2sNV 736
+#define _gloffset_VertexAttrib2svNV 737
+#define _gloffset_VertexAttrib3dNV 738
+#define _gloffset_VertexAttrib3dvNV 739
+#define _gloffset_VertexAttrib3fNV 740
+#define _gloffset_VertexAttrib3fvNV 741
+#define _gloffset_VertexAttrib3sNV 742
+#define _gloffset_VertexAttrib3svNV 743
+#define _gloffset_VertexAttrib4dNV 744
+#define _gloffset_VertexAttrib4dvNV 745
+#define _gloffset_VertexAttrib4fNV 746
+#define _gloffset_VertexAttrib4fvNV 747
+#define _gloffset_VertexAttrib4sNV 748
+#define _gloffset_VertexAttrib4svNV 749
+#define _gloffset_VertexAttrib4ubNV 750
+#define _gloffset_VertexAttrib4ubvNV 751
+#define _gloffset_VertexAttribPointerNV 752
+#define _gloffset_VertexAttribs1dvNV 753
+#define _gloffset_VertexAttribs1fvNV 754
+#define _gloffset_VertexAttribs1svNV 755
+#define _gloffset_VertexAttribs2dvNV 756
+#define _gloffset_VertexAttribs2fvNV 757
+#define _gloffset_VertexAttribs2svNV 758
+#define _gloffset_VertexAttribs3dvNV 759
+#define _gloffset_VertexAttribs3fvNV 760
+#define _gloffset_VertexAttribs3svNV 761
+#define _gloffset_VertexAttribs4dvNV 762
+#define _gloffset_VertexAttribs4fvNV 763
+#define _gloffset_VertexAttribs4svNV 764
+#define _gloffset_VertexAttribs4ubvNV 765
+#define _gloffset_GetTexBumpParameterfvATI 766
+#define _gloffset_GetTexBumpParameterivATI 767
+#define _gloffset_TexBumpParameterfvATI 768
+#define _gloffset_TexBumpParameterivATI 769
+#define _gloffset_AlphaFragmentOp1ATI 770
+#define _gloffset_AlphaFragmentOp2ATI 771
+#define _gloffset_AlphaFragmentOp3ATI 772
+#define _gloffset_BeginFragmentShaderATI 773
+#define _gloffset_BindFragmentShaderATI 774
+#define _gloffset_ColorFragmentOp1ATI 775
+#define _gloffset_ColorFragmentOp2ATI 776
+#define _gloffset_ColorFragmentOp3ATI 777
+#define _gloffset_DeleteFragmentShaderATI 778
+#define _gloffset_EndFragmentShaderATI 779
+#define _gloffset_GenFragmentShadersATI 780
+#define _gloffset_PassTexCoordATI 781
+#define _gloffset_SampleMapATI 782
+#define _gloffset_SetFragmentShaderConstantATI 783
+#define _gloffset_PointParameteriNV 784
+#define _gloffset_PointParameterivNV 785
+#define _gloffset_ActiveStencilFaceEXT 786
+#define _gloffset_BindVertexArrayAPPLE 787
+#define _gloffset_DeleteVertexArraysAPPLE 788
+#define _gloffset_GenVertexArraysAPPLE 789
+#define _gloffset_IsVertexArrayAPPLE 790
+#define _gloffset_GetProgramNamedParameterdvNV 791
+#define _gloffset_GetProgramNamedParameterfvNV 792
+#define _gloffset_ProgramNamedParameter4dNV 793
+#define _gloffset_ProgramNamedParameter4dvNV 794
+#define _gloffset_ProgramNamedParameter4fNV 795
+#define _gloffset_ProgramNamedParameter4fvNV 796
+#define _gloffset_PrimitiveRestartIndexNV 797
+#define _gloffset_PrimitiveRestartNV 798
+#define _gloffset_DepthBoundsEXT 799
+#define _gloffset_BlendEquationSeparateEXT 800
+#define _gloffset_BindFramebufferEXT 801
+#define _gloffset_BindRenderbufferEXT 802
+#define _gloffset_CheckFramebufferStatusEXT 803
+#define _gloffset_DeleteFramebuffersEXT 804
+#define _gloffset_DeleteRenderbuffersEXT 805
+#define _gloffset_FramebufferRenderbufferEXT 806
+#define _gloffset_FramebufferTexture1DEXT 807
+#define _gloffset_FramebufferTexture2DEXT 808
+#define _gloffset_FramebufferTexture3DEXT 809
+#define _gloffset_GenFramebuffersEXT 810
+#define _gloffset_GenRenderbuffersEXT 811
+#define _gloffset_GenerateMipmapEXT 812
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 813
+#define _gloffset_GetRenderbufferParameterivEXT 814
+#define _gloffset_IsFramebufferEXT 815
+#define _gloffset_IsRenderbufferEXT 816
+#define _gloffset_RenderbufferStorageEXT 817
+#define _gloffset_BlitFramebufferEXT 818
+#define _gloffset_BufferParameteriAPPLE 819
+#define _gloffset_FlushMappedBufferRangeAPPLE 820
+#define _gloffset_BindFragDataLocationEXT 821
+#define _gloffset_GetFragDataLocationEXT 822
+#define _gloffset_GetUniformuivEXT 823
+#define _gloffset_GetVertexAttribIivEXT 824
+#define _gloffset_GetVertexAttribIuivEXT 825
+#define _gloffset_Uniform1uiEXT 826
+#define _gloffset_Uniform1uivEXT 827
+#define _gloffset_Uniform2uiEXT 828
+#define _gloffset_Uniform2uivEXT 829
+#define _gloffset_Uniform3uiEXT 830
+#define _gloffset_Uniform3uivEXT 831
+#define _gloffset_Uniform4uiEXT 832
+#define _gloffset_Uniform4uivEXT 833
+#define _gloffset_VertexAttribI1iEXT 834
+#define _gloffset_VertexAttribI1ivEXT 835
+#define _gloffset_VertexAttribI1uiEXT 836
+#define _gloffset_VertexAttribI1uivEXT 837
+#define _gloffset_VertexAttribI2iEXT 838
+#define _gloffset_VertexAttribI2ivEXT 839
+#define _gloffset_VertexAttribI2uiEXT 840
+#define _gloffset_VertexAttribI2uivEXT 841
+#define _gloffset_VertexAttribI3iEXT 842
+#define _gloffset_VertexAttribI3ivEXT 843
+#define _gloffset_VertexAttribI3uiEXT 844
+#define _gloffset_VertexAttribI3uivEXT 845
+#define _gloffset_VertexAttribI4bvEXT 846
+#define _gloffset_VertexAttribI4iEXT 847
+#define _gloffset_VertexAttribI4ivEXT 848
+#define _gloffset_VertexAttribI4svEXT 849
+#define _gloffset_VertexAttribI4ubvEXT 850
+#define _gloffset_VertexAttribI4uiEXT 851
+#define _gloffset_VertexAttribI4uivEXT 852
+#define _gloffset_VertexAttribI4usvEXT 853
+#define _gloffset_VertexAttribIPointerEXT 854
+#define _gloffset_FramebufferTextureLayerEXT 855
+#define _gloffset_ColorMaskIndexedEXT 856
+#define _gloffset_DisableIndexedEXT 857
+#define _gloffset_EnableIndexedEXT 858
+#define _gloffset_GetBooleanIndexedvEXT 859
+#define _gloffset_GetIntegerIndexedvEXT 860
+#define _gloffset_IsEnabledIndexedEXT 861
+#define _gloffset_ClearColorIiEXT 862
+#define _gloffset_ClearColorIuiEXT 863
+#define _gloffset_GetTexParameterIivEXT 864
+#define _gloffset_GetTexParameterIuivEXT 865
+#define _gloffset_TexParameterIivEXT 866
+#define _gloffset_TexParameterIuivEXT 867
+#define _gloffset_BeginConditionalRenderNV 868
+#define _gloffset_EndConditionalRenderNV 869
+#define _gloffset_BeginTransformFeedbackEXT 870
+#define _gloffset_BindBufferBaseEXT 871
+#define _gloffset_BindBufferOffsetEXT 872
+#define _gloffset_BindBufferRangeEXT 873
+#define _gloffset_EndTransformFeedbackEXT 874
+#define _gloffset_GetTransformFeedbackVaryingEXT 875
+#define _gloffset_TransformFeedbackVaryingsEXT 876
+#define _gloffset_ProvokingVertexEXT 877
+#define _gloffset_GetTexParameterPointervAPPLE 878
+#define _gloffset_TextureRangeAPPLE 879
+#define _gloffset_GetObjectParameterivAPPLE 880
+#define _gloffset_ObjectPurgeableAPPLE 881
+#define _gloffset_ObjectUnpurgeableAPPLE 882
+#define _gloffset_ActiveProgramEXT 883
+#define _gloffset_CreateShaderProgramEXT 884
+#define _gloffset_UseShaderProgramEXT 885
+#define _gloffset_TextureBarrierNV 886
+#define _gloffset_StencilFuncSeparateATI 887
+#define _gloffset_ProgramEnvParameters4fvEXT 888
+#define _gloffset_ProgramLocalParameters4fvEXT 889
+#define _gloffset_GetQueryObjecti64vEXT 890
+#define _gloffset_GetQueryObjectui64vEXT 891
+#define _gloffset_EGLImageTargetRenderbufferStorageOES 892
+#define _gloffset_EGLImageTargetTexture2DOES 893
 
 #else /* !_GLAPI_USE_REMAP_TABLE */
 
-#define driDispatchRemapTable_size 485
+#define driDispatchRemapTable_size 486
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -1137,317 +1138,318 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define VertexAttribDivisorARB_remap_index 171
 #define FlushMappedBufferRange_remap_index 172
 #define MapBufferRange_remap_index 173
-#define BindVertexArray_remap_index 174
-#define GenVertexArrays_remap_index 175
-#define CopyBufferSubData_remap_index 176
-#define ClientWaitSync_remap_index 177
-#define DeleteSync_remap_index 178
-#define FenceSync_remap_index 179
-#define GetInteger64v_remap_index 180
-#define GetSynciv_remap_index 181
-#define IsSync_remap_index 182
-#define WaitSync_remap_index 183
-#define DrawElementsBaseVertex_remap_index 184
-#define DrawRangeElementsBaseVertex_remap_index 185
-#define MultiDrawElementsBaseVertex_remap_index 186
-#define BlendEquationSeparateiARB_remap_index 187
-#define BlendEquationiARB_remap_index 188
-#define BlendFuncSeparateiARB_remap_index 189
-#define BlendFunciARB_remap_index 190
-#define BindTransformFeedback_remap_index 191
-#define DeleteTransformFeedbacks_remap_index 192
-#define DrawTransformFeedback_remap_index 193
-#define GenTransformFeedbacks_remap_index 194
-#define IsTransformFeedback_remap_index 195
-#define PauseTransformFeedback_remap_index 196
-#define ResumeTransformFeedback_remap_index 197
-#define ClearDepthf_remap_index 198
-#define DepthRangef_remap_index 199
-#define GetShaderPrecisionFormat_remap_index 200
-#define ReleaseShaderCompiler_remap_index 201
-#define ShaderBinary_remap_index 202
-#define PolygonOffsetEXT_remap_index 203
-#define GetPixelTexGenParameterfvSGIS_remap_index 204
-#define GetPixelTexGenParameterivSGIS_remap_index 205
-#define PixelTexGenParameterfSGIS_remap_index 206
-#define PixelTexGenParameterfvSGIS_remap_index 207
-#define PixelTexGenParameteriSGIS_remap_index 208
-#define PixelTexGenParameterivSGIS_remap_index 209
-#define SampleMaskSGIS_remap_index 210
-#define SamplePatternSGIS_remap_index 211
-#define ColorPointerEXT_remap_index 212
-#define EdgeFlagPointerEXT_remap_index 213
-#define IndexPointerEXT_remap_index 214
-#define NormalPointerEXT_remap_index 215
-#define TexCoordPointerEXT_remap_index 216
-#define VertexPointerEXT_remap_index 217
-#define PointParameterfEXT_remap_index 218
-#define PointParameterfvEXT_remap_index 219
-#define LockArraysEXT_remap_index 220
-#define UnlockArraysEXT_remap_index 221
-#define SecondaryColor3bEXT_remap_index 222
-#define SecondaryColor3bvEXT_remap_index 223
-#define SecondaryColor3dEXT_remap_index 224
-#define SecondaryColor3dvEXT_remap_index 225
-#define SecondaryColor3fEXT_remap_index 226
-#define SecondaryColor3fvEXT_remap_index 227
-#define SecondaryColor3iEXT_remap_index 228
-#define SecondaryColor3ivEXT_remap_index 229
-#define SecondaryColor3sEXT_remap_index 230
-#define SecondaryColor3svEXT_remap_index 231
-#define SecondaryColor3ubEXT_remap_index 232
-#define SecondaryColor3ubvEXT_remap_index 233
-#define SecondaryColor3uiEXT_remap_index 234
-#define SecondaryColor3uivEXT_remap_index 235
-#define SecondaryColor3usEXT_remap_index 236
-#define SecondaryColor3usvEXT_remap_index 237
-#define SecondaryColorPointerEXT_remap_index 238
-#define MultiDrawArraysEXT_remap_index 239
-#define MultiDrawElementsEXT_remap_index 240
-#define FogCoordPointerEXT_remap_index 241
-#define FogCoorddEXT_remap_index 242
-#define FogCoorddvEXT_remap_index 243
-#define FogCoordfEXT_remap_index 244
-#define FogCoordfvEXT_remap_index 245
-#define PixelTexGenSGIX_remap_index 246
-#define BlendFuncSeparateEXT_remap_index 247
-#define FlushVertexArrayRangeNV_remap_index 248
-#define VertexArrayRangeNV_remap_index 249
-#define CombinerInputNV_remap_index 250
-#define CombinerOutputNV_remap_index 251
-#define CombinerParameterfNV_remap_index 252
-#define CombinerParameterfvNV_remap_index 253
-#define CombinerParameteriNV_remap_index 254
-#define CombinerParameterivNV_remap_index 255
-#define FinalCombinerInputNV_remap_index 256
-#define GetCombinerInputParameterfvNV_remap_index 257
-#define GetCombinerInputParameterivNV_remap_index 258
-#define GetCombinerOutputParameterfvNV_remap_index 259
-#define GetCombinerOutputParameterivNV_remap_index 260
-#define GetFinalCombinerInputParameterfvNV_remap_index 261
-#define GetFinalCombinerInputParameterivNV_remap_index 262
-#define ResizeBuffersMESA_remap_index 263
-#define WindowPos2dMESA_remap_index 264
-#define WindowPos2dvMESA_remap_index 265
-#define WindowPos2fMESA_remap_index 266
-#define WindowPos2fvMESA_remap_index 267
-#define WindowPos2iMESA_remap_index 268
-#define WindowPos2ivMESA_remap_index 269
-#define WindowPos2sMESA_remap_index 270
-#define WindowPos2svMESA_remap_index 271
-#define WindowPos3dMESA_remap_index 272
-#define WindowPos3dvMESA_remap_index 273
-#define WindowPos3fMESA_remap_index 274
-#define WindowPos3fvMESA_remap_index 275
-#define WindowPos3iMESA_remap_index 276
-#define WindowPos3ivMESA_remap_index 277
-#define WindowPos3sMESA_remap_index 278
-#define WindowPos3svMESA_remap_index 279
-#define WindowPos4dMESA_remap_index 280
-#define WindowPos4dvMESA_remap_index 281
-#define WindowPos4fMESA_remap_index 282
-#define WindowPos4fvMESA_remap_index 283
-#define WindowPos4iMESA_remap_index 284
-#define WindowPos4ivMESA_remap_index 285
-#define WindowPos4sMESA_remap_index 286
-#define WindowPos4svMESA_remap_index 287
-#define MultiModeDrawArraysIBM_remap_index 288
-#define MultiModeDrawElementsIBM_remap_index 289
-#define DeleteFencesNV_remap_index 290
-#define FinishFenceNV_remap_index 291
-#define GenFencesNV_remap_index 292
-#define GetFenceivNV_remap_index 293
-#define IsFenceNV_remap_index 294
-#define SetFenceNV_remap_index 295
-#define TestFenceNV_remap_index 296
-#define AreProgramsResidentNV_remap_index 297
-#define BindProgramNV_remap_index 298
-#define DeleteProgramsNV_remap_index 299
-#define ExecuteProgramNV_remap_index 300
-#define GenProgramsNV_remap_index 301
-#define GetProgramParameterdvNV_remap_index 302
-#define GetProgramParameterfvNV_remap_index 303
-#define GetProgramStringNV_remap_index 304
-#define GetProgramivNV_remap_index 305
-#define GetTrackMatrixivNV_remap_index 306
-#define GetVertexAttribPointervNV_remap_index 307
-#define GetVertexAttribdvNV_remap_index 308
-#define GetVertexAttribfvNV_remap_index 309
-#define GetVertexAttribivNV_remap_index 310
-#define IsProgramNV_remap_index 311
-#define LoadProgramNV_remap_index 312
-#define ProgramParameters4dvNV_remap_index 313
-#define ProgramParameters4fvNV_remap_index 314
-#define RequestResidentProgramsNV_remap_index 315
-#define TrackMatrixNV_remap_index 316
-#define VertexAttrib1dNV_remap_index 317
-#define VertexAttrib1dvNV_remap_index 318
-#define VertexAttrib1fNV_remap_index 319
-#define VertexAttrib1fvNV_remap_index 320
-#define VertexAttrib1sNV_remap_index 321
-#define VertexAttrib1svNV_remap_index 322
-#define VertexAttrib2dNV_remap_index 323
-#define VertexAttrib2dvNV_remap_index 324
-#define VertexAttrib2fNV_remap_index 325
-#define VertexAttrib2fvNV_remap_index 326
-#define VertexAttrib2sNV_remap_index 327
-#define VertexAttrib2svNV_remap_index 328
-#define VertexAttrib3dNV_remap_index 329
-#define VertexAttrib3dvNV_remap_index 330
-#define VertexAttrib3fNV_remap_index 331
-#define VertexAttrib3fvNV_remap_index 332
-#define VertexAttrib3sNV_remap_index 333
-#define VertexAttrib3svNV_remap_index 334
-#define VertexAttrib4dNV_remap_index 335
-#define VertexAttrib4dvNV_remap_index 336
-#define VertexAttrib4fNV_remap_index 337
-#define VertexAttrib4fvNV_remap_index 338
-#define VertexAttrib4sNV_remap_index 339
-#define VertexAttrib4svNV_remap_index 340
-#define VertexAttrib4ubNV_remap_index 341
-#define VertexAttrib4ubvNV_remap_index 342
-#define VertexAttribPointerNV_remap_index 343
-#define VertexAttribs1dvNV_remap_index 344
-#define VertexAttribs1fvNV_remap_index 345
-#define VertexAttribs1svNV_remap_index 346
-#define VertexAttribs2dvNV_remap_index 347
-#define VertexAttribs2fvNV_remap_index 348
-#define VertexAttribs2svNV_remap_index 349
-#define VertexAttribs3dvNV_remap_index 350
-#define VertexAttribs3fvNV_remap_index 351
-#define VertexAttribs3svNV_remap_index 352
-#define VertexAttribs4dvNV_remap_index 353
-#define VertexAttribs4fvNV_remap_index 354
-#define VertexAttribs4svNV_remap_index 355
-#define VertexAttribs4ubvNV_remap_index 356
-#define GetTexBumpParameterfvATI_remap_index 357
-#define GetTexBumpParameterivATI_remap_index 358
-#define TexBumpParameterfvATI_remap_index 359
-#define TexBumpParameterivATI_remap_index 360
-#define AlphaFragmentOp1ATI_remap_index 361
-#define AlphaFragmentOp2ATI_remap_index 362
-#define AlphaFragmentOp3ATI_remap_index 363
-#define BeginFragmentShaderATI_remap_index 364
-#define BindFragmentShaderATI_remap_index 365
-#define ColorFragmentOp1ATI_remap_index 366
-#define ColorFragmentOp2ATI_remap_index 367
-#define ColorFragmentOp3ATI_remap_index 368
-#define DeleteFragmentShaderATI_remap_index 369
-#define EndFragmentShaderATI_remap_index 370
-#define GenFragmentShadersATI_remap_index 371
-#define PassTexCoordATI_remap_index 372
-#define SampleMapATI_remap_index 373
-#define SetFragmentShaderConstantATI_remap_index 374
-#define PointParameteriNV_remap_index 375
-#define PointParameterivNV_remap_index 376
-#define ActiveStencilFaceEXT_remap_index 377
-#define BindVertexArrayAPPLE_remap_index 378
-#define DeleteVertexArraysAPPLE_remap_index 379
-#define GenVertexArraysAPPLE_remap_index 380
-#define IsVertexArrayAPPLE_remap_index 381
-#define GetProgramNamedParameterdvNV_remap_index 382
-#define GetProgramNamedParameterfvNV_remap_index 383
-#define ProgramNamedParameter4dNV_remap_index 384
-#define ProgramNamedParameter4dvNV_remap_index 385
-#define ProgramNamedParameter4fNV_remap_index 386
-#define ProgramNamedParameter4fvNV_remap_index 387
-#define PrimitiveRestartIndexNV_remap_index 388
-#define PrimitiveRestartNV_remap_index 389
-#define DepthBoundsEXT_remap_index 390
-#define BlendEquationSeparateEXT_remap_index 391
-#define BindFramebufferEXT_remap_index 392
-#define BindRenderbufferEXT_remap_index 393
-#define CheckFramebufferStatusEXT_remap_index 394
-#define DeleteFramebuffersEXT_remap_index 395
-#define DeleteRenderbuffersEXT_remap_index 396
-#define FramebufferRenderbufferEXT_remap_index 397
-#define FramebufferTexture1DEXT_remap_index 398
-#define FramebufferTexture2DEXT_remap_index 399
-#define FramebufferTexture3DEXT_remap_index 400
-#define GenFramebuffersEXT_remap_index 401
-#define GenRenderbuffersEXT_remap_index 402
-#define GenerateMipmapEXT_remap_index 403
-#define GetFramebufferAttachmentParameterivEXT_remap_index 404
-#define GetRenderbufferParameterivEXT_remap_index 405
-#define IsFramebufferEXT_remap_index 406
-#define IsRenderbufferEXT_remap_index 407
-#define RenderbufferStorageEXT_remap_index 408
-#define BlitFramebufferEXT_remap_index 409
-#define BufferParameteriAPPLE_remap_index 410
-#define FlushMappedBufferRangeAPPLE_remap_index 411
-#define BindFragDataLocationEXT_remap_index 412
-#define GetFragDataLocationEXT_remap_index 413
-#define GetUniformuivEXT_remap_index 414
-#define GetVertexAttribIivEXT_remap_index 415
-#define GetVertexAttribIuivEXT_remap_index 416
-#define Uniform1uiEXT_remap_index 417
-#define Uniform1uivEXT_remap_index 418
-#define Uniform2uiEXT_remap_index 419
-#define Uniform2uivEXT_remap_index 420
-#define Uniform3uiEXT_remap_index 421
-#define Uniform3uivEXT_remap_index 422
-#define Uniform4uiEXT_remap_index 423
-#define Uniform4uivEXT_remap_index 424
-#define VertexAttribI1iEXT_remap_index 425
-#define VertexAttribI1ivEXT_remap_index 426
-#define VertexAttribI1uiEXT_remap_index 427
-#define VertexAttribI1uivEXT_remap_index 428
-#define VertexAttribI2iEXT_remap_index 429
-#define VertexAttribI2ivEXT_remap_index 430
-#define VertexAttribI2uiEXT_remap_index 431
-#define VertexAttribI2uivEXT_remap_index 432
-#define VertexAttribI3iEXT_remap_index 433
-#define VertexAttribI3ivEXT_remap_index 434
-#define VertexAttribI3uiEXT_remap_index 435
-#define VertexAttribI3uivEXT_remap_index 436
-#define VertexAttribI4bvEXT_remap_index 437
-#define VertexAttribI4iEXT_remap_index 438
-#define VertexAttribI4ivEXT_remap_index 439
-#define VertexAttribI4svEXT_remap_index 440
-#define VertexAttribI4ubvEXT_remap_index 441
-#define VertexAttribI4uiEXT_remap_index 442
-#define VertexAttribI4uivEXT_remap_index 443
-#define VertexAttribI4usvEXT_remap_index 444
-#define VertexAttribIPointerEXT_remap_index 445
-#define FramebufferTextureLayerEXT_remap_index 446
-#define ColorMaskIndexedEXT_remap_index 447
-#define DisableIndexedEXT_remap_index 448
-#define EnableIndexedEXT_remap_index 449
-#define GetBooleanIndexedvEXT_remap_index 450
-#define GetIntegerIndexedvEXT_remap_index 451
-#define IsEnabledIndexedEXT_remap_index 452
-#define ClearColorIiEXT_remap_index 453
-#define ClearColorIuiEXT_remap_index 454
-#define GetTexParameterIivEXT_remap_index 455
-#define GetTexParameterIuivEXT_remap_index 456
-#define TexParameterIivEXT_remap_index 457
-#define TexParameterIuivEXT_remap_index 458
-#define BeginConditionalRenderNV_remap_index 459
-#define EndConditionalRenderNV_remap_index 460
-#define BeginTransformFeedbackEXT_remap_index 461
-#define BindBufferBaseEXT_remap_index 462
-#define BindBufferOffsetEXT_remap_index 463
-#define BindBufferRangeEXT_remap_index 464
-#define EndTransformFeedbackEXT_remap_index 465
-#define GetTransformFeedbackVaryingEXT_remap_index 466
-#define TransformFeedbackVaryingsEXT_remap_index 467
-#define ProvokingVertexEXT_remap_index 468
-#define GetTexParameterPointervAPPLE_remap_index 469
-#define TextureRangeAPPLE_remap_index 470
-#define GetObjectParameterivAPPLE_remap_index 471
-#define ObjectPurgeableAPPLE_remap_index 472
-#define ObjectUnpurgeableAPPLE_remap_index 473
-#define ActiveProgramEXT_remap_index 474
-#define CreateShaderProgramEXT_remap_index 475
-#define UseShaderProgramEXT_remap_index 476
-#define TextureBarrierNV_remap_index 477
-#define StencilFuncSeparateATI_remap_index 478
-#define ProgramEnvParameters4fvEXT_remap_index 479
-#define ProgramLocalParameters4fvEXT_remap_index 480
-#define GetQueryObjecti64vEXT_remap_index 481
-#define GetQueryObjectui64vEXT_remap_index 482
-#define EGLImageTargetRenderbufferStorageOES_remap_index 483
-#define EGLImageTargetTexture2DOES_remap_index 484
+#define TexBufferARB_remap_index 174
+#define BindVertexArray_remap_index 175
+#define GenVertexArrays_remap_index 176
+#define CopyBufferSubData_remap_index 177
+#define ClientWaitSync_remap_index 178
+#define DeleteSync_remap_index 179
+#define FenceSync_remap_index 180
+#define GetInteger64v_remap_index 181
+#define GetSynciv_remap_index 182
+#define IsSync_remap_index 183
+#define WaitSync_remap_index 184
+#define DrawElementsBaseVertex_remap_index 185
+#define DrawRangeElementsBaseVertex_remap_index 186
+#define MultiDrawElementsBaseVertex_remap_index 187
+#define BlendEquationSeparateiARB_remap_index 188
+#define BlendEquationiARB_remap_index 189
+#define BlendFuncSeparateiARB_remap_index 190
+#define BlendFunciARB_remap_index 191
+#define BindTransformFeedback_remap_index 192
+#define DeleteTransformFeedbacks_remap_index 193
+#define DrawTransformFeedback_remap_index 194
+#define GenTransformFeedbacks_remap_index 195
+#define IsTransformFeedback_remap_index 196
+#define PauseTransformFeedback_remap_index 197
+#define ResumeTransformFeedback_remap_index 198
+#define ClearDepthf_remap_index 199
+#define DepthRangef_remap_index 200
+#define GetShaderPrecisionFormat_remap_index 201
+#define ReleaseShaderCompiler_remap_index 202
+#define ShaderBinary_remap_index 203
+#define PolygonOffsetEXT_remap_index 204
+#define GetPixelTexGenParameterfvSGIS_remap_index 205
+#define GetPixelTexGenParameterivSGIS_remap_index 206
+#define PixelTexGenParameterfSGIS_remap_index 207
+#define PixelTexGenParameterfvSGIS_remap_index 208
+#define PixelTexGenParameteriSGIS_remap_index 209
+#define PixelTexGenParameterivSGIS_remap_index 210
+#define SampleMaskSGIS_remap_index 211
+#define SamplePatternSGIS_remap_index 212
+#define ColorPointerEXT_remap_index 213
+#define EdgeFlagPointerEXT_remap_index 214
+#define IndexPointerEXT_remap_index 215
+#define NormalPointerEXT_remap_index 216
+#define TexCoordPointerEXT_remap_index 217
+#define VertexPointerEXT_remap_index 218
+#define PointParameterfEXT_remap_index 219
+#define PointParameterfvEXT_remap_index 220
+#define LockArraysEXT_remap_index 221
+#define UnlockArraysEXT_remap_index 222
+#define SecondaryColor3bEXT_remap_index 223
+#define SecondaryColor3bvEXT_remap_index 224
+#define SecondaryColor3dEXT_remap_index 225
+#define SecondaryColor3dvEXT_remap_index 226
+#define SecondaryColor3fEXT_remap_index 227
+#define SecondaryColor3fvEXT_remap_index 228
+#define SecondaryColor3iEXT_remap_index 229
+#define SecondaryColor3ivEXT_remap_index 230
+#define SecondaryColor3sEXT_remap_index 231
+#define SecondaryColor3svEXT_remap_index 232
+#define SecondaryColor3ubEXT_remap_index 233
+#define SecondaryColor3ubvEXT_remap_index 234
+#define SecondaryColor3uiEXT_remap_index 235
+#define SecondaryColor3uivEXT_remap_index 236
+#define SecondaryColor3usEXT_remap_index 237
+#define SecondaryColor3usvEXT_remap_index 238
+#define SecondaryColorPointerEXT_remap_index 239
+#define MultiDrawArraysEXT_remap_index 240
+#define MultiDrawElementsEXT_remap_index 241
+#define FogCoordPointerEXT_remap_index 242
+#define FogCoorddEXT_remap_index 243
+#define FogCoorddvEXT_remap_index 244
+#define FogCoordfEXT_remap_index 245
+#define FogCoordfvEXT_remap_index 246
+#define PixelTexGenSGIX_remap_index 247
+#define BlendFuncSeparateEXT_remap_index 248
+#define FlushVertexArrayRangeNV_remap_index 249
+#define VertexArrayRangeNV_remap_index 250
+#define CombinerInputNV_remap_index 251
+#define CombinerOutputNV_remap_index 252
+#define CombinerParameterfNV_remap_index 253
+#define CombinerParameterfvNV_remap_index 254
+#define CombinerParameteriNV_remap_index 255
+#define CombinerParameterivNV_remap_index 256
+#define FinalCombinerInputNV_remap_index 257
+#define GetCombinerInputParameterfvNV_remap_index 258
+#define GetCombinerInputParameterivNV_remap_index 259
+#define GetCombinerOutputParameterfvNV_remap_index 260
+#define GetCombinerOutputParameterivNV_remap_index 261
+#define GetFinalCombinerInputParameterfvNV_remap_index 262
+#define GetFinalCombinerInputParameterivNV_remap_index 263
+#define ResizeBuffersMESA_remap_index 264
+#define WindowPos2dMESA_remap_index 265
+#define WindowPos2dvMESA_remap_index 266
+#define WindowPos2fMESA_remap_index 267
+#define WindowPos2fvMESA_remap_index 268
+#define WindowPos2iMESA_remap_index 269
+#define WindowPos2ivMESA_remap_index 270
+#define WindowPos2sMESA_remap_index 271
+#define WindowPos2svMESA_remap_index 272
+#define WindowPos3dMESA_remap_index 273
+#define WindowPos3dvMESA_remap_index 274
+#define WindowPos3fMESA_remap_index 275
+#define WindowPos3fvMESA_remap_index 276
+#define WindowPos3iMESA_remap_index 277
+#define WindowPos3ivMESA_remap_index 278
+#define WindowPos3sMESA_remap_index 279
+#define WindowPos3svMESA_remap_index 280
+#define WindowPos4dMESA_remap_index 281
+#define WindowPos4dvMESA_remap_index 282
+#define WindowPos4fMESA_remap_index 283
+#define WindowPos4fvMESA_remap_index 284
+#define WindowPos4iMESA_remap_index 285
+#define WindowPos4ivMESA_remap_index 286
+#define WindowPos4sMESA_remap_index 287
+#define WindowPos4svMESA_remap_index 288
+#define MultiModeDrawArraysIBM_remap_index 289
+#define MultiModeDrawElementsIBM_remap_index 290
+#define DeleteFencesNV_remap_index 291
+#define FinishFenceNV_remap_index 292
+#define GenFencesNV_remap_index 293
+#define GetFenceivNV_remap_index 294
+#define IsFenceNV_remap_index 295
+#define SetFenceNV_remap_index 296
+#define TestFenceNV_remap_index 297
+#define AreProgramsResidentNV_remap_index 298
+#define BindProgramNV_remap_index 299
+#define DeleteProgramsNV_remap_index 300
+#define ExecuteProgramNV_remap_index 301
+#define GenProgramsNV_remap_index 302
+#define GetProgramParameterdvNV_remap_index 303
+#define GetProgramParameterfvNV_remap_index 304
+#define GetProgramStringNV_remap_index 305
+#define GetProgramivNV_remap_index 306
+#define GetTrackMatrixivNV_remap_index 307
+#define GetVertexAttribPointervNV_remap_index 308
+#define GetVertexAttribdvNV_remap_index 309
+#define GetVertexAttribfvNV_remap_index 310
+#define GetVertexAttribivNV_remap_index 311
+#define IsProgramNV_remap_index 312
+#define LoadProgramNV_remap_index 313
+#define ProgramParameters4dvNV_remap_index 314
+#define ProgramParameters4fvNV_remap_index 315
+#define RequestResidentProgramsNV_remap_index 316
+#define TrackMatrixNV_remap_index 317
+#define VertexAttrib1dNV_remap_index 318
+#define VertexAttrib1dvNV_remap_index 319
+#define VertexAttrib1fNV_remap_index 320
+#define VertexAttrib1fvNV_remap_index 321
+#define VertexAttrib1sNV_remap_index 322
+#define VertexAttrib1svNV_remap_index 323
+#define VertexAttrib2dNV_remap_index 324
+#define VertexAttrib2dvNV_remap_index 325
+#define VertexAttrib2fNV_remap_index 326
+#define VertexAttrib2fvNV_remap_index 327
+#define VertexAttrib2sNV_remap_index 328
+#define VertexAttrib2svNV_remap_index 329
+#define VertexAttrib3dNV_remap_index 330
+#define VertexAttrib3dvNV_remap_index 331
+#define VertexAttrib3fNV_remap_index 332
+#define VertexAttrib3fvNV_remap_index 333
+#define VertexAttrib3sNV_remap_index 334
+#define VertexAttrib3svNV_remap_index 335
+#define VertexAttrib4dNV_remap_index 336
+#define VertexAttrib4dvNV_remap_index 337
+#define VertexAttrib4fNV_remap_index 338
+#define VertexAttrib4fvNV_remap_index 339
+#define VertexAttrib4sNV_remap_index 340
+#define VertexAttrib4svNV_remap_index 341
+#define VertexAttrib4ubNV_remap_index 342
+#define VertexAttrib4ubvNV_remap_index 343
+#define VertexAttribPointerNV_remap_index 344
+#define VertexAttribs1dvNV_remap_index 345
+#define VertexAttribs1fvNV_remap_index 346
+#define VertexAttribs1svNV_remap_index 347
+#define VertexAttribs2dvNV_remap_index 348
+#define VertexAttribs2fvNV_remap_index 349
+#define VertexAttribs2svNV_remap_index 350
+#define VertexAttribs3dvNV_remap_index 351
+#define VertexAttribs3fvNV_remap_index 352
+#define VertexAttribs3svNV_remap_index 353
+#define VertexAttribs4dvNV_remap_index 354
+#define VertexAttribs4fvNV_remap_index 355
+#define VertexAttribs4svNV_remap_index 356
+#define VertexAttribs4ubvNV_remap_index 357
+#define GetTexBumpParameterfvATI_remap_index 358
+#define GetTexBumpParameterivATI_remap_index 359
+#define TexBumpParameterfvATI_remap_index 360
+#define TexBumpParameterivATI_remap_index 361
+#define AlphaFragmentOp1ATI_remap_index 362
+#define AlphaFragmentOp2ATI_remap_index 363
+#define AlphaFragmentOp3ATI_remap_index 364
+#define BeginFragmentShaderATI_remap_index 365
+#define BindFragmentShaderATI_remap_index 366
+#define ColorFragmentOp1ATI_remap_index 367
+#define ColorFragmentOp2ATI_remap_index 368
+#define ColorFragmentOp3ATI_remap_index 369
+#define DeleteFragmentShaderATI_remap_index 370
+#define EndFragmentShaderATI_remap_index 371
+#define GenFragmentShadersATI_remap_index 372
+#define PassTexCoordATI_remap_index 373
+#define SampleMapATI_remap_index 374
+#define SetFragmentShaderConstantATI_remap_index 375
+#define PointParameteriNV_remap_index 376
+#define PointParameterivNV_remap_index 377
+#define ActiveStencilFaceEXT_remap_index 378
+#define BindVertexArrayAPPLE_remap_index 379
+#define DeleteVertexArraysAPPLE_remap_index 380
+#define GenVertexArraysAPPLE_remap_index 381
+#define IsVertexArrayAPPLE_remap_index 382
+#define GetProgramNamedParameterdvNV_remap_index 383
+#define GetProgramNamedParameterfvNV_remap_index 384
+#define ProgramNamedParameter4dNV_remap_index 385
+#define ProgramNamedParameter4dvNV_remap_index 386
+#define ProgramNamedParameter4fNV_remap_index 387
+#define ProgramNamedParameter4fvNV_remap_index 388
+#define PrimitiveRestartIndexNV_remap_index 389
+#define PrimitiveRestartNV_remap_index 390
+#define DepthBoundsEXT_remap_index 391
+#define BlendEquationSeparateEXT_remap_index 392
+#define BindFramebufferEXT_remap_index 393
+#define BindRenderbufferEXT_remap_index 394
+#define CheckFramebufferStatusEXT_remap_index 395
+#define DeleteFramebuffersEXT_remap_index 396
+#define DeleteRenderbuffersEXT_remap_index 397
+#define FramebufferRenderbufferEXT_remap_index 398
+#define FramebufferTexture1DEXT_remap_index 399
+#define FramebufferTexture2DEXT_remap_index 400
+#define FramebufferTexture3DEXT_remap_index 401
+#define GenFramebuffersEXT_remap_index 402
+#define GenRenderbuffersEXT_remap_index 403
+#define GenerateMipmapEXT_remap_index 404
+#define GetFramebufferAttachmentParameterivEXT_remap_index 405
+#define GetRenderbufferParameterivEXT_remap_index 406
+#define IsFramebufferEXT_remap_index 407
+#define IsRenderbufferEXT_remap_index 408
+#define RenderbufferStorageEXT_remap_index 409
+#define BlitFramebufferEXT_remap_index 410
+#define BufferParameteriAPPLE_remap_index 411
+#define FlushMappedBufferRangeAPPLE_remap_index 412
+#define BindFragDataLocationEXT_remap_index 413
+#define GetFragDataLocationEXT_remap_index 414
+#define GetUniformuivEXT_remap_index 415
+#define GetVertexAttribIivEXT_remap_index 416
+#define GetVertexAttribIuivEXT_remap_index 417
+#define Uniform1uiEXT_remap_index 418
+#define Uniform1uivEXT_remap_index 419
+#define Uniform2uiEXT_remap_index 420
+#define Uniform2uivEXT_remap_index 421
+#define Uniform3uiEXT_remap_index 422
+#define Uniform3uivEXT_remap_index 423
+#define Uniform4uiEXT_remap_index 424
+#define Uniform4uivEXT_remap_index 425
+#define VertexAttribI1iEXT_remap_index 426
+#define VertexAttribI1ivEXT_remap_index 427
+#define VertexAttribI1uiEXT_remap_index 428
+#define VertexAttribI1uivEXT_remap_index 429
+#define VertexAttribI2iEXT_remap_index 430
+#define VertexAttribI2ivEXT_remap_index 431
+#define VertexAttribI2uiEXT_remap_index 432
+#define VertexAttribI2uivEXT_remap_index 433
+#define VertexAttribI3iEXT_remap_index 434
+#define VertexAttribI3ivEXT_remap_index 435
+#define VertexAttribI3uiEXT_remap_index 436
+#define VertexAttribI3uivEXT_remap_index 437
+#define VertexAttribI4bvEXT_remap_index 438
+#define VertexAttribI4iEXT_remap_index 439
+#define VertexAttribI4ivEXT_remap_index 440
+#define VertexAttribI4svEXT_remap_index 441
+#define VertexAttribI4ubvEXT_remap_index 442
+#define VertexAttribI4uiEXT_remap_index 443
+#define VertexAttribI4uivEXT_remap_index 444
+#define VertexAttribI4usvEXT_remap_index 445
+#define VertexAttribIPointerEXT_remap_index 446
+#define FramebufferTextureLayerEXT_remap_index 447
+#define ColorMaskIndexedEXT_remap_index 448
+#define DisableIndexedEXT_remap_index 449
+#define EnableIndexedEXT_remap_index 450
+#define GetBooleanIndexedvEXT_remap_index 451
+#define GetIntegerIndexedvEXT_remap_index 452
+#define IsEnabledIndexedEXT_remap_index 453
+#define ClearColorIiEXT_remap_index 454
+#define ClearColorIuiEXT_remap_index 455
+#define GetTexParameterIivEXT_remap_index 456
+#define GetTexParameterIuivEXT_remap_index 457
+#define TexParameterIivEXT_remap_index 458
+#define TexParameterIuivEXT_remap_index 459
+#define BeginConditionalRenderNV_remap_index 460
+#define EndConditionalRenderNV_remap_index 461
+#define BeginTransformFeedbackEXT_remap_index 462
+#define BindBufferBaseEXT_remap_index 463
+#define BindBufferOffsetEXT_remap_index 464
+#define BindBufferRangeEXT_remap_index 465
+#define EndTransformFeedbackEXT_remap_index 466
+#define GetTransformFeedbackVaryingEXT_remap_index 467
+#define TransformFeedbackVaryingsEXT_remap_index 468
+#define ProvokingVertexEXT_remap_index 469
+#define GetTexParameterPointervAPPLE_remap_index 470
+#define TextureRangeAPPLE_remap_index 471
+#define GetObjectParameterivAPPLE_remap_index 472
+#define ObjectPurgeableAPPLE_remap_index 473
+#define ObjectUnpurgeableAPPLE_remap_index 474
+#define ActiveProgramEXT_remap_index 475
+#define CreateShaderProgramEXT_remap_index 476
+#define UseShaderProgramEXT_remap_index 477
+#define TextureBarrierNV_remap_index 478
+#define StencilFuncSeparateATI_remap_index 479
+#define ProgramEnvParameters4fvEXT_remap_index 480
+#define ProgramLocalParameters4fvEXT_remap_index 481
+#define GetQueryObjecti64vEXT_remap_index 482
+#define GetQueryObjectui64vEXT_remap_index 483
+#define EGLImageTargetRenderbufferStorageOES_remap_index 484
+#define EGLImageTargetTexture2DOES_remap_index 485
 
 #define _gloffset_AttachShader driDispatchRemapTable[AttachShader_remap_index]
 #define _gloffset_CreateProgram driDispatchRemapTable[CreateProgram_remap_index]
@@ -1623,6 +1625,7 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_VertexAttribDivisorARB driDispatchRemapTable[VertexAttribDivisorARB_remap_index]
 #define _gloffset_FlushMappedBufferRange driDispatchRemapTable[FlushMappedBufferRange_remap_index]
 #define _gloffset_MapBufferRange driDispatchRemapTable[MapBufferRange_remap_index]
+#define _gloffset_TexBufferARB driDispatchRemapTable[TexBufferARB_remap_index]
 #define _gloffset_BindVertexArray driDispatchRemapTable[BindVertexArray_remap_index]
 #define _gloffset_GenVertexArrays driDispatchRemapTable[GenVertexArrays_remap_index]
 #define _gloffset_CopyBufferSubData driDispatchRemapTable[CopyBufferSubData_remap_index]
@@ -3683,6 +3686,9 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_MapBufferRange(disp, parameters) CALL_by_offset(disp, (GLvoid * (GLAPIENTRYP)(GLenum, GLintptr, GLsizeiptr, GLbitfield)), _gloffset_MapBufferRange, parameters)
 #define GET_MapBufferRange(disp) GET_by_offset(disp, _gloffset_MapBufferRange)
 #define SET_MapBufferRange(disp, fn) SET_by_offset(disp, _gloffset_MapBufferRange, fn)
+#define CALL_TexBufferARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLenum, GLuint)), _gloffset_TexBufferARB, parameters)
+#define GET_TexBufferARB(disp) GET_by_offset(disp, _gloffset_TexBufferARB)
+#define SET_TexBufferARB(disp, fn) SET_by_offset(disp, _gloffset_TexBufferARB, fn)
 #define CALL_BindVertexArray(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint)), _gloffset_BindVertexArray, parameters)
 #define GET_BindVertexArray(disp) GET_by_offset(disp, _gloffset_BindVertexArray)
 #define SET_BindVertexArray(disp, fn) SET_by_offset(disp, _gloffset_BindVertexArray, fn)
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index a9cd16739..5ec641895 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -1139,6 +1139,7 @@ struct gl_stencil_attrib
  */
 typedef enum
 {
+   TEXTURE_BUFFER_INDEX,
    TEXTURE_2D_ARRAY_INDEX,
    TEXTURE_1D_ARRAY_INDEX,
    TEXTURE_CUBE_INDEX,
@@ -1155,6 +1156,7 @@ typedef enum
  * Used for Texture.Unit[]._ReallyEnabled flags.
  */
 /*@{*/
+#define TEXTURE_BUFFER_BIT   (1 << TEXTURE_BUFFER_INDEX)
 #define TEXTURE_2D_ARRAY_BIT (1 << TEXTURE_2D_ARRAY_INDEX)
 #define TEXTURE_1D_ARRAY_BIT (1 << TEXTURE_1D_ARRAY_INDEX)
 #define TEXTURE_CUBE_BIT     (1 << TEXTURE_CUBE_INDEX)
@@ -1348,6 +1350,10 @@ struct gl_texture_object
    /** Actual texture images, indexed by [cube face] and [mipmap level] */
    struct gl_texture_image *Image[MAX_FACES][MAX_TEXTURE_LEVELS];
 
+   /** GL_ARB_texture_buffer_object */
+   struct gl_buffer_object *BufferObject;
+   GLenum BufferObjectFormat;
+
    /** GL_EXT_paletted_texture */
    struct gl_color_table Palette;
 
@@ -1458,6 +1464,9 @@ struct gl_texture_attrib
 
    struct gl_texture_object *ProxyTex[NUM_TEXTURE_TARGETS];
 
+   /** GL_ARB_texture_buffer_object */
+   struct gl_buffer_object *BufferObject;
+
    /** GL_ARB_seamless_cubemap */
    GLboolean CubeMapSeamless;
 
@@ -2630,6 +2639,7 @@ struct gl_constants
    GLuint MaxTextureUnits;           /**< = MIN(CoordUnits, ImageUnits) */
    GLfloat MaxTextureMaxAnisotropy;  /**< GL_EXT_texture_filter_anisotropic */
    GLfloat MaxTextureLodBias;        /**< GL_EXT_texture_lod_bias */
+   GLuint MaxTextureBufferSize;      /**< GL_ARB_texture_buffer_object */
 
    GLuint MaxArrayLockSize;
 
diff --git a/mesalib/src/mesa/main/remap_helper.h b/mesalib/src/mesa/main/remap_helper.h
index 0d47dcf8b..d0fb59104 100644
--- a/mesalib/src/mesa/main/remap_helper.h
+++ b/mesalib/src/mesa/main/remap_helper.h
@@ -70,4714 +70,4718 @@ static const char _mesa_function_pool[] =
    "\0"
    "glLoadIdentity\0"
    "\0"
-   /* _mesa_function_pool[216]: GetCombinerOutputParameterfvNV (will be remapped) */
-   "iiip\0"
-   "glGetCombinerOutputParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[255]: SampleCoverageARB (will be remapped) */
+   /* _mesa_function_pool[216]: SampleCoverageARB (will be remapped) */
    "fi\0"
    "glSampleCoverage\0"
    "glSampleCoverageARB\0"
    "\0"
-   /* _mesa_function_pool[296]: ConvolutionFilter1D (offset 348) */
+   /* _mesa_function_pool[257]: ConvolutionFilter1D (offset 348) */
    "iiiiip\0"
    "glConvolutionFilter1D\0"
    "glConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[351]: BeginQueryARB (will be remapped) */
+   /* _mesa_function_pool[312]: BeginQueryARB (will be remapped) */
    "ii\0"
    "glBeginQuery\0"
    "glBeginQueryARB\0"
    "\0"
-   /* _mesa_function_pool[384]: RasterPos3dv (offset 71) */
+   /* _mesa_function_pool[345]: RasterPos3dv (offset 71) */
    "p\0"
    "glRasterPos3dv\0"
    "\0"
-   /* _mesa_function_pool[402]: PointParameteriNV (will be remapped) */
+   /* _mesa_function_pool[363]: PointParameteriNV (will be remapped) */
    "ii\0"
    "glPointParameteri\0"
    "glPointParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[444]: GetProgramiv (will be remapped) */
+   /* _mesa_function_pool[405]: GetProgramiv (will be remapped) */
    "iip\0"
    "glGetProgramiv\0"
    "\0"
-   /* _mesa_function_pool[464]: MultiTexCoord3sARB (offset 398) */
+   /* _mesa_function_pool[425]: MultiTexCoord3sARB (offset 398) */
    "iiii\0"
    "glMultiTexCoord3s\0"
    "glMultiTexCoord3sARB\0"
    "\0"
-   /* _mesa_function_pool[509]: SecondaryColor3iEXT (will be remapped) */
+   /* _mesa_function_pool[470]: SecondaryColor3iEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3i\0"
    "glSecondaryColor3iEXT\0"
    "\0"
-   /* _mesa_function_pool[555]: WindowPos3fMESA (will be remapped) */
+   /* _mesa_function_pool[516]: WindowPos3fMESA (will be remapped) */
    "fff\0"
    "glWindowPos3f\0"
    "glWindowPos3fARB\0"
    "glWindowPos3fMESA\0"
    "\0"
-   /* _mesa_function_pool[609]: TexCoord1iv (offset 99) */
+   /* _mesa_function_pool[570]: TexCoord1iv (offset 99) */
    "p\0"
    "glTexCoord1iv\0"
    "\0"
-   /* _mesa_function_pool[626]: TexCoord4sv (offset 125) */
+   /* _mesa_function_pool[587]: TexCoord4sv (offset 125) */
    "p\0"
    "glTexCoord4sv\0"
    "\0"
-   /* _mesa_function_pool[643]: RasterPos4s (offset 84) */
+   /* _mesa_function_pool[604]: RasterPos4s (offset 84) */
    "iiii\0"
    "glRasterPos4s\0"
    "\0"
-   /* _mesa_function_pool[663]: PixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[624]: PixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[696]: ActiveTextureARB (offset 374) */
+   /* _mesa_function_pool[657]: ActiveTextureARB (offset 374) */
    "i\0"
    "glActiveTexture\0"
    "glActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[734]: BlitFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[695]: BlitFramebufferEXT (will be remapped) */
    "iiiiiiiiii\0"
    "glBlitFramebuffer\0"
    "glBlitFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[785]: TexCoord1f (offset 96) */
+   /* _mesa_function_pool[746]: TexCoord1f (offset 96) */
    "f\0"
    "glTexCoord1f\0"
    "\0"
-   /* _mesa_function_pool[801]: TexCoord1d (offset 94) */
+   /* _mesa_function_pool[762]: TexCoord1d (offset 94) */
    "d\0"
    "glTexCoord1d\0"
    "\0"
-   /* _mesa_function_pool[817]: VertexAttrib4ubvNV (will be remapped) */
+   /* _mesa_function_pool[778]: VertexAttrib4ubvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[842]: TexCoord1i (offset 98) */
+   /* _mesa_function_pool[803]: TexCoord1i (offset 98) */
    "i\0"
    "glTexCoord1i\0"
    "\0"
-   /* _mesa_function_pool[858]: GetProgramNamedParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[819]: GetProgramNamedParameterdvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[895]: Histogram (offset 367) */
+   /* _mesa_function_pool[856]: Histogram (offset 367) */
    "iiii\0"
    "glHistogram\0"
    "glHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[928]: TexCoord1s (offset 100) */
+   /* _mesa_function_pool[889]: TexCoord1s (offset 100) */
    "i\0"
    "glTexCoord1s\0"
    "\0"
-   /* _mesa_function_pool[944]: GetMapfv (offset 267) */
+   /* _mesa_function_pool[905]: GetMapfv (offset 267) */
    "iip\0"
    "glGetMapfv\0"
    "\0"
-   /* _mesa_function_pool[960]: EvalCoord1f (offset 230) */
+   /* _mesa_function_pool[921]: EvalCoord1f (offset 230) */
    "f\0"
    "glEvalCoord1f\0"
    "\0"
-   /* _mesa_function_pool[977]: FramebufferTexture (will be remapped) */
+   /* _mesa_function_pool[938]: FramebufferTexture (will be remapped) */
    "iiii\0"
    "glFramebufferTexture\0"
    "\0"
-   /* _mesa_function_pool[1004]: VertexAttribI1ivEXT (will be remapped) */
+   /* _mesa_function_pool[965]: VertexAttribI1ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1ivEXT\0"
    "glVertexAttribI1iv\0"
    "\0"
-   /* _mesa_function_pool[1049]: TexImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[1010]: TexImage4DSGIS (dynamic) */
    "iiiiiiiiiip\0"
    "glTexImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[1079]: PolygonStipple (offset 175) */
+   /* _mesa_function_pool[1040]: PolygonStipple (offset 175) */
    "p\0"
    "glPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[1099]: WindowPos2dvMESA (will be remapped) */
+   /* _mesa_function_pool[1060]: WindowPos2dvMESA (will be remapped) */
    "p\0"
    "glWindowPos2dv\0"
    "glWindowPos2dvARB\0"
    "glWindowPos2dvMESA\0"
    "\0"
-   /* _mesa_function_pool[1154]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1115]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1198]: BlendEquationSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[1159]: BlendEquationSeparateEXT (will be remapped) */
    "ii\0"
    "glBlendEquationSeparate\0"
    "glBlendEquationSeparateEXT\0"
    "glBlendEquationSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[1280]: ListParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[1241]: ListParameterfSGIX (dynamic) */
    "iif\0"
    "glListParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[1306]: SecondaryColor3bEXT (will be remapped) */
+   /* _mesa_function_pool[1267]: SecondaryColor3bEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3b\0"
    "glSecondaryColor3bEXT\0"
    "\0"
-   /* _mesa_function_pool[1352]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[1313]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1398]: GetPixelMapfv (offset 271) */
+   /* _mesa_function_pool[1359]: GetPixelMapfv (offset 271) */
    "ip\0"
    "glGetPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[1418]: Color3uiv (offset 22) */
+   /* _mesa_function_pool[1379]: Color3uiv (offset 22) */
    "p\0"
    "glColor3uiv\0"
    "\0"
-   /* _mesa_function_pool[1433]: IsEnabled (offset 286) */
+   /* _mesa_function_pool[1394]: IsEnabled (offset 286) */
    "i\0"
    "glIsEnabled\0"
    "\0"
-   /* _mesa_function_pool[1448]: VertexAttrib4svNV (will be remapped) */
+   /* _mesa_function_pool[1409]: VertexAttrib4svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4svNV\0"
    "\0"
-   /* _mesa_function_pool[1472]: EvalCoord2fv (offset 235) */
+   /* _mesa_function_pool[1433]: EvalCoord2fv (offset 235) */
    "p\0"
    "glEvalCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[1490]: GetBufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1451]: GetBufferSubDataARB (will be remapped) */
    "iiip\0"
    "glGetBufferSubData\0"
    "glGetBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1537]: BufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1498]: BufferSubDataARB (will be remapped) */
    "iiip\0"
    "glBufferSubData\0"
    "glBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1578]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1539]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1616]: AttachShader (will be remapped) */
+   /* _mesa_function_pool[1577]: AttachShader (will be remapped) */
    "ii\0"
    "glAttachShader\0"
    "\0"
-   /* _mesa_function_pool[1635]: VertexAttrib2fARB (will be remapped) */
+   /* _mesa_function_pool[1596]: VertexAttrib2fARB (will be remapped) */
    "iff\0"
    "glVertexAttrib2f\0"
    "glVertexAttrib2fARB\0"
    "\0"
-   /* _mesa_function_pool[1677]: GetDebugLogLengthMESA (dynamic) */
+   /* _mesa_function_pool[1638]: GetDebugLogLengthMESA (dynamic) */
    "iii\0"
    "glGetDebugLogLengthMESA\0"
    "\0"
-   /* _mesa_function_pool[1706]: GetMapiv (offset 268) */
+   /* _mesa_function_pool[1667]: GetMapiv (offset 268) */
    "iip\0"
    "glGetMapiv\0"
    "\0"
-   /* _mesa_function_pool[1722]: VertexAttrib3fARB (will be remapped) */
+   /* _mesa_function_pool[1683]: VertexAttrib3fARB (will be remapped) */
    "ifff\0"
    "glVertexAttrib3f\0"
    "glVertexAttrib3fARB\0"
    "\0"
-   /* _mesa_function_pool[1765]: Indexubv (offset 316) */
+   /* _mesa_function_pool[1726]: Indexubv (offset 316) */
    "p\0"
    "glIndexubv\0"
    "\0"
-   /* _mesa_function_pool[1779]: GetQueryivARB (will be remapped) */
+   /* _mesa_function_pool[1740]: GetQueryivARB (will be remapped) */
    "iip\0"
    "glGetQueryiv\0"
    "glGetQueryivARB\0"
    "\0"
-   /* _mesa_function_pool[1813]: TexImage3D (offset 371) */
+   /* _mesa_function_pool[1774]: TexImage3D (offset 371) */
    "iiiiiiiiip\0"
    "glTexImage3D\0"
    "glTexImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[1854]: BindFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[1815]: BindFragDataLocationEXT (will be remapped) */
    "iip\0"
    "glBindFragDataLocationEXT\0"
    "glBindFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[1908]: ReplacementCodeuiVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1869]: ReplacementCodeuiVertex3fvSUN (dynamic) */
    "pp\0"
    "glReplacementCodeuiVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1944]: EdgeFlagPointer (offset 312) */
+   /* _mesa_function_pool[1905]: EdgeFlagPointer (offset 312) */
    "ip\0"
    "glEdgeFlagPointer\0"
    "\0"
-   /* _mesa_function_pool[1966]: Color3ubv (offset 20) */
+   /* _mesa_function_pool[1927]: Color3ubv (offset 20) */
    "p\0"
    "glColor3ubv\0"
    "\0"
-   /* _mesa_function_pool[1981]: GetQueryObjectivARB (will be remapped) */
+   /* _mesa_function_pool[1942]: GetQueryObjectivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectiv\0"
    "glGetQueryObjectivARB\0"
    "\0"
-   /* _mesa_function_pool[2027]: Vertex3dv (offset 135) */
+   /* _mesa_function_pool[1988]: Vertex3dv (offset 135) */
    "p\0"
    "glVertex3dv\0"
    "\0"
-   /* _mesa_function_pool[2042]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2003]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2089]: CompressedTexSubImage2DARB (will be remapped) */
+   /* _mesa_function_pool[2050]: CompressedTexSubImage2DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexSubImage2D\0"
    "glCompressedTexSubImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[2155]: CombinerOutputNV (will be remapped) */
+   /* _mesa_function_pool[2116]: CombinerOutputNV (will be remapped) */
    "iiiiiiiiii\0"
    "glCombinerOutputNV\0"
    "\0"
-   /* _mesa_function_pool[2186]: VertexAttribs3fvNV (will be remapped) */
+   /* _mesa_function_pool[2147]: VertexAttribs3fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3fvNV\0"
    "\0"
-   /* _mesa_function_pool[2212]: Uniform2fARB (will be remapped) */
+   /* _mesa_function_pool[2173]: Uniform2fARB (will be remapped) */
    "iff\0"
    "glUniform2f\0"
    "glUniform2fARB\0"
    "\0"
-   /* _mesa_function_pool[2244]: LightModeliv (offset 166) */
+   /* _mesa_function_pool[2205]: LightModeliv (offset 166) */
    "ip\0"
    "glLightModeliv\0"
    "\0"
-   /* _mesa_function_pool[2263]: VertexAttrib1svARB (will be remapped) */
+   /* _mesa_function_pool[2224]: VertexAttrib1svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1sv\0"
    "glVertexAttrib1svARB\0"
    "\0"
-   /* _mesa_function_pool[2306]: VertexAttribs1dvNV (will be remapped) */
+   /* _mesa_function_pool[2267]: VertexAttribs1dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1dvNV\0"
    "\0"
-   /* _mesa_function_pool[2332]: Uniform2ivARB (will be remapped) */
+   /* _mesa_function_pool[2293]: Uniform2ivARB (will be remapped) */
    "iip\0"
    "glUniform2iv\0"
    "glUniform2ivARB\0"
    "\0"
-   /* _mesa_function_pool[2366]: GetImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[2327]: GetImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[2404]: Normal3bv (offset 53) */
+   /* _mesa_function_pool[2365]: Normal3bv (offset 53) */
    "p\0"
    "glNormal3bv\0"
    "\0"
-   /* _mesa_function_pool[2419]: TexGeniv (offset 193) */
+   /* _mesa_function_pool[2380]: TexGeniv (offset 193) */
    "iip\0"
    "glTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[2435]: WeightubvARB (dynamic) */
+   /* _mesa_function_pool[2396]: WeightubvARB (dynamic) */
    "ip\0"
    "glWeightubvARB\0"
    "\0"
-   /* _mesa_function_pool[2454]: VertexAttrib1fvNV (will be remapped) */
+   /* _mesa_function_pool[2415]: VertexAttrib1fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1fvNV\0"
    "\0"
-   /* _mesa_function_pool[2478]: Vertex3iv (offset 139) */
+   /* _mesa_function_pool[2439]: Vertex3iv (offset 139) */
    "p\0"
    "glVertex3iv\0"
    "\0"
-   /* _mesa_function_pool[2493]: CopyConvolutionFilter1D (offset 354) */
+   /* _mesa_function_pool[2454]: CopyConvolutionFilter1D (offset 354) */
    "iiiii\0"
    "glCopyConvolutionFilter1D\0"
    "glCopyConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[2555]: VertexAttribI1uiEXT (will be remapped) */
+   /* _mesa_function_pool[2516]: VertexAttribI1uiEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1uiEXT\0"
    "glVertexAttribI1ui\0"
    "\0"
-   /* _mesa_function_pool[2600]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[2561]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[2648]: DeleteSync (will be remapped) */
+   /* _mesa_function_pool[2609]: DeleteSync (will be remapped) */
    "i\0"
    "glDeleteSync\0"
    "\0"
-   /* _mesa_function_pool[2664]: FragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[2625]: FragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[2694]: BlendColor (offset 336) */
+   /* _mesa_function_pool[2655]: BlendColor (offset 336) */
    "ffff\0"
    "glBlendColor\0"
    "glBlendColorEXT\0"
    "\0"
-   /* _mesa_function_pool[2729]: UniformMatrix4fvARB (will be remapped) */
+   /* _mesa_function_pool[2690]: UniformMatrix4fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix4fv\0"
    "glUniformMatrix4fvARB\0"
    "\0"
-   /* _mesa_function_pool[2776]: DeleteVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[2737]: DeleteVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glDeleteVertexArrays\0"
    "glDeleteVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[2827]: TexBuffer (will be remapped) */
+   /* _mesa_function_pool[2788]: TexBuffer (will be remapped) */
    "iii\0"
    "glTexBuffer\0"
    "\0"
-   /* _mesa_function_pool[2844]: ReadInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[2805]: ReadInstrumentsSGIX (dynamic) */
    "i\0"
    "glReadInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[2869]: CallLists (offset 3) */
+   /* _mesa_function_pool[2830]: CallLists (offset 3) */
    "iip\0"
    "glCallLists\0"
    "\0"
-   /* _mesa_function_pool[2886]: UniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[2847]: UniformMatrix2x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x4fv\0"
    "\0"
-   /* _mesa_function_pool[2913]: Color4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2874]: Color4ubVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2940]: Normal3iv (offset 59) */
+   /* _mesa_function_pool[2901]: Normal3iv (offset 59) */
    "p\0"
    "glNormal3iv\0"
    "\0"
-   /* _mesa_function_pool[2955]: PassThrough (offset 199) */
+   /* _mesa_function_pool[2916]: PassThrough (offset 199) */
    "f\0"
    "glPassThrough\0"
    "\0"
-   /* _mesa_function_pool[2972]: GetVertexAttribIivEXT (will be remapped) */
+   /* _mesa_function_pool[2933]: GetVertexAttribIivEXT (will be remapped) */
    "iip\0"
    "glGetVertexAttribIivEXT\0"
    "glGetVertexAttribIiv\0"
    "\0"
-   /* _mesa_function_pool[3022]: TexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[2983]: TexParameterIivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIivEXT\0"
    "glTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[3066]: FramebufferTextureLayerEXT (will be remapped) */
+   /* _mesa_function_pool[3027]: FramebufferTextureLayerEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[3128]: GetListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[3089]: GetListParameterfvSGIX (dynamic) */
    "iip\0"
    "glGetListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[3158]: Viewport (offset 305) */
+   /* _mesa_function_pool[3119]: Viewport (offset 305) */
    "iiii\0"
    "glViewport\0"
    "\0"
-   /* _mesa_function_pool[3175]: VertexAttrib4NusvARB (will be remapped) */
+   /* _mesa_function_pool[3136]: VertexAttrib4NusvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nusv\0"
    "glVertexAttrib4NusvARB\0"
    "\0"
-   /* _mesa_function_pool[3222]: WindowPos4svMESA (will be remapped) */
+   /* _mesa_function_pool[3183]: WindowPos4svMESA (will be remapped) */
    "p\0"
    "glWindowPos4svMESA\0"
    "\0"
-   /* _mesa_function_pool[3244]: CreateProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[3205]: CreateProgramObjectARB (will be remapped) */
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[3271]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[3232]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
    "glDeleteTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[3302]: UniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[3263]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[3329]: PrioritizeTextures (offset 331) */
+   /* _mesa_function_pool[3290]: PrioritizeTextures (offset 331) */
    "ipp\0"
    "glPrioritizeTextures\0"
    "glPrioritizeTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[3379]: VertexAttribI3uiEXT (will be remapped) */
+   /* _mesa_function_pool[3340]: VertexAttribI3uiEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3uiEXT\0"
    "glVertexAttribI3ui\0"
    "\0"
-   /* _mesa_function_pool[3426]: AsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[3387]: AsyncMarkerSGIX (dynamic) */
    "i\0"
    "glAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[3447]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[3408]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[3475]: ClearColorIuiEXT (will be remapped) */
+   /* _mesa_function_pool[3436]: ClearColorIuiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIuiEXT\0"
    "\0"
-   /* _mesa_function_pool[3500]: ClearDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[3461]: ClearDebugLogMESA (dynamic) */
    "iii\0"
    "glClearDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[3525]: Uniform4uiEXT (will be remapped) */
+   /* _mesa_function_pool[3486]: Uniform4uiEXT (will be remapped) */
    "iiiii\0"
    "glUniform4uiEXT\0"
    "glUniform4ui\0"
    "\0"
-   /* _mesa_function_pool[3561]: ResetHistogram (offset 369) */
+   /* _mesa_function_pool[3522]: ResetHistogram (offset 369) */
    "i\0"
    "glResetHistogram\0"
    "glResetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[3601]: GetProgramNamedParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[3562]: GetProgramNamedParameterfvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[3638]: PointParameterfEXT (will be remapped) */
+   /* _mesa_function_pool[3599]: PointParameterfEXT (will be remapped) */
    "if\0"
    "glPointParameterf\0"
    "glPointParameterfARB\0"
    "glPointParameterfEXT\0"
    "glPointParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[3724]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[3685]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[3760]: GenFencesNV (will be remapped) */
+   /* _mesa_function_pool[3721]: GenFencesNV (will be remapped) */
    "ip\0"
    "glGenFencesNV\0"
    "\0"
-   /* _mesa_function_pool[3778]: ImageTransformParameterfHP (dynamic) */
+   /* _mesa_function_pool[3739]: ImageTransformParameterfHP (dynamic) */
    "iif\0"
    "glImageTransformParameterfHP\0"
    "\0"
-   /* _mesa_function_pool[3812]: MatrixIndexusvARB (dynamic) */
+   /* _mesa_function_pool[3773]: MatrixIndexusvARB (dynamic) */
    "ip\0"
    "glMatrixIndexusvARB\0"
    "\0"
-   /* _mesa_function_pool[3836]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[3797]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[3868]: DisableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[3829]: DisableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[3928]: TexCoord2sv (offset 109) */
+   /* _mesa_function_pool[3889]: TexCoord2sv (offset 109) */
    "p\0"
    "glTexCoord2sv\0"
    "\0"
-   /* _mesa_function_pool[3945]: Vertex4dv (offset 143) */
+   /* _mesa_function_pool[3906]: Vertex4dv (offset 143) */
    "p\0"
    "glVertex4dv\0"
    "\0"
-   /* _mesa_function_pool[3960]: StencilMaskSeparate (will be remapped) */
+   /* _mesa_function_pool[3921]: StencilMaskSeparate (will be remapped) */
    "ii\0"
    "glStencilMaskSeparate\0"
    "\0"
-   /* _mesa_function_pool[3986]: ProgramLocalParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[3947]: ProgramLocalParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramLocalParameter4dARB\0"
    "\0"
-   /* _mesa_function_pool[4023]: CompressedTexImage3DARB (will be remapped) */
+   /* _mesa_function_pool[3984]: CompressedTexImage3DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexImage3D\0"
    "glCompressedTexImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[4083]: Color3sv (offset 18) */
+   /* _mesa_function_pool[4044]: Color3sv (offset 18) */
    "p\0"
    "glColor3sv\0"
    "\0"
-   /* _mesa_function_pool[4097]: GetConvolutionParameteriv (offset 358) */
+   /* _mesa_function_pool[4058]: GetConvolutionParameteriv (offset 358) */
    "iip\0"
    "glGetConvolutionParameteriv\0"
    "glGetConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[4161]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[4122]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[4202]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[4163]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[4217]: TestFenceNV (will be remapped) */
+   /* _mesa_function_pool[4178]: TestFenceNV (will be remapped) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[4234]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[4195]: GetVertexAttribIuivEXT (will be remapped) */
+   "iip\0"
+   "glGetVertexAttribIuivEXT\0"
+   "glGetVertexAttribIuiv\0"
+   "\0"
+   /* _mesa_function_pool[4247]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[4279]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[4292]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[4296]: Uniform2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4309]: Uniform2uivEXT (will be remapped) */
    "iip\0"
    "glUniform2uivEXT\0"
    "glUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[4332]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[4345]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[4366]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[4379]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4404]: GetPixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[4417]: GetPixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[4440]: Color3fv (offset 14) */
+   /* _mesa_function_pool[4453]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[4454]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[4467]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[4480]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[4493]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[4506]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[4519]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[4527]: GetDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[4540]: GetDebugLogMESA (dynamic) */
    "iiiipp\0"
    "glGetDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[4553]: FogCoorddEXT (will be remapped) */
+   /* _mesa_function_pool[4566]: FogCoorddEXT (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[4583]: BeginConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[4596]: BeginConditionalRenderNV (will be remapped) */
    "ii\0"
    "glBeginConditionalRenderNV\0"
    "glBeginConditionalRender\0"
    "\0"
-   /* _mesa_function_pool[4639]: Color4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4652]: Color4ubVertex3fSUN (dynamic) */
    "iiiifff\0"
    "glColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4670]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[4683]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[4700]: PointSize (offset 173) */
+   /* _mesa_function_pool[4713]: PointSize (offset 173) */
    "f\0"
    "glPointSize\0"
    "\0"
-   /* _mesa_function_pool[4715]: VertexAttribI2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4728]: VertexAttribI2uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2uivEXT\0"
    "glVertexAttribI2uiv\0"
    "\0"
-   /* _mesa_function_pool[4762]: TexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[4775]: TexCoord2fVertex3fSUN (dynamic) */
    "fffff\0"
    "glTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[4793]: PopName (offset 200) */
+   /* _mesa_function_pool[4806]: PopName (offset 200) */
    "\0"
    "glPopName\0"
    "\0"
-   /* _mesa_function_pool[4805]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[4818]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[4832]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[4845]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[4856]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[4869]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[4882]: VertexAttrib4NbvARB (will be remapped) */
+   /* _mesa_function_pool[4895]: VertexAttrib4NbvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[4927]: GetActiveAttribARB (will be remapped) */
+   /* _mesa_function_pool[4940]: GetActiveAttribARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[4975]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[4988]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[4990]: VertexAttrib4ubNV (will be remapped) */
+   /* _mesa_function_pool[5003]: VertexAttrib4ubNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4ubNV\0"
    "\0"
-   /* _mesa_function_pool[5017]: ClampColor (will be remapped) */
+   /* _mesa_function_pool[5030]: ClampColor (will be remapped) */
    "ii\0"
    "glClampColor\0"
    "\0"
-   /* _mesa_function_pool[5034]: TextureRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[5047]: TextureRangeAPPLE (will be remapped) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[5059]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[5072]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[5078]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5091]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5106]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5119]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5159]: Indexub (offset 315) */
+   /* _mesa_function_pool[5172]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[5172]: ColorMaskIndexedEXT (will be remapped) */
-   "iiiii\0"
-   "glColorMaskIndexedEXT\0"
-   "glColorMaski\0"
-   "\0"
-   /* _mesa_function_pool[5214]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[5185]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[5229]: GetClipPlane (offset 259) */
+   /* _mesa_function_pool[5200]: GetClipPlane (offset 259) */
    "ip\0"
    "glGetClipPlane\0"
    "\0"
-   /* _mesa_function_pool[5248]: CombinerParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[5219]: CombinerParameterfvNV (will be remapped) */
    "ip\0"
    "glCombinerParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[5276]: VertexAttribs3dvNV (will be remapped) */
+   /* _mesa_function_pool[5247]: VertexAttribs3dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3dvNV\0"
    "\0"
-   /* _mesa_function_pool[5302]: VertexAttribI2uiEXT (will be remapped) */
+   /* _mesa_function_pool[5273]: VertexAttribI2uiEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2uiEXT\0"
    "glVertexAttribI2ui\0"
    "\0"
-   /* _mesa_function_pool[5348]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[5319]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[5374]: VertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[5345]: VertexArrayRangeNV (will be remapped) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[5399]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[5370]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[5425]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[5396]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[5448]: VertexAttribI4uivEXT (will be remapped) */
+   /* _mesa_function_pool[5419]: VertexAttribI4uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4uivEXT\0"
    "glVertexAttribI4uiv\0"
    "\0"
-   /* _mesa_function_pool[5495]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[5466]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[5514]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[5485]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[5543]: Scaled (offset 301) */
+   /* _mesa_function_pool[5514]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[5557]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5528]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5585]: Scalef (offset 302) */
+   /* _mesa_function_pool[5556]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[5599]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[5570]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[5637]: MultTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[5608]: MultTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[5689]: ObjectUnpurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[5660]: ColorMaskIndexedEXT (will be remapped) */
+   "iiiii\0"
+   "glColorMaskIndexedEXT\0"
+   "glColorMaski\0"
+   "\0"
+   /* _mesa_function_pool[5702]: ObjectUnpurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectUnpurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[5719]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[5732]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[5735]: WindowPos2svMESA (will be remapped) */
+   /* _mesa_function_pool[5748]: WindowPos2svMESA (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[5790]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[5803]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[5804]: TexCoord2iv (offset 107) */
+   /* _mesa_function_pool[5817]: TexCoord2iv (offset 107) */
    "p\0"
    "glTexCoord2iv\0"
    "\0"
-   /* _mesa_function_pool[5821]: CompressedTexImage1DARB (will be remapped) */
+   /* _mesa_function_pool[5834]: CompressedTexImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[5879]: Rotated (offset 299) */
+   /* _mesa_function_pool[5892]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[5895]: GetTexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[5908]: GetTexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIuivEXT\0"
    "glGetTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[5947]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[5960]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[5971]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[5984]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[5993]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[6006]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[6008]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[6021]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[6037]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6050]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6061]: Color4iv (offset 32) */
+   /* _mesa_function_pool[6074]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[6075]: TexParameterf (offset 178) */
+   /* _mesa_function_pool[6088]: TexParameterf (offset 178) */
    "iif\0"
    "glTexParameterf\0"
    "\0"
-   /* _mesa_function_pool[6096]: TexParameteri (offset 180) */
+   /* _mesa_function_pool[6109]: TexParameteri (offset 180) */
    "iii\0"
    "glTexParameteri\0"
    "\0"
-   /* _mesa_function_pool[6117]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6130]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6142]: MultiTexCoord3dARB (offset 392) */
+   /* _mesa_function_pool[6155]: MultiTexCoord3dARB (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[6187]: MultiTexCoord2iARB (offset 388) */
+   /* _mesa_function_pool[6200]: MultiTexCoord2iARB (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[6231]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[6244]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[6251]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[6264]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[6311]: MultiTexCoord2svARB (offset 391) */
+   /* _mesa_function_pool[6324]: MultiTexCoord2svARB (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[6356]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[6369]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[6383]: Uniform3iARB (will be remapped) */
+   /* _mesa_function_pool[6396]: Uniform3iARB (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[6416]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[6429]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[6444]: DrawElementsInstancedARB (will be remapped) */
+   /* _mesa_function_pool[6457]: DrawElementsInstancedARB (will be remapped) */
    "iiipi\0"
    "glDrawElementsInstancedARB\0"
    "glDrawElementsInstancedEXT\0"
    "glDrawElementsInstanced\0"
    "\0"
-   /* _mesa_function_pool[6529]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[6542]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[6554]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[6567]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[6572]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[6585]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[6597]: GlobalAlphaFactordSUN (dynamic) */
+   /* _mesa_function_pool[6610]: GlobalAlphaFactordSUN (dynamic) */
    "d\0"
    "glGlobalAlphaFactordSUN\0"
    "\0"
-   /* _mesa_function_pool[6624]: GetFinalCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[6637]: GetFinalCombinerInputParameterfvNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[6666]: GenerateMipmapEXT (will be remapped) */
+   /* _mesa_function_pool[6679]: GenerateMipmapEXT (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "\0"
-   /* _mesa_function_pool[6706]: GenLists (offset 5) */
+   /* _mesa_function_pool[6719]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[6720]: DepthRangef (will be remapped) */
+   /* _mesa_function_pool[6733]: DepthRangef (will be remapped) */
    "ff\0"
    "glDepthRangef\0"
    "\0"
-   /* _mesa_function_pool[6738]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[6751]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[6772]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[6785]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[6799]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[6812]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[6827]: BufferDataARB (will be remapped) */
+   /* _mesa_function_pool[6840]: BufferDataARB (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[6862]: FlushVertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[6875]: FlushVertexArrayRangeNV (will be remapped) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[6890]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[6903]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[6910]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[6923]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[6930]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[6943]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[6950]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6963]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6976]: GetTexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[6989]: GetTexFilterFuncSGIS (dynamic) */
    "iip\0"
    "glGetTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[7004]: Scissor (offset 176) */
+   /* _mesa_function_pool[7017]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[7020]: Fogf (offset 153) */
+   /* _mesa_function_pool[7033]: Fogf (offset 153) */
    "if\0"
    "glFogf\0"
    "\0"
-   /* _mesa_function_pool[7031]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[7044]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[7076]: TexSubImage1D (offset 332) */
+   /* _mesa_function_pool[7089]: TexSubImage1D (offset 332) */
    "iiiiiip\0"
    "glTexSubImage1D\0"
    "glTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[7120]: VertexAttrib1sARB (will be remapped) */
+   /* _mesa_function_pool[7133]: VertexAttrib1sARB (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[7161]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[7174]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[7177]: Color4usv (offset 40) */
+   /* _mesa_function_pool[7190]: Color4usv (offset 40) */
    "p\0"
    "glColor4usv\0"
    "\0"
-   /* _mesa_function_pool[7192]: Fogi (offset 155) */
+   /* _mesa_function_pool[7205]: Fogi (offset 155) */
    "ii\0"
    "glFogi\0"
    "\0"
-   /* _mesa_function_pool[7203]: DepthRange (offset 288) */
+   /* _mesa_function_pool[7216]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[7220]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[7233]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[7238]: FinalCombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[7251]: FinalCombinerInputNV (will be remapped) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[7267]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[7280]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[7284]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[7297]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[7302]: Color4ui (offset 37) */
+   /* _mesa_function_pool[7315]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[7319]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[7332]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[7338]: Color3usv (offset 24) */
+   /* _mesa_function_pool[7351]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[7353]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[7366]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[7373]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[7386]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[7390]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[7403]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7439]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[7452]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[7456]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[7469]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[7475]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[7488]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[7494]: Uniform1fARB (will be remapped) */
+   /* _mesa_function_pool[7507]: Uniform1fARB (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[7525]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[7538]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[7577]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[7590]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[7594]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[7607]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[7643]: ColorTableParameteriv (offset 341) */
+   /* _mesa_function_pool[7656]: ColorTableParameteriv (offset 341) */
    "iip\0"
    "glColorTableParameteriv\0"
    "glColorTableParameterivSGI\0"
    "\0"
-   /* _mesa_function_pool[7699]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[7712]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[7730]: WindowPos3dMESA (will be remapped) */
+   /* _mesa_function_pool[7743]: WindowPos3dMESA (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[7784]: Color4us (offset 39) */
+   /* _mesa_function_pool[7797]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[7801]: PointParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[7814]: PointParameterfvEXT (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[7891]: Color3bv (offset 10) */
+   /* _mesa_function_pool[7904]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[7905]: WindowPos2fvMESA (will be remapped) */
+   /* _mesa_function_pool[7918]: WindowPos2fvMESA (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[7960]: SecondaryColor3bvEXT (will be remapped) */
+   /* _mesa_function_pool[7973]: SecondaryColor3bvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[8006]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[8019]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[8036]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[8049]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[8073]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[8086]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[8102]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[8115]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[8144]: RenderbufferStorageEXT (will be remapped) */
+   /* _mesa_function_pool[8157]: RenderbufferStorageEXT (will be remapped) */
    "iiii\0"
    "glRenderbufferStorage\0"
    "glRenderbufferStorageEXT\0"
    "\0"
-   /* _mesa_function_pool[8197]: IsFenceNV (will be remapped) */
+   /* _mesa_function_pool[8210]: IsFenceNV (will be remapped) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[8212]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[8225]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[8234]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[8247]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[8264]: UniformMatrix2fvARB (will be remapped) */
+   /* _mesa_function_pool[8277]: UniformMatrix2fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[8311]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[8324]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[8355]: ColorTable (offset 339) */
+   /* _mesa_function_pool[8368]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[8408]: IndexPointer (offset 314) */
+   /* _mesa_function_pool[8421]: IndexPointer (offset 314) */
    "iip\0"
    "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[8428]: Accum (offset 213) */
+   /* _mesa_function_pool[8441]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[8440]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[8453]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[8461]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[8474]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[8493]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[8506]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[8549]: Finish (offset 216) */
+   /* _mesa_function_pool[8562]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[8560]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[8573]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[8584]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[8597]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[8602]: VertexAttrib3dvARB (will be remapped) */
+   /* _mesa_function_pool[8615]: VertexAttrib3dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[8645]: Uniform4uivEXT (will be remapped) */
+   /* _mesa_function_pool[8658]: Uniform4uivEXT (will be remapped) */
    "iip\0"
    "glUniform4uivEXT\0"
    "glUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[8681]: HintPGI (dynamic) */
+   /* _mesa_function_pool[8694]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[8695]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[8708]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[8753]: Color4s (offset 33) */
+   /* _mesa_function_pool[8766]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[8769]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[8782]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[8794]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[8807]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[8812]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[8825]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[8829]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[8842]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[8844]: CullParameterdvEXT (dynamic) */
+   /* _mesa_function_pool[8857]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[8869]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[8882]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[8906]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[8919]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[8935]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[8948]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[8992]: Color4i (offset 31) */
+   /* _mesa_function_pool[9005]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[9008]: Color4f (offset 29) */
+   /* _mesa_function_pool[9021]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[9024]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[9037]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[9042]: Color4d (offset 27) */
+   /* _mesa_function_pool[9055]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[9058]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[9071]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[9074]: Color4b (offset 25) */
+   /* _mesa_function_pool[9087]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[9090]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[9103]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[9107]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[9120]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[9137]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[9150]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[9155]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[9168]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[9213]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[9226]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[9234]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[9247]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[9253]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[9266]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[9280]: BeginTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[9293]: BeginTransformFeedbackEXT (will be remapped) */
    "i\0"
    "glBeginTransformFeedbackEXT\0"
    "glBeginTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[9336]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[9349]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[9358]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[9371]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[9374]: EndList (offset 1) */
+   /* _mesa_function_pool[9387]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[9386]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[9399]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[9410]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[9423]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[9440]: Uniform3fvARB (will be remapped) */
+   /* _mesa_function_pool[9453]: Uniform3fvARB (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[9474]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[9487]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[9492]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[9505]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[9543]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[9556]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[9562]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[9575]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[9577]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[9590]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[9605]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[9618]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[9633]: CheckFramebufferStatusEXT (will be remapped) */
+   /* _mesa_function_pool[9646]: CheckFramebufferStatusEXT (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "\0"
-   /* _mesa_function_pool[9689]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[9702]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[9717]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[9730]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[9735]: GetVertexAttribivARB (will be remapped) */
+   /* _mesa_function_pool[9748]: GetVertexAttribivARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[9783]: BlendFunciARB (will be remapped) */
+   /* _mesa_function_pool[9796]: BlendFunciARB (will be remapped) */
    "iii\0"
    "glBlendFunciARB\0"
    "\0"
-   /* _mesa_function_pool[9804]: GetCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[9817]: GetCombinerInputParameterfvNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9843]: GetTexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[9856]: GetTexParameterIivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIivEXT\0"
    "glGetTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[9893]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[9906]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[9911]: LoadTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[9924]: LoadTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[9963]: ReleaseShaderCompiler (will be remapped) */
+   /* _mesa_function_pool[9976]: ReleaseShaderCompiler (will be remapped) */
    "\0"
    "glReleaseShaderCompiler\0"
    "\0"
-   /* _mesa_function_pool[9989]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[10002]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[10023]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[10036]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[10051]: SecondaryColor3sEXT (will be remapped) */
+   /* _mesa_function_pool[10064]: SecondaryColor3sEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[10097]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10110]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10123]: GetInteger64i_v (will be remapped) */
+   /* _mesa_function_pool[10136]: GetInteger64i_v (will be remapped) */
    "iip\0"
    "glGetInteger64i_v\0"
    "\0"
-   /* _mesa_function_pool[10146]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[10159]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[10161]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[10174]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[10188]: Color3us (offset 23) */
+   /* _mesa_function_pool[10201]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[10204]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[10217]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[10239]: VertexAttrib4ivARB (will be remapped) */
+   /* _mesa_function_pool[10252]: VertexAttrib4ivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[10282]: End (offset 43) */
+   /* _mesa_function_pool[10295]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[10290]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[10303]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[10315]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[10328]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[10341]: GetQueryObjectui64vEXT (will be remapped) */
+   /* _mesa_function_pool[10354]: GetQueryObjectui64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[10371]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[10384]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[10416]: SecondaryColor3dEXT (will be remapped) */
+   /* _mesa_function_pool[10429]: SecondaryColor3dEXT (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[10462]: Color3ub (offset 19) */
+   /* _mesa_function_pool[10475]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[10478]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[10491]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[10510]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[10523]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[10535]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10548]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10570]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[10583]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[10593]: GetUniformuivEXT (will be remapped) */
+   /* _mesa_function_pool[10606]: GetUniformuivEXT (will be remapped) */
    "iip\0"
    "glGetUniformuivEXT\0"
    "glGetUniformuiv\0"
    "\0"
-   /* _mesa_function_pool[10633]: Color3ui (offset 21) */
+   /* _mesa_function_pool[10646]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[10649]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[10662]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[10666]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[10679]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[10712]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[10725]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[10739]: GetTexParameterPointervAPPLE (will be remapped) */
+   /* _mesa_function_pool[10752]: GetTexParameterPointervAPPLE (will be remapped) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[10775]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[10788]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[10791]: GetTransformFeedbackVaryingEXT (will be remapped) */
+   /* _mesa_function_pool[10804]: GetTransformFeedbackVaryingEXT (will be remapped) */
    "iiipppp\0"
    "glGetTransformFeedbackVaryingEXT\0"
    "glGetTransformFeedbackVarying\0"
    "\0"
-   /* _mesa_function_pool[10863]: VertexAttrib4bvARB (will be remapped) */
+   /* _mesa_function_pool[10876]: VertexAttrib4bvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[10906]: ShaderBinary (will be remapped) */
+   /* _mesa_function_pool[10919]: ShaderBinary (will be remapped) */
    "ipipi\0"
    "glShaderBinary\0"
    "\0"
-   /* _mesa_function_pool[10928]: GetIntegerIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[10941]: GetIntegerIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "glGetIntegeri_v\0"
    "\0"
-   /* _mesa_function_pool[10973]: MultiTexCoord4sARB (offset 406) */
+   /* _mesa_function_pool[10986]: MultiTexCoord4sARB (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[11019]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[11032]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11052]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[11065]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[11076]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[11089]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "\0"
-   /* _mesa_function_pool[11101]: WindowPos2dMESA (will be remapped) */
+   /* _mesa_function_pool[11114]: WindowPos2dMESA (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[11154]: FramebufferTexture3DEXT (will be remapped) */
+   /* _mesa_function_pool[11167]: FramebufferTexture3DEXT (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "\0"
-   /* _mesa_function_pool[11211]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[11224]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "\0"
-   /* _mesa_function_pool[11249]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[11262]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[11274]: VertexAttrib3dARB (will be remapped) */
+   /* _mesa_function_pool[11287]: VertexAttrib3dARB (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[11317]: VertexAttribI4usvEXT (will be remapped) */
+   /* _mesa_function_pool[11330]: VertexAttribI4usvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4usvEXT\0"
    "glVertexAttribI4usv\0"
    "\0"
-   /* _mesa_function_pool[11364]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11377]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11428]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[11441]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[11472]: GetError (offset 261) */
+   /* _mesa_function_pool[11485]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[11485]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[11498]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[11504]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[11517]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[11521]: Indexdv (offset 45) */
+   /* _mesa_function_pool[11534]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[11534]: FramebufferTexture2DEXT (will be remapped) */
+   /* _mesa_function_pool[11547]: FramebufferTexture2DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "\0"
-   /* _mesa_function_pool[11590]: Normal3s (offset 60) */
+   /* _mesa_function_pool[11603]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[11606]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[11619]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[11640]: PushName (offset 201) */
+   /* _mesa_function_pool[11653]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[11654]: MultiTexCoord2dvARB (offset 385) */
+   /* _mesa_function_pool[11667]: MultiTexCoord2dvARB (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[11699]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[11712]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[11724]: Normal3i (offset 58) */
+   /* _mesa_function_pool[11737]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[11740]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[11753]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[11775]: SecondaryColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[11788]: SecondaryColorPointerEXT (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[11832]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[11845]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[11875]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[11888]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[11904]: GetActiveUniformARB (will be remapped) */
+   /* _mesa_function_pool[11917]: GetActiveUniformARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[11954]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[11967]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[11988]: Normal3b (offset 52) */
+   /* _mesa_function_pool[12001]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[12004]: Normal3d (offset 54) */
+   /* _mesa_function_pool[12017]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[12020]: Uniform1uiEXT (will be remapped) */
+   /* _mesa_function_pool[12033]: Uniform1uiEXT (will be remapped) */
    "ii\0"
    "glUniform1uiEXT\0"
    "glUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[12053]: Normal3f (offset 56) */
+   /* _mesa_function_pool[12066]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[12069]: MultiTexCoord1svARB (offset 383) */
+   /* _mesa_function_pool[12082]: MultiTexCoord1svARB (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[12114]: Indexi (offset 48) */
+   /* _mesa_function_pool[12127]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[12126]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[12139]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[12159]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[12172]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[12187]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[12200]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[12208]: DeformationMap3dSGIX (dynamic) */
-   "iddiiddiiddiip\0"
-   "glDeformationMap3dSGIX\0"
-   "\0"
-   /* _mesa_function_pool[12247]: BindBufferRangeEXT (will be remapped) */
+   /* _mesa_function_pool[12221]: BindBufferRangeEXT (will be remapped) */
    "iiiii\0"
    "glBindBufferRangeEXT\0"
    "glBindBufferRange\0"
    "\0"
-   /* _mesa_function_pool[12293]: DepthMask (offset 211) */
+   /* _mesa_function_pool[12267]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[12308]: IsShader (will be remapped) */
+   /* _mesa_function_pool[12282]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[12322]: Indexf (offset 46) */
+   /* _mesa_function_pool[12296]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[12334]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[12308]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[12372]: Indexd (offset 44) */
+   /* _mesa_function_pool[12346]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[12384]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[12358]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[12405]: StencilOp (offset 244) */
+   /* _mesa_function_pool[12379]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[12422]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[12396]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[12444]: FramebufferTextureLayer (dynamic) */
+   /* _mesa_function_pool[12418]: FramebufferTextureLayer (dynamic) */
    "iiiii\0"
    "glFramebufferTextureLayerARB\0"
    "\0"
-   /* _mesa_function_pool[12480]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[12454]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[12525]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[12499]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[12541]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[12515]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[12587]: Indexs (offset 50) */
+   /* _mesa_function_pool[12561]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[12599]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[12573]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[12619]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[12593]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[12641]: BlendFuncSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[12615]: BlendFuncSeparateiARB (will be remapped) */
    "iiiii\0"
    "glBlendFuncSeparateiARB\0"
    "\0"
-   /* _mesa_function_pool[12672]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[12646]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[12710]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[12684]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[12742]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[12716]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[12769]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[12743]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[12784]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[12758]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[12801]: VertexAttribI1uivEXT (will be remapped) */
+   /* _mesa_function_pool[12775]: VertexAttribI1uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1uivEXT\0"
    "glVertexAttribI1uiv\0"
    "\0"
-   /* _mesa_function_pool[12848]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[12822]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[12863]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[12837]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[12916]: Color4bv (offset 26) */
+   /* _mesa_function_pool[12890]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[12930]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[12904]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[12952]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[12926]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[13000]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[12974]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[13025]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[12999]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[13073]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[13047]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[13097]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[13071]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[13132]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[13106]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[13150]: LogicOp (offset 242) */
+   /* _mesa_function_pool[13124]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[13163]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[13137]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[13187]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[13161]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[13202]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[13176]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[13278]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[13252]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[13295]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[13269]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[13315]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[13289]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[13342]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[13316]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[13387]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[13361]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[13402]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13376]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13434]: VertexAttribI4svEXT (will be remapped) */
+   /* _mesa_function_pool[13408]: VertexAttribI4svEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4svEXT\0"
    "glVertexAttribI4sv\0"
    "\0"
-   /* _mesa_function_pool[13479]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[13453]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[13507]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[13481]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[13531]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[13505]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[13592]: ClearBufferuiv (will be remapped) */
+   /* _mesa_function_pool[13566]: ClearBufferuiv (will be remapped) */
    "iip\0"
    "glClearBufferuiv\0"
    "\0"
-   /* _mesa_function_pool[13614]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[13588]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[13638]: GenTextures (offset 328) */
+   /* _mesa_function_pool[13612]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[13673]: FramebufferTextureARB (will be remapped) */
+   /* _mesa_function_pool[13647]: FramebufferTextureARB (will be remapped) */
    "iiii\0"
    "glFramebufferTextureARB\0"
    "\0"
-   /* _mesa_function_pool[13703]: SetFenceNV (will be remapped) */
+   /* _mesa_function_pool[13677]: SetFenceNV (will be remapped) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[13720]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[13694]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[13776]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[13750]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[13815]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[13789]: MultiModeDrawArraysIBM (will be remapped) */
+   "pppii\0"
+   "glMultiModeDrawArraysIBM\0"
+   "\0"
+   /* _mesa_function_pool[13821]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[13848]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[13854]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[13870]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13876]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13898]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[13904]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[13916]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[13922]: GetCombinerOutputParameterfvNV (will be remapped) */
+   "iiip\0"
+   "glGetCombinerOutputParameterfvNV\0"
+   "\0"
+   /* _mesa_function_pool[13961]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[13934]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[13979]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[13949]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[13994]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[13965]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[14010]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[13982]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[14027]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[14006]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[14051]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[14023]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[14068]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[14078]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[14123]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[14093]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[14138]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[14112]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[14157]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[14141]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[14186]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[14184]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[14229]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[14228]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[14273]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[14244]: EndTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[14289]: EndTransformFeedbackEXT (will be remapped) */
    "\0"
    "glEndTransformFeedbackEXT\0"
    "glEndTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[14295]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[14340]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[14329]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[14374]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[14358]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[14403]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[14403]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[14448]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[14459]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[14504]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[14480]: GetShaderPrecisionFormat (will be remapped) */
+   /* _mesa_function_pool[14525]: GetShaderPrecisionFormat (will be remapped) */
    "iipp\0"
    "glGetShaderPrecisionFormat\0"
    "\0"
-   /* _mesa_function_pool[14513]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[14558]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[14543]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[14588]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[14578]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[14623]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[14597]: Flush (offset 217) */
+   /* _mesa_function_pool[14642]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[14607]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[14652]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[14622]: VertexAttribI4iEXT (will be remapped) */
+   /* _mesa_function_pool[14667]: VertexAttribI4iEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4iEXT\0"
    "glVertexAttribI4i\0"
    "\0"
-   /* _mesa_function_pool[14668]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[14713]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[14690]: Uniform3uivEXT (will be remapped) */
+   /* _mesa_function_pool[14735]: Uniform3uivEXT (will be remapped) */
    "iip\0"
    "glUniform3uivEXT\0"
    "glUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[14726]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[14771]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[14744]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[14789]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[14787]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[14832]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[14811]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[14856]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[14827]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[14872]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[14845]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[14890]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[14887]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[14932]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[14909]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[14954]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[14929]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[14974]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[14970]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[15015]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[15025]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[15070]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[15043]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[15088]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[15067]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[15112]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[15085]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[15130]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[15103]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[15148]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[15157]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[15202]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[15199]: Color4ub (offset 35) */
+   /* _mesa_function_pool[15244]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[15216]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[15261]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[15236]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[15281]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[15265]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[15310]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[15283]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[15328]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[15343]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[15388]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[15362]: Indexiv (offset 49) */
+   /* _mesa_function_pool[15407]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[15375]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[15420]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[15393]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[15438]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[15437]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[15482]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[15497]: Frustum (offset 289) */
+   /* _mesa_function_pool[15542]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[15515]: GetString (offset 275) */
+   /* _mesa_function_pool[15560]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[15530]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[15575]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[15556]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[15601]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[15571]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[15616]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[15589]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[15634]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[15619]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[15664]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[15637]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[15682]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[15682]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[15727]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[15726]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[15771]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[15769]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[15814]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[15810]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[15855]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[15838]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[15883]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[15873]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[15918]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[15891]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[15936]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[15922]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[15967]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[15956]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[16001]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[15981]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[16026]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[16037]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[16082]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[16056]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[16101]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[16072]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[16117]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[16120]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[16165]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[16166]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[16211]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[16183]: VertexAttribI4uiEXT (will be remapped) */
+   /* _mesa_function_pool[16228]: VertexAttribI4uiEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4uiEXT\0"
    "glVertexAttribI4ui\0"
    "\0"
-   /* _mesa_function_pool[16231]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[16276]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[16264]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[16309]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[16291]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16336]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[16318]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[16363]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[16355]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[16400]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[16375]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[16420]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[16396]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[16441]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[16423]: Rectd (offset 86) */
+   /* _mesa_function_pool[16468]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[16437]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16482]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[16463]: TextureBarrierNV (will be remapped) */
+   /* _mesa_function_pool[16508]: TextureBarrierNV (will be remapped) */
    "\0"
    "glTextureBarrierNV\0"
    "\0"
-   /* _mesa_function_pool[16484]: VertexAttribI4ubvEXT (will be remapped) */
+   /* _mesa_function_pool[16529]: VertexAttribI4ubvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ubvEXT\0"
    "glVertexAttribI4ubv\0"
    "\0"
-   /* _mesa_function_pool[16531]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[16576]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[16578]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[16623]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[16597]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[16642]: BlendEquationSeparateiARB (will be remapped) */
+   "iii\0"
+   "glBlendEquationSeparateiARB\0"
+   "\0"
+   /* _mesa_function_pool[16675]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[16642]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[16720]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[16667]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[16745]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[16697]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[16775]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[16744]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[16822]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[16792]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[16870]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[16850]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[16928]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[16884]: Lightfv (offset 160) */
+   /* _mesa_function_pool[16962]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[16899]: PrimitiveRestartIndexNV (will be remapped) */
+   /* _mesa_function_pool[16977]: PrimitiveRestartIndexNV (will be remapped) */
    "i\0"
    "glPrimitiveRestartIndexNV\0"
    "glPrimitiveRestartIndex\0"
    "\0"
-   /* _mesa_function_pool[16952]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[17030]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[16968]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[17046]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[16988]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[17066]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[17010]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[17088]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[17053]: Color4fv (offset 30) */
+   /* _mesa_function_pool[17131]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[17067]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[17145]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[17112]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[17190]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[17149]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[17227]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[17170]: Rects (offset 92) */
+   /* _mesa_function_pool[17248]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[17184]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17262]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17218]: CreateShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[17296]: CreateShaderProgramEXT (will be remapped) */
    "ip\0"
    "glCreateShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[17247]: ActiveProgramEXT (will be remapped) */
+   /* _mesa_function_pool[17325]: ActiveProgramEXT (will be remapped) */
    "i\0"
    "glActiveProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[17269]: Lightiv (offset 162) */
+   /* _mesa_function_pool[17347]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[17284]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[17362]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[17328]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[17406]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[17376]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[17454]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[17401]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[17479]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[17425]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[17503]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[17470]: ClearBufferfv (will be remapped) */
+   /* _mesa_function_pool[17548]: ClearBufferfv (will be remapped) */
    "iip\0"
    "glClearBufferfv\0"
    "\0"
-   /* _mesa_function_pool[17491]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[17569]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[17534]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[17612]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[17560]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[17638]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[17586]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[17664]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[17604]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[17682]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[17647]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[17725]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[17701]: Rectdv (offset 87) */
+   /* _mesa_function_pool[17779]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[17714]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[17792]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[17740]: BlendEquationiARB (will be remapped) */
+   /* _mesa_function_pool[17818]: BlendEquationiARB (will be remapped) */
    "ii\0"
    "glBlendEquationiARB\0"
    "\0"
-   /* _mesa_function_pool[17764]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[17842]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[17823]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[17901]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[17851]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[17929]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[17896]: DrawArraysInstancedARB (will be remapped) */
+   /* _mesa_function_pool[17974]: DrawArraysInstancedARB (will be remapped) */
    "iiii\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "glDrawArraysInstanced\0"
    "\0"
-   /* _mesa_function_pool[17974]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[18052]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[18001]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[18079]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[18028]: ClearBufferfi (will be remapped) */
+   /* _mesa_function_pool[18106]: ClearBufferfi (will be remapped) */
    "iifi\0"
    "glClearBufferfi\0"
    "\0"
-   /* _mesa_function_pool[18050]: Materialiv (offset 172) */
+   /* _mesa_function_pool[18128]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[18068]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[18146]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[18090]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[18168]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[18125]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[18203]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[18171]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[18249]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[18224]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[18302]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[18261]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[18339]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[18307]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[18385]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[18325]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[18403]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[18389]: VertexAttribI1iEXT (will be remapped) */
+   /* _mesa_function_pool[18467]: VertexAttribI1iEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1iEXT\0"
    "glVertexAttribI1i\0"
    "\0"
-   /* _mesa_function_pool[18432]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[18510]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[18459]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[18537]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[18486]: VertexAttribIPointerEXT (will be remapped) */
+   /* _mesa_function_pool[18564]: VertexAttribIPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexAttribIPointerEXT\0"
    "glVertexAttribIPointer\0"
    "\0"
-   /* _mesa_function_pool[18542]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[18620]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[18570]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[18648]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[18608]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[18686]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[18626]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[18704]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[18650]: TexGeni (offset 192) */
+   /* _mesa_function_pool[18728]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[18665]: TexGenf (offset 190) */
+   /* _mesa_function_pool[18743]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[18680]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[18758]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[18713]: TexGend (offset 188) */
+   /* _mesa_function_pool[18791]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[18728]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[18806]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[18755]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[18833]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[18778]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[18856]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[18797]: BindBufferOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[18875]: BindBufferOffsetEXT (will be remapped) */
    "iiii\0"
    "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[18825]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[18903]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[18879]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[18957]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[18903]: DisableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[18981]: DisableIndexedEXT (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "glDisablei\0"
    "\0"
-   /* _mesa_function_pool[18938]: BindBufferBaseEXT (will be remapped) */
+   /* _mesa_function_pool[19016]: BindBufferBaseEXT (will be remapped) */
    "iii\0"
    "glBindBufferBaseEXT\0"
    "glBindBufferBase\0"
    "\0"
-   /* _mesa_function_pool[18980]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[19058]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[19009]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[19087]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[19033]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[19111]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[19080]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[19158]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[19130]: PixelTexGenSGIX (will be remapped) */
+   /* _mesa_function_pool[19208]: PixelTexGenSGIX (will be remapped) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[19151]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[19229]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[19178]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[19256]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[19212]: Color4sv (offset 34) */
+   /* _mesa_function_pool[19290]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[19226]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[19304]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[19256]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[19334]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[19288]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[19366]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[19323]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[19401]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[19339]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[19417]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[19372]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[19450]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[19430]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[19508]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[19486]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[19564]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[19516]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[19594]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[19536]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[19614]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[19555]: Color3dv (offset 12) */
+   /* _mesa_function_pool[19633]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[19569]: IsTexture (offset 330) */
+   /* _mesa_function_pool[19647]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[19599]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[19677]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[19622]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[19700]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[19663]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[19741]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[19698]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[19776]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[19717]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[19795]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[19756]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[19834]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[19786]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[19864]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[19818]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[19896]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[19847]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[19925]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[19863]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[19941]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[19891]: GetStringi (will be remapped) */
+   /* _mesa_function_pool[19969]: GetStringi (will be remapped) */
    "ii\0"
    "glGetStringi\0"
    "\0"
-   /* _mesa_function_pool[19908]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[19986]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[19950]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[20028]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[19968]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[20046]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[19994]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[20072]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[20043]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[20121]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[20061]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[20139]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[20106]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[20184]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[20140]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[20218]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[20164]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[20242]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[20203]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[20281]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[20232]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[20310]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[20250]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[20328]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[20293]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[20371]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[20313]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[20391]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[20381]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[20459]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[20436]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[20514]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[20474]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[20552]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[20508]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[20586]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[20556]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[20634]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[20584]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[20662]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[20637]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[20715]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[20658]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[20736]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[20685]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[20763]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[20717]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[20795]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[20741]: TransformFeedbackVaryingsEXT (will be remapped) */
+   /* _mesa_function_pool[20819]: TransformFeedbackVaryingsEXT (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryingsEXT\0"
    "glTransformFeedbackVaryings\0"
    "\0"
-   /* _mesa_function_pool[20806]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[20884]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[20828]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[20906]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[20846]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[20924]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[20869]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[20947]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[20896]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[20974]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[20946]: Color3s (offset 17) */
+   /* _mesa_function_pool[21024]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[20961]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[21039]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[20995]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[21073]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[21048]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[21126]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[21067]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[21145]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[21091]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[21169]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[21135]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[21213]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[21158]: Color3i (offset 15) */
+   /* _mesa_function_pool[21236]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[21173]: FrontFace (offset 157) */
+   /* _mesa_function_pool[21251]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[21188]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[21266]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[21206]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[21284]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[21254]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[21332]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[21272]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[21350]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[21315]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[21393]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[21365]: Color3b (offset 9) */
+   /* _mesa_function_pool[21443]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[21380]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[21458]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[21424]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[21502]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[21448]: Color3f (offset 13) */
+   /* _mesa_function_pool[21526]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[21463]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[21541]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[21483]: Color3d (offset 11) */
+   /* _mesa_function_pool[21561]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[21498]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[21576]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[21513]: Lightf (offset 159) */
+   /* _mesa_function_pool[21591]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[21527]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[21605]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[21553]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[21631]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[21569]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[21647]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[21590]: Lighti (offset 161) */
+   /* _mesa_function_pool[21668]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[21604]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[21682]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[21635]: ClearDepthf (will be remapped) */
+   /* _mesa_function_pool[21713]: ClearDepthf (will be remapped) */
    "f\0"
    "glClearDepthf\0"
    "\0"
-   /* _mesa_function_pool[21652]: GetBooleanIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[21730]: GetBooleanIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "glGetBooleani_v\0"
    "\0"
-   /* _mesa_function_pool[21697]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[21775]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[21782]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[21860]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[21817]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[21895]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[21862]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[21940]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[21897]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[21975]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[21914]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[21992]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[21931]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[22009]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[21948]: VertexAttribI4bvEXT (will be remapped) */
+   /* _mesa_function_pool[22026]: VertexAttribI4bvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4bvEXT\0"
    "glVertexAttribI4bv\0"
    "\0"
-   /* _mesa_function_pool[21993]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[22071]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[22036]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[22114]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[22067]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[22145]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[22122]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[22200]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[22147]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[22225]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[22173]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[22251]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[22218]: Uniform2uiEXT (will be remapped) */
+   /* _mesa_function_pool[22296]: Uniform2uiEXT (will be remapped) */
    "iii\0"
    "glUniform2uiEXT\0"
    "glUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[22252]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[22330]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[22279]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[22357]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[22301]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[22379]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[22328]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[22406]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[22357]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[22435]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[22383]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[22461]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[22406]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[22484]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[22425]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[22503]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[22452]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[22530]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[22470]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[22548]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[22515]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[22593]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[22558]: ClearColor (offset 206) */
+   /* _mesa_function_pool[22636]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[22577]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[22655]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[22596]: ClearColorIiEXT (will be remapped) */
+   /* _mesa_function_pool[22674]: ClearColorIiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIiEXT\0"
    "\0"
-   /* _mesa_function_pool[22620]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[22698]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[22669]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[22747]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[22696]: IsEnabledIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[22774]: IsEnabledIndexedEXT (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "glIsEnabledi\0"
    "\0"
-   /* _mesa_function_pool[22735]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[22813]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[22751]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[22829]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[22799]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[22877]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[22819]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[22897]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[22867]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[22945]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[22891]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[22969]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[22932]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[23010]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[22964]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[23042]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[22982]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[23060]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[23074]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[23152]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[23105]: Bitmap (offset 8) */
+   /* _mesa_function_pool[23183]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[23123]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[23201]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[23168]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[23246]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[23199]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[23277]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[23235]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[23313]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[23278]: VertexAttribDivisor (will be remapped) */
+   /* _mesa_function_pool[23356]: VertexAttribDivisor (will be remapped) */
    "ii\0"
    "glVertexAttribDivisor\0"
    "\0"
-   /* _mesa_function_pool[23304]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[23382]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[23336]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[23414]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[23351]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[23429]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[23369]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[23447]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[23409]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[23487]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[23436]: VertexAttribDivisorARB (will be remapped) */
+   /* _mesa_function_pool[23514]: VertexAttribDivisorARB (will be remapped) */
    "ii\0"
    "glVertexAttribDivisorARB\0"
    "\0"
-   /* _mesa_function_pool[23465]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[23543]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[23484]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[23562]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[23532]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[23610]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[23567]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[23645]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[23594]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[23672]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[23618]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[23696]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[23652]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[23730]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[23704]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[23782]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[23723]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[23801]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[23754]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[23832]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[23792]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[23870]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[23835]: VertexAttribI2ivEXT (will be remapped) */
+   /* _mesa_function_pool[23913]: VertexAttribI2ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2ivEXT\0"
    "glVertexAttribI2iv\0"
    "\0"
-   /* _mesa_function_pool[23880]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[23958]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[23900]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[23978]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[23971]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[24049]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[23993]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[24071]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[24013]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[24091]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[24067]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[24145]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[24120]: ProgramParameteriARB (will be remapped) */
+   /* _mesa_function_pool[24198]: ProgramParameteriARB (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "\0"
-   /* _mesa_function_pool[24148]: Map1d (offset 220) */
+   /* _mesa_function_pool[24226]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[24164]: Map1f (offset 221) */
+   /* _mesa_function_pool[24242]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[24180]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[24258]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[24239]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[24317]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[24275]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[24353]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[24299]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[24377]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[24320]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[24398]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[24351]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[24429]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[24390]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[24468]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[24412]: GetFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[24490]: GetFragDataLocationEXT (will be remapped) */
    "ip\0"
    "glGetFragDataLocationEXT\0"
    "glGetFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[24463]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[24541]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[24517]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[24595]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[24538]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[24616]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[24584]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[24662]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[24599]: Fogiv (offset 156) */
+   /* _mesa_function_pool[24677]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[24611]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[24689]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[24628]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[24706]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[24664]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[24742]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[24685]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[24763]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[24712]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[24790]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[24736]: Rotatef (offset 300) */
+   /* _mesa_function_pool[24814]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[24752]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[24830]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[24794]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[24872]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[24810]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[24888]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[24826]: Clear (offset 203) */
+   /* _mesa_function_pool[24904]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[24837]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[24915]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[24853]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[24931]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[24880]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[24958]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[24914]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[24992]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[24930]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[25008]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[24986]: Ortho (offset 296) */
+   /* _mesa_function_pool[25064]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[25002]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[25080]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[25023]: ListBase (offset 6) */
+   /* _mesa_function_pool[25101]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[25037]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[25115]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[25053]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[25131]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[25109]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[25187]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[25201]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[25279]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[25258]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[25336]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[25274]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[25352]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[25300]: Rectiv (offset 91) */
+   /* _mesa_function_pool[25378]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[25313]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[25391]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[25351]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[25429]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[25378]: EndConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[25456]: EndConditionalRenderNV (will be remapped) */
    "\0"
    "glEndConditionalRenderNV\0"
    "glEndConditionalRender\0"
    "\0"
-   /* _mesa_function_pool[25428]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[25506]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[25451]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[25529]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[25470]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[25548]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[25489]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[25567]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[25509]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[25587]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[25555]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[25633]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[25588]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[25666]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[25603]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[25681]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[25648]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[25726]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[25693]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[25771]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[25739]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[25817]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[25774]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[25852]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[25789]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[25867]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[25837]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[25915]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[25872]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[25950]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[25915]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[25993]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[25932]: PauseTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[26010]: PauseTransformFeedback (will be remapped) */
    "\0"
    "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[25959]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[26037]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[26002]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[26080]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[26049]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[26127]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[26137]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[26215]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[26163]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[26241]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[26208]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[26286]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[26240]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[26318]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[26255]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[26333]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[26281]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[26359]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[26306]: LineWidth (offset 168) */
+   /* _mesa_function_pool[26384]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[26321]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[26399]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[26352]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[26430]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[26390]: TexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[26468]: TexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIuivEXT\0"
    "glTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[26436]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[26514]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[26456]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[26534]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[26477]: GetBufferParameteri64v (will be remapped) */
+   /* _mesa_function_pool[26555]: GetBufferParameteri64v (will be remapped) */
    "iip\0"
    "glGetBufferParameteri64v\0"
    "\0"
-   /* _mesa_function_pool[26507]: TexGendv (offset 189) */
+   /* _mesa_function_pool[26585]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[26523]: VertexAttribI3iEXT (will be remapped) */
+   /* _mesa_function_pool[26601]: VertexAttribI3iEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3iEXT\0"
    "glVertexAttribI3i\0"
    "\0"
-   /* _mesa_function_pool[26568]: EnableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[26646]: EnableIndexedEXT (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "glEnablei\0"
    "\0"
-   /* _mesa_function_pool[26601]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[26679]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[26626]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[26704]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[26647]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[26725]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[26681]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[26759]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[26708]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[26786]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[26731]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[26809]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[26757]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[26835]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[26821]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[26899]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[26847]: MultiModeDrawArraysIBM (will be remapped) */
-   "pppii\0"
-   "glMultiModeDrawArraysIBM\0"
-   "\0"
-   /* _mesa_function_pool[26879]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[26925]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[26923]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[26969]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[26954]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[27000]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[26991]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[27037]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[27012]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[27058]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[27034]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[27080]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[27069]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[27115]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[27090]: CallList (offset 2) */
+   /* _mesa_function_pool[27136]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[27104]: Materialfv (offset 170) */
+   /* _mesa_function_pool[27150]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[27122]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[27168]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[27139]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[27185]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[27171]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[27217]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[27216]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[27262]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[27264]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[27310]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[27309]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[27355]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[27327]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[27373]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[27380]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[27426]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[27411]: Color3iv (offset 16) */
+   /* _mesa_function_pool[27457]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[27425]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[27471]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[27459]: DrawElements (offset 311) */
+   /* _mesa_function_pool[27505]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[27480]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[27526]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[27506]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[27552]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[27543]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[27589]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[27603]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[27649]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[27646]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[27692]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[27701]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[27747]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[27724]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[27770]: TexBufferARB (will be remapped) */
+   "iii\0"
+   "glTexBufferARB\0"
+   "\0"
+   /* _mesa_function_pool[27790]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[27797]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[27863]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[27820]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[27886]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[27851]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[27917]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[27888]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[27954]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[27905]: Uniform1uivEXT (will be remapped) */
+   /* _mesa_function_pool[27971]: Uniform1uivEXT (will be remapped) */
    "iip\0"
    "glUniform1uivEXT\0"
    "glUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[27941]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[28007]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[27957]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[28023]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[27977]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[28043]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[27991]: GetVertexAttribIuivEXT (will be remapped) */
-   "iip\0"
-   "glGetVertexAttribIuivEXT\0"
-   "glGetVertexAttribIuiv\0"
-   "\0"
-   /* _mesa_function_pool[28043]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[28057]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[28062]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[28076]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[28082]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[28096]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[28131]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[28145]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[28177]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[28191]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[28196]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[28210]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[28222]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[28236]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[28265]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[28279]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[28290]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[28304]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[28335]: Map2d (offset 222) */
+   /* _mesa_function_pool[28349]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[28355]: Map2f (offset 223) */
+   /* _mesa_function_pool[28369]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[28375]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[28389]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[28400]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[28414]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[28417]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[28431]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[28446]: FragmentLightModelivSGIX (dynamic) */
+   /* _mesa_function_pool[28460]: FragmentLightModelivSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelivSGIX\0"
    "\0"
-   /* _mesa_function_pool[28477]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[28491]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[28500]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[28514]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[28517]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[28531]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[28534]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[28548]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[28551]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[28565]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[28569]: UseShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[28583]: UseShaderProgramEXT (will be remapped) */
    "ii\0"
    "glUseShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[28595]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[28609]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[28621]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[28635]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[28677]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[28691]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[28696]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[28710]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[28713]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[28727]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[28744]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[28758]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[28784]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[28798]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[28810]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[28824]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[28841]: Materialf (offset 169) */
+   /* _mesa_function_pool[28855]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[28858]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[28872]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[28903]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[28917]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[28928]: Materiali (offset 171) */
+   /* _mesa_function_pool[28942]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[28945]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[28959]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[28971]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[28985]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[29006]: Indexsv (offset 51) */
+   /* _mesa_function_pool[29020]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[29019]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[29033]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[29064]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[29078]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[29083]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[29097]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[29100]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[29114]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[29133]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[29147]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[29151]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[29165]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[29188]: Translated (offset 303) */
+   /* _mesa_function_pool[29202]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[29206]: Translatef (offset 304) */
+   /* _mesa_function_pool[29220]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[29224]: Uniform3uiEXT (will be remapped) */
+   /* _mesa_function_pool[29238]: Uniform3uiEXT (will be remapped) */
    "iiii\0"
    "glUniform3uiEXT\0"
    "glUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[29259]: StencilMask (offset 209) */
+   /* _mesa_function_pool[29273]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[29276]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[29290]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[29296]: ClampColorARB (will be remapped) */
+   /* _mesa_function_pool[29310]: ClampColorARB (will be remapped) */
    "ii\0"
    "glClampColorARB\0"
    "\0"
-   /* _mesa_function_pool[29316]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[29330]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[29334]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[29348]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[29360]: IsList (offset 287) */
+   /* _mesa_function_pool[29374]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[29372]: IsSync (will be remapped) */
+   /* _mesa_function_pool[29386]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[29384]: RenderMode (offset 196) */
+   /* _mesa_function_pool[29398]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[29400]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[29414]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[29433]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[29447]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "\0"
-   /* _mesa_function_pool[29485]: ClearBufferiv (will be remapped) */
+   /* _mesa_function_pool[29499]: ClearBufferiv (will be remapped) */
    "iip\0"
    "glClearBufferiv\0"
    "\0"
-   /* _mesa_function_pool[29506]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[29520]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[29543]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[29557]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[29571]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[29585]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[29613]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[29627]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[29656]: LoadName (offset 198) */
+   /* _mesa_function_pool[29670]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[29670]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[29684]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[29697]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[29711]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[29715]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[29729]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[29749]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[29763]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[29800]: CullFace (offset 152) */
+   /* _mesa_function_pool[29814]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[29814]: BindTexture (offset 307) */
+   /* _mesa_function_pool[29828]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[29849]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[29863]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[29876]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[29890]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[29922]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[29936]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[29948]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[29962]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[29967]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[29981]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[29987]: Rectsv (offset 93) */
+   /* _mesa_function_pool[30001]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[30000]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[30014]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[30027]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[30041]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[30085]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[30099]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[30111]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[30125]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[30174]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[30188]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[30229]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[30243]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[30256]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[30270]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[30277]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[30291]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[30299]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[30313]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[30327]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[30341]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[30351]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[30365]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[30396]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[30410]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[30415]: VertexAttribI3uivEXT (will be remapped) */
+   /* _mesa_function_pool[30429]: VertexAttribI3uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3uivEXT\0"
    "glVertexAttribI3uiv\0"
    "\0"
-   /* _mesa_function_pool[30462]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[30476]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[30489]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[30503]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[30505]: Recti (offset 90) */
+   /* _mesa_function_pool[30519]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[30519]: VertexAttribI3ivEXT (will be remapped) */
+   /* _mesa_function_pool[30533]: VertexAttribI3ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3ivEXT\0"
    "glVertexAttribI3iv\0"
    "\0"
-   /* _mesa_function_pool[30564]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[30578]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[30603]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[30617]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[30632]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[30646]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[30671]: PixelTransformParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[30685]: PixelTransformParameterfvEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[30707]: PrimitiveRestartNV (will be remapped) */
+   /* _mesa_function_pool[30721]: PrimitiveRestartNV (will be remapped) */
    "\0"
    "glPrimitiveRestartNV\0"
    "\0"
-   /* _mesa_function_pool[30730]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[30744]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[30752]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[30766]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[30773]: Rectf (offset 88) */
+   /* _mesa_function_pool[30787]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[30787]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[30801]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[30810]: Indexfv (offset 47) */
+   /* _mesa_function_pool[30824]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[30823]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[30837]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[30869]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[30883]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[30921]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[30935]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[30956]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[30970]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[30976]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[30990]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[31003]: IndexMask (offset 212) */
+   /* _mesa_function_pool[31017]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[31018]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[31032]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[31055]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[31069]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[31098]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[31112]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[31114]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[31128]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[31140]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[31154]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[31159]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[31173]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[31181]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[31195]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[31200]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[31214]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[31217]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[31231]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[31244]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[31258]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[31258]: Fogfv (offset 154) */
+   /* _mesa_function_pool[31272]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[31270]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[31284]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[31304]: InitNames (offset 197) */
+   /* _mesa_function_pool[31318]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[31318]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[31332]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[31333]: Minmax (offset 368) */
+   /* _mesa_function_pool[31347]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[31359]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[31373]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[31378]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[31392]: DeformationMap3dSGIX (dynamic) */
+   "iddiiddiiddiip\0"
+   "glDeformationMap3dSGIX\0"
+   "\0"
+   /* _mesa_function_pool[31431]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[31397]: FogCoorddvEXT (will be remapped) */
+   /* _mesa_function_pool[31450]: FogCoorddvEXT (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[31429]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[31482]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[31451]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[31504]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[31481]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[31534]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[31501]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[31554]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[31519]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[31572]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[31556]: Hint (offset 158) */
+   /* _mesa_function_pool[31609]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[31567]: Color4dv (offset 28) */
+   /* _mesa_function_pool[31620]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[31581]: VertexAttrib2svARB (will be remapped) */
+   /* _mesa_function_pool[31634]: VertexAttrib2svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[31624]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[31677]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[31653]: WindowPos3svMESA (will be remapped) */
+   /* _mesa_function_pool[31706]: WindowPos3svMESA (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[31708]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[31761]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[31758]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[31811]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[31776]: DeleteRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[31829]: DeleteRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[31827]: VertexAttrib4NubvARB (will be remapped) */
+   /* _mesa_function_pool[31880]: VertexAttrib4NubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[31874]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[31927]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[31898]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[31951]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[31929]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[31982]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[31944]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[31997]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[31979]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[32032]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[31996]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[32049]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[32016]: Begin (offset 7) */
+   /* _mesa_function_pool[32069]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[32027]: LightModeli (offset 165) */
+   /* _mesa_function_pool[32080]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[32045]: VertexAttribI4ivEXT (will be remapped) */
+   /* _mesa_function_pool[32098]: VertexAttribI4ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ivEXT\0"
    "glVertexAttribI4iv\0"
    "\0"
-   /* _mesa_function_pool[32090]: Rectfv (offset 89) */
+   /* _mesa_function_pool[32143]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[32103]: BlendEquationSeparateiARB (will be remapped) */
-   "iii\0"
-   "glBlendEquationSeparateiARB\0"
-   "\0"
-   /* _mesa_function_pool[32136]: LightModelf (offset 163) */
+   /* _mesa_function_pool[32156]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[32154]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[32174]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[32179]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[32199]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[32197]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[32217]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[32233]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[32253]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[32259]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[32279]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[32282]: GetCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[32302]: GetCombinerInputParameterivNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[32321]: Disable (offset 214) */
+   /* _mesa_function_pool[32341]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[32334]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[32354]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[32379]: GetRenderbufferParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[32399]: GetRenderbufferParameterivEXT (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[32445]: CombinerParameterivNV (will be remapped) */
+   /* _mesa_function_pool[32465]: CombinerParameterivNV (will be remapped) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[32473]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[32493]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[32500]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[32520]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[32534]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[32554]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[32553]: VertexAttrib2sARB (will be remapped) */
+   /* _mesa_function_pool[32573]: VertexAttrib2sARB (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[32595]: ColorMask (offset 210) */
+   /* _mesa_function_pool[32615]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[32613]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[32633]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[32638]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[32658]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[32657]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[32677]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[32687]: BindBufferARB (will be remapped) */
+   /* _mesa_function_pool[32707]: BindBufferARB (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[32720]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[32740]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[32742]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[32762]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[32760]: Enable (offset 215) */
+   /* _mesa_function_pool[32780]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[32772]: LineStipple (offset 167) */
+   /* _mesa_function_pool[32792]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[32790]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[32810]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[32816]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[32836]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[32846]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[32866]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[32873]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[32893]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[32927]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[32947]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[32970]: GenBuffersARB (will be remapped) */
+   /* _mesa_function_pool[32990]: GenBuffersARB (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[33003]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[33023]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[33029]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[33049]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[33044]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[33064]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[33075]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[33095]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[33096]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[33116]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[33126]: IsRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[33146]: IsRenderbufferEXT (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[33166]: GenProgramsNV (will be remapped) */
+   /* _mesa_function_pool[33186]: GenProgramsNV (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[33203]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[33223]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[33227]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[33247]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[33252]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[33272]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[33273]: WindowPos2fMESA (will be remapped) */
+   /* _mesa_function_pool[33293]: WindowPos2fMESA (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
@@ -4787,601 +4791,602 @@ static const char _mesa_function_pool[] =
 
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   {  1616, AttachShader_remap_index },
-   {  9893, CreateProgram_remap_index },
-   { 22964, CreateShader_remap_index },
-   { 25451, DeleteProgram_remap_index },
-   { 18608, DeleteShader_remap_index },
-   { 23465, DetachShader_remap_index },
-   { 17974, GetAttachedShaders_remap_index },
-   {  4856, GetProgramInfoLog_remap_index },
-   {   444, GetProgramiv_remap_index },
-   {  6529, GetShaderInfoLog_remap_index },
-   { 31140, GetShaderiv_remap_index },
-   { 13387, IsProgram_remap_index },
-   { 12308, IsShader_remap_index },
-   { 10023, StencilFuncSeparate_remap_index },
-   {  3960, StencilMaskSeparate_remap_index },
-   {  7594, StencilOpSeparate_remap_index },
-   { 22252, UniformMatrix2x3fv_remap_index },
-   {  2886, UniformMatrix2x4fv_remap_index },
-   { 32846, UniformMatrix3x2fv_remap_index },
-   { 30462, UniformMatrix3x4fv_remap_index },
-   { 16264, UniformMatrix4x2fv_remap_index },
-   {  3302, UniformMatrix4x3fv_remap_index },
-   {  5017, ClampColor_remap_index },
-   { 18028, ClearBufferfi_remap_index },
-   { 17470, ClearBufferfv_remap_index },
-   { 29485, ClearBufferiv_remap_index },
-   { 13592, ClearBufferuiv_remap_index },
-   { 19891, GetStringi_remap_index },
-   {  2827, TexBuffer_remap_index },
-   {   977, FramebufferTexture_remap_index },
-   { 26477, GetBufferParameteri64v_remap_index },
-   { 10123, GetInteger64i_v_remap_index },
-   { 23278, VertexAttribDivisor_remap_index },
-   {  9911, LoadTransposeMatrixdARB_remap_index },
-   { 30869, LoadTransposeMatrixfARB_remap_index },
-   {  5637, MultTransposeMatrixdARB_remap_index },
-   { 23652, MultTransposeMatrixfARB_remap_index },
-   {   255, SampleCoverageARB_remap_index },
-   {  5821, CompressedTexImage1DARB_remap_index },
-   { 24180, CompressedTexImage2DARB_remap_index },
-   {  4023, CompressedTexImage3DARB_remap_index },
-   { 18325, CompressedTexSubImage1DARB_remap_index },
-   {  2089, CompressedTexSubImage2DARB_remap_index },
-   { 20313, CompressedTexSubImage3DARB_remap_index },
-   { 28621, GetCompressedTexImageARB_remap_index },
-   {  3868, DisableVertexAttribArrayARB_remap_index },
-   { 30027, EnableVertexAttribArrayARB_remap_index },
-   { 31944, GetProgramEnvParameterdvARB_remap_index },
-   { 23532, GetProgramEnvParameterfvARB_remap_index },
-   { 27506, GetProgramLocalParameterdvARB_remap_index },
-   {  8036, GetProgramLocalParameterfvARB_remap_index },
-   { 18459, GetProgramStringARB_remap_index },
-   { 27701, GetProgramivARB_remap_index },
-   { 20508, GetVertexAttribdvARB_remap_index },
-   { 16072, GetVertexAttribfvARB_remap_index },
-   {  9735, GetVertexAttribivARB_remap_index },
-   { 19372, ProgramEnvParameter4dARB_remap_index },
-   { 25201, ProgramEnvParameter4dvARB_remap_index },
-   { 16792, ProgramEnvParameter4fARB_remap_index },
-   {  8935, ProgramEnvParameter4fvARB_remap_index },
-   {  3986, ProgramLocalParameter4dARB_remap_index },
-   { 13097, ProgramLocalParameter4dvARB_remap_index },
-   { 29506, ProgramLocalParameter4fARB_remap_index },
-   { 25837, ProgramLocalParameter4fvARB_remap_index },
-   { 28375, ProgramStringARB_remap_index },
-   { 19622, VertexAttrib1dARB_remap_index },
-   { 15726, VertexAttrib1dvARB_remap_index },
-   {  4161, VertexAttrib1fARB_remap_index },
-   { 32927, VertexAttrib1fvARB_remap_index },
-   {  7120, VertexAttrib1sARB_remap_index },
-   {  2263, VertexAttrib1svARB_remap_index },
-   { 15157, VertexAttrib2dARB_remap_index },
-   { 17491, VertexAttrib2dvARB_remap_index },
-   {  1635, VertexAttrib2fARB_remap_index },
-   { 17604, VertexAttrib2fvARB_remap_index },
-   { 32553, VertexAttrib2sARB_remap_index },
-   { 31581, VertexAttrib2svARB_remap_index },
-   { 11274, VertexAttrib3dARB_remap_index },
-   {  8602, VertexAttrib3dvARB_remap_index },
-   {  1722, VertexAttrib3fARB_remap_index },
-   { 22515, VertexAttrib3fvARB_remap_index },
-   { 28222, VertexAttrib3sARB_remap_index },
-   { 20250, VertexAttrib3svARB_remap_index },
-   {  4882, VertexAttrib4NbvARB_remap_index },
-   { 17851, VertexAttrib4NivARB_remap_index },
-   { 22470, VertexAttrib4NsvARB_remap_index },
-   { 23484, VertexAttrib4NubARB_remap_index },
-   { 31827, VertexAttrib4NubvARB_remap_index },
-   { 19033, VertexAttrib4NuivARB_remap_index },
-   {  3175, VertexAttrib4NusvARB_remap_index },
-   { 10863, VertexAttrib4bvARB_remap_index },
-   { 26879, VertexAttrib4dARB_remap_index },
-   { 21272, VertexAttrib4dvARB_remap_index },
-   { 11428, VertexAttrib4fARB_remap_index },
-   { 11832, VertexAttrib4fvARB_remap_index },
-   { 10239, VertexAttrib4ivARB_remap_index },
-   { 17284, VertexAttrib4sARB_remap_index },
-   { 31055, VertexAttrib4svARB_remap_index },
-   { 16597, VertexAttrib4ubvARB_remap_index },
-   { 30351, VertexAttrib4uivARB_remap_index },
-   { 20061, VertexAttrib4usvARB_remap_index },
-   { 22067, VertexAttribPointerARB_remap_index },
-   { 32687, BindBufferARB_remap_index },
-   {  6827, BufferDataARB_remap_index },
-   {  1537, BufferSubDataARB_remap_index },
-   { 30632, DeleteBuffersARB_remap_index },
-   { 32970, GenBuffersARB_remap_index },
-   { 17647, GetBufferParameterivARB_remap_index },
-   { 16744, GetBufferPointervARB_remap_index },
-   {  1490, GetBufferSubDataARB_remap_index },
-   { 30299, IsBufferARB_remap_index },
-   { 26321, MapBufferARB_remap_index },
-   { 31270, UnmapBufferARB_remap_index },
-   {   351, BeginQueryARB_remap_index },
-   { 19717, DeleteQueriesARB_remap_index },
-   { 12159, EndQueryARB_remap_index },
-   { 29100, GenQueriesARB_remap_index },
-   {  1981, GetQueryObjectivARB_remap_index },
-   { 17328, GetQueryObjectuivARB_remap_index },
-   {  1779, GetQueryivARB_remap_index },
-   { 19968, IsQueryARB_remap_index },
-   {  8212, AttachObjectARB_remap_index },
-   { 18570, CompileShaderARB_remap_index },
-   {  3244, CreateProgramObjectARB_remap_index },
-   {  6772, CreateShaderObjectARB_remap_index },
-   { 14459, DeleteObjectARB_remap_index },
-   { 23971, DetachObjectARB_remap_index },
-   { 11904, GetActiveUniformARB_remap_index },
-   {  9410, GetAttachedObjectsARB_remap_index },
-   {  9717, GetHandleARB_remap_index },
-   { 32720, GetInfoLogARB_remap_index },
-   { 31898, GetObjectParameterfvARB_remap_index },
-   { 27380, GetObjectParameterivARB_remap_index },
-   { 28858, GetShaderSourceARB_remap_index },
-   { 28082, GetUniformLocationARB_remap_index },
-   { 23754, GetUniformfvARB_remap_index },
-   { 12672, GetUniformivARB_remap_index },
-   { 20106, LinkProgramARB_remap_index },
-   { 20164, ShaderSourceARB_remap_index },
-   {  7494, Uniform1fARB_remap_index },
-   { 29715, Uniform1fvARB_remap_index },
-   { 22036, Uniform1iARB_remap_index },
-   { 20961, Uniform1ivARB_remap_index },
-   {  2212, Uniform2fARB_remap_index },
-   { 14295, Uniform2fvARB_remap_index },
-   { 26208, Uniform2iARB_remap_index },
-   {  2332, Uniform2ivARB_remap_index },
-   { 18680, Uniform3fARB_remap_index },
-   {  9440, Uniform3fvARB_remap_index },
-   {  6383, Uniform3iARB_remap_index },
-   { 16850, Uniform3ivARB_remap_index },
-   { 19178, Uniform4fARB_remap_index },
-   { 23618, Uniform4fvARB_remap_index },
-   { 24880, Uniform4iARB_remap_index },
-   { 20474, Uniform4ivARB_remap_index },
-   {  8264, UniformMatrix2fvARB_remap_index },
+   {  1577, AttachShader_remap_index },
+   {  9906, CreateProgram_remap_index },
+   { 23042, CreateShader_remap_index },
+   { 25529, DeleteProgram_remap_index },
+   { 18686, DeleteShader_remap_index },
+   { 23543, DetachShader_remap_index },
+   { 18052, GetAttachedShaders_remap_index },
+   {  4869, GetProgramInfoLog_remap_index },
+   {   405, GetProgramiv_remap_index },
+   {  6542, GetShaderInfoLog_remap_index },
+   { 31154, GetShaderiv_remap_index },
+   { 13361, IsProgram_remap_index },
+   { 12282, IsShader_remap_index },
+   { 10036, StencilFuncSeparate_remap_index },
+   {  3921, StencilMaskSeparate_remap_index },
+   {  7607, StencilOpSeparate_remap_index },
+   { 22330, UniformMatrix2x3fv_remap_index },
+   {  2847, UniformMatrix2x4fv_remap_index },
+   { 32866, UniformMatrix3x2fv_remap_index },
+   { 30476, UniformMatrix3x4fv_remap_index },
+   { 16309, UniformMatrix4x2fv_remap_index },
+   {  3263, UniformMatrix4x3fv_remap_index },
+   {  5030, ClampColor_remap_index },
+   { 18106, ClearBufferfi_remap_index },
+   { 17548, ClearBufferfv_remap_index },
+   { 29499, ClearBufferiv_remap_index },
+   { 13566, ClearBufferuiv_remap_index },
+   { 19969, GetStringi_remap_index },
+   {  2788, TexBuffer_remap_index },
+   {   938, FramebufferTexture_remap_index },
+   { 26555, GetBufferParameteri64v_remap_index },
+   { 10136, GetInteger64i_v_remap_index },
+   { 23356, VertexAttribDivisor_remap_index },
+   {  9924, LoadTransposeMatrixdARB_remap_index },
+   { 30883, LoadTransposeMatrixfARB_remap_index },
+   {  5608, MultTransposeMatrixdARB_remap_index },
+   { 23730, MultTransposeMatrixfARB_remap_index },
+   {   216, SampleCoverageARB_remap_index },
+   {  5834, CompressedTexImage1DARB_remap_index },
+   { 24258, CompressedTexImage2DARB_remap_index },
+   {  3984, CompressedTexImage3DARB_remap_index },
+   { 18403, CompressedTexSubImage1DARB_remap_index },
+   {  2050, CompressedTexSubImage2DARB_remap_index },
+   { 20391, CompressedTexSubImage3DARB_remap_index },
+   { 28635, GetCompressedTexImageARB_remap_index },
+   {  3829, DisableVertexAttribArrayARB_remap_index },
+   { 30041, EnableVertexAttribArrayARB_remap_index },
+   { 31997, GetProgramEnvParameterdvARB_remap_index },
+   { 23610, GetProgramEnvParameterfvARB_remap_index },
+   { 27552, GetProgramLocalParameterdvARB_remap_index },
+   {  8049, GetProgramLocalParameterfvARB_remap_index },
+   { 18537, GetProgramStringARB_remap_index },
+   { 27747, GetProgramivARB_remap_index },
+   { 20586, GetVertexAttribdvARB_remap_index },
+   { 16117, GetVertexAttribfvARB_remap_index },
+   {  9748, GetVertexAttribivARB_remap_index },
+   { 19450, ProgramEnvParameter4dARB_remap_index },
+   { 25279, ProgramEnvParameter4dvARB_remap_index },
+   { 16870, ProgramEnvParameter4fARB_remap_index },
+   {  8948, ProgramEnvParameter4fvARB_remap_index },
+   {  3947, ProgramLocalParameter4dARB_remap_index },
+   { 13071, ProgramLocalParameter4dvARB_remap_index },
+   { 29520, ProgramLocalParameter4fARB_remap_index },
+   { 25915, ProgramLocalParameter4fvARB_remap_index },
+   { 28389, ProgramStringARB_remap_index },
+   { 19700, VertexAttrib1dARB_remap_index },
+   { 15771, VertexAttrib1dvARB_remap_index },
+   {  4122, VertexAttrib1fARB_remap_index },
+   { 32947, VertexAttrib1fvARB_remap_index },
+   {  7133, VertexAttrib1sARB_remap_index },
+   {  2224, VertexAttrib1svARB_remap_index },
+   { 15202, VertexAttrib2dARB_remap_index },
+   { 17569, VertexAttrib2dvARB_remap_index },
+   {  1596, VertexAttrib2fARB_remap_index },
+   { 17682, VertexAttrib2fvARB_remap_index },
+   { 32573, VertexAttrib2sARB_remap_index },
+   { 31634, VertexAttrib2svARB_remap_index },
+   { 11287, VertexAttrib3dARB_remap_index },
+   {  8615, VertexAttrib3dvARB_remap_index },
+   {  1683, VertexAttrib3fARB_remap_index },
+   { 22593, VertexAttrib3fvARB_remap_index },
+   { 28236, VertexAttrib3sARB_remap_index },
+   { 20328, VertexAttrib3svARB_remap_index },
+   {  4895, VertexAttrib4NbvARB_remap_index },
+   { 17929, VertexAttrib4NivARB_remap_index },
+   { 22548, VertexAttrib4NsvARB_remap_index },
+   { 23562, VertexAttrib4NubARB_remap_index },
+   { 31880, VertexAttrib4NubvARB_remap_index },
+   { 19111, VertexAttrib4NuivARB_remap_index },
+   {  3136, VertexAttrib4NusvARB_remap_index },
+   { 10876, VertexAttrib4bvARB_remap_index },
+   { 26925, VertexAttrib4dARB_remap_index },
+   { 21350, VertexAttrib4dvARB_remap_index },
+   { 11441, VertexAttrib4fARB_remap_index },
+   { 11845, VertexAttrib4fvARB_remap_index },
+   { 10252, VertexAttrib4ivARB_remap_index },
+   { 17362, VertexAttrib4sARB_remap_index },
+   { 31069, VertexAttrib4svARB_remap_index },
+   { 16675, VertexAttrib4ubvARB_remap_index },
+   { 30365, VertexAttrib4uivARB_remap_index },
+   { 20139, VertexAttrib4usvARB_remap_index },
+   { 22145, VertexAttribPointerARB_remap_index },
+   { 32707, BindBufferARB_remap_index },
+   {  6840, BufferDataARB_remap_index },
+   {  1498, BufferSubDataARB_remap_index },
+   { 30646, DeleteBuffersARB_remap_index },
+   { 32990, GenBuffersARB_remap_index },
+   { 17725, GetBufferParameterivARB_remap_index },
+   { 16822, GetBufferPointervARB_remap_index },
+   {  1451, GetBufferSubDataARB_remap_index },
+   { 30313, IsBufferARB_remap_index },
+   { 26399, MapBufferARB_remap_index },
+   { 31284, UnmapBufferARB_remap_index },
+   {   312, BeginQueryARB_remap_index },
+   { 19795, DeleteQueriesARB_remap_index },
+   { 12172, EndQueryARB_remap_index },
+   { 29114, GenQueriesARB_remap_index },
+   {  1942, GetQueryObjectivARB_remap_index },
+   { 17406, GetQueryObjectuivARB_remap_index },
+   {  1740, GetQueryivARB_remap_index },
+   { 20046, IsQueryARB_remap_index },
+   {  8225, AttachObjectARB_remap_index },
+   { 18648, CompileShaderARB_remap_index },
+   {  3205, CreateProgramObjectARB_remap_index },
+   {  6785, CreateShaderObjectARB_remap_index },
+   { 14504, DeleteObjectARB_remap_index },
+   { 24049, DetachObjectARB_remap_index },
+   { 11917, GetActiveUniformARB_remap_index },
+   {  9423, GetAttachedObjectsARB_remap_index },
+   {  9730, GetHandleARB_remap_index },
+   { 32740, GetInfoLogARB_remap_index },
+   { 31951, GetObjectParameterfvARB_remap_index },
+   { 27426, GetObjectParameterivARB_remap_index },
+   { 28872, GetShaderSourceARB_remap_index },
+   { 28096, GetUniformLocationARB_remap_index },
+   { 23832, GetUniformfvARB_remap_index },
+   { 12646, GetUniformivARB_remap_index },
+   { 20184, LinkProgramARB_remap_index },
+   { 20242, ShaderSourceARB_remap_index },
+   {  7507, Uniform1fARB_remap_index },
+   { 29729, Uniform1fvARB_remap_index },
+   { 22114, Uniform1iARB_remap_index },
+   { 21039, Uniform1ivARB_remap_index },
+   {  2173, Uniform2fARB_remap_index },
+   { 14340, Uniform2fvARB_remap_index },
+   { 26286, Uniform2iARB_remap_index },
+   {  2293, Uniform2ivARB_remap_index },
+   { 18758, Uniform3fARB_remap_index },
+   {  9453, Uniform3fvARB_remap_index },
+   {  6396, Uniform3iARB_remap_index },
+   { 16928, Uniform3ivARB_remap_index },
+   { 19256, Uniform4fARB_remap_index },
+   { 23696, Uniform4fvARB_remap_index },
+   { 24958, Uniform4iARB_remap_index },
+   { 20552, Uniform4ivARB_remap_index },
+   {  8277, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
-   {  2729, UniformMatrix4fvARB_remap_index },
-   { 25313, UseProgramObjectARB_remap_index },
-   { 14845, ValidateProgramARB_remap_index },
-   { 21315, BindAttribLocationARB_remap_index },
-   {  4927, GetActiveAttribARB_remap_index },
-   { 16531, GetAttribLocationARB_remap_index },
-   { 29433, DrawBuffersARB_remap_index },
-   { 29296, ClampColorARB_remap_index },
-   { 17896, DrawArraysInstancedARB_remap_index },
-   {  6444, DrawElementsInstancedARB_remap_index },
-   { 13202, RenderbufferStorageMultisample_remap_index },
-   { 13673, FramebufferTextureARB_remap_index },
-   { 25739, FramebufferTextureFaceARB_remap_index },
-   { 24120, ProgramParameteriARB_remap_index },
-   { 23436, VertexAttribDivisorARB_remap_index },
-   { 19226, FlushMappedBufferRange_remap_index },
-   { 27797, MapBufferRange_remap_index },
-   { 16375, BindVertexArray_remap_index },
-   { 14668, GenVertexArrays_remap_index },
-   { 30229, CopyBufferSubData_remap_index },
-   { 31159, ClientWaitSync_remap_index },
-   {  2648, DeleteSync_remap_index },
-   {  7161, FenceSync_remap_index },
-   { 15216, GetInteger64v_remap_index },
-   { 22577, GetSynciv_remap_index },
-   { 29372, IsSync_remap_index },
-   {  9358, WaitSync_remap_index },
-   {  3836, DrawElementsBaseVertex_remap_index },
-   { 30564, DrawRangeElementsBaseVertex_remap_index },
-   { 26352, MultiDrawElementsBaseVertex_remap_index },
-   { 32103, BlendEquationSeparateiARB_remap_index },
-   { 17740, BlendEquationiARB_remap_index },
-   { 12641, BlendFuncSeparateiARB_remap_index },
-   {  9783, BlendFunciARB_remap_index },
-   {  5078, BindTransformFeedback_remap_index },
-   {  3271, DeleteTransformFeedbacks_remap_index },
-   {  6416, DrawTransformFeedback_remap_index },
-   {  9577, GenTransformFeedbacks_remap_index },
-   { 28265, IsTransformFeedback_remap_index },
-   { 25932, PauseTransformFeedback_remap_index },
-   {  5557, ResumeTransformFeedback_remap_index },
-   { 21635, ClearDepthf_remap_index },
-   {  6720, DepthRangef_remap_index },
-   { 14480, GetShaderPrecisionFormat_remap_index },
-   {  9963, ReleaseShaderCompiler_remap_index },
-   { 10906, ShaderBinary_remap_index },
-   {  5425, PolygonOffsetEXT_remap_index },
-   { 23199, GetPixelTexGenParameterfvSGIS_remap_index },
-   {  4404, GetPixelTexGenParameterivSGIS_remap_index },
-   { 22932, PixelTexGenParameterfSGIS_remap_index },
-   {   663, PixelTexGenParameterfvSGIS_remap_index },
-   { 12710, PixelTexGenParameteriSGIS_remap_index },
-   { 13815, PixelTexGenParameterivSGIS_remap_index },
-   { 18224, SampleMaskSGIS_remap_index },
-   { 19908, SamplePatternSGIS_remap_index },
-   { 26281, ColorPointerEXT_remap_index },
-   { 17534, EdgeFlagPointerEXT_remap_index },
-   {  6037, IndexPointerEXT_remap_index },
-   {  6117, NormalPointerEXT_remap_index },
-   { 15810, TexCoordPointerEXT_remap_index },
-   {  6950, VertexPointerEXT_remap_index },
-   {  3638, PointParameterfEXT_remap_index },
-   {  7801, PointParameterfvEXT_remap_index },
-   { 31996, LockArraysEXT_remap_index },
-   { 14909, UnlockArraysEXT_remap_index },
-   {  1306, SecondaryColor3bEXT_remap_index },
-   {  7960, SecondaryColor3bvEXT_remap_index },
-   { 10416, SecondaryColor3dEXT_remap_index },
-   { 25509, SecondaryColor3dvEXT_remap_index },
-   { 28131, SecondaryColor3fEXT_remap_index },
-   { 18261, SecondaryColor3fvEXT_remap_index },
-   {   509, SecondaryColor3iEXT_remap_index },
-   { 16120, SecondaryColor3ivEXT_remap_index },
-   { 10051, SecondaryColor3sEXT_remap_index },
-   { 30823, SecondaryColor3svEXT_remap_index },
-   { 27216, SecondaryColor3ubEXT_remap_index },
-   { 21206, SecondaryColor3ubvEXT_remap_index },
-   { 12952, SecondaryColor3uiEXT_remap_index },
-   { 22819, SecondaryColor3uivEXT_remap_index },
-   { 25789, SecondaryColor3usEXT_remap_index },
-   { 13025, SecondaryColor3usvEXT_remap_index },
-   { 11775, SecondaryColorPointerEXT_remap_index },
-   { 25603, MultiDrawArraysEXT_remap_index },
-   { 20896, MultiDrawElementsEXT_remap_index },
-   { 21091, FogCoordPointerEXT_remap_index },
-   {  4553, FogCoorddEXT_remap_index },
-   { 31397, FogCoorddvEXT_remap_index },
-   {  4670, FogCoordfEXT_remap_index },
-   { 27139, FogCoordfvEXT_remap_index },
-   { 19130, PixelTexGenSGIX_remap_index },
-   { 27724, BlendFuncSeparateEXT_remap_index },
-   {  6862, FlushVertexArrayRangeNV_remap_index },
-   {  5374, VertexArrayRangeNV_remap_index },
-   { 28196, CombinerInputNV_remap_index },
-   {  2155, CombinerOutputNV_remap_index },
-   { 30976, CombinerParameterfNV_remap_index },
-   {  5248, CombinerParameterfvNV_remap_index },
-   { 22301, CombinerParameteriNV_remap_index },
-   { 32445, CombinerParameterivNV_remap_index },
-   {  7238, FinalCombinerInputNV_remap_index },
-   {  9804, GetCombinerInputParameterfvNV_remap_index },
-   { 32282, GetCombinerInputParameterivNV_remap_index },
-   {   216, GetCombinerOutputParameterfvNV_remap_index },
-   { 13776, GetCombinerOutputParameterivNV_remap_index },
-   {  6624, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 24752, GetFinalCombinerInputParameterivNV_remap_index },
-   { 12619, ResizeBuffersMESA_remap_index },
-   { 11101, WindowPos2dMESA_remap_index },
-   {  1099, WindowPos2dvMESA_remap_index },
-   { 33273, WindowPos2fMESA_remap_index },
-   {  7905, WindowPos2fvMESA_remap_index },
-   { 18171, WindowPos2iMESA_remap_index },
-   { 20381, WindowPos2ivMESA_remap_index },
-   { 20995, WindowPos2sMESA_remap_index },
-   {  5735, WindowPos2svMESA_remap_index },
-   {  7730, WindowPos3dMESA_remap_index },
-   { 14023, WindowPos3dvMESA_remap_index },
-   {   555, WindowPos3fMESA_remap_index },
-   { 14970, WindowPos3fvMESA_remap_index },
-   { 24013, WindowPos3iMESA_remap_index },
-   { 30174, WindowPos3ivMESA_remap_index },
-   { 18825, WindowPos3sMESA_remap_index },
-   { 31653, WindowPos3svMESA_remap_index },
-   { 11052, WindowPos4dMESA_remap_index },
-   { 16988, WindowPos4dvMESA_remap_index },
-   { 13982, WindowPos4fMESA_remap_index },
-   { 30730, WindowPos4fvMESA_remap_index },
-   { 30327, WindowPos4iMESA_remap_index },
-   { 12422, WindowPos4ivMESA_remap_index },
-   { 19009, WindowPos4sMESA_remap_index },
-   {  3222, WindowPos4svMESA_remap_index },
-   { 26847, MultiModeDrawArraysIBM_remap_index },
-   { 28971, MultiModeDrawElementsIBM_remap_index },
-   { 12187, DeleteFencesNV_remap_index },
-   { 28043, FinishFenceNV_remap_index },
-   {  3760, GenFencesNV_remap_index },
-   { 16968, GetFenceivNV_remap_index },
-   {  8197, IsFenceNV_remap_index },
-   { 13703, SetFenceNV_remap_index },
-   {  4217, TestFenceNV_remap_index },
-   { 31624, AreProgramsResidentNV_remap_index },
-   { 31018, BindProgramNV_remap_index },
-   { 25872, DeleteProgramsNV_remap_index },
-   { 21424, ExecuteProgramNV_remap_index },
-   { 33166, GenProgramsNV_remap_index },
-   { 23304, GetProgramParameterdvNV_remap_index },
-   { 10478, GetProgramParameterfvNV_remap_index },
-   { 26255, GetProgramStringNV_remap_index },
-   { 24390, GetProgramivNV_remap_index },
-   { 23567, GetTrackMatrixivNV_remap_index },
-   { 26049, GetVertexAttribPointervNV_remap_index },
-   { 24685, GetVertexAttribdvNV_remap_index },
-   {  9253, GetVertexAttribfvNV_remap_index },
-   { 18432, GetVertexAttribivNV_remap_index },
-   { 19256, IsProgramNV_remap_index },
-   {  9336, LoadProgramNV_remap_index },
-   { 27820, ProgramParameters4dvNV_remap_index },
-   { 24320, ProgramParameters4fvNV_remap_index },
-   { 20685, RequestResidentProgramsNV_remap_index },
-   { 22279, TrackMatrixNV_remap_index },
-   { 32259, VertexAttrib1dNV_remap_index },
-   { 13614, VertexAttrib1dvNV_remap_index },
-   { 28477, VertexAttrib1fNV_remap_index },
-   {  2454, VertexAttrib1fvNV_remap_index },
-   { 30787, VertexAttrib1sNV_remap_index },
-   { 15043, VertexAttrib1svNV_remap_index },
-   {  4832, VertexAttrib2dNV_remap_index },
-   { 13507, VertexAttrib2dvNV_remap_index },
-   { 20140, VertexAttrib2fNV_remap_index },
-   { 13073, VertexAttrib2fvNV_remap_index },
-   {  5947, VertexAttrib2sNV_remap_index },
-   { 18879, VertexAttrib2svNV_remap_index },
-   { 11249, VertexAttrib3dNV_remap_index },
-   { 31874, VertexAttrib3dvNV_remap_index },
-   { 10290, VertexAttrib3fNV_remap_index },
-   { 24712, VertexAttrib3fvNV_remap_index },
-   { 22122, VertexAttrib3sNV_remap_index },
-   { 23594, VertexAttrib3svNV_remap_index },
-   { 28945, VertexAttrib4dNV_remap_index },
-   { 33203, VertexAttrib4dvNV_remap_index },
-   {  4454, VertexAttrib4fNV_remap_index },
-   {  9386, VertexAttrib4fvNV_remap_index },
-   { 26731, VertexAttrib4sNV_remap_index },
-   {  1448, VertexAttrib4svNV_remap_index },
-   {  4990, VertexAttrib4ubNV_remap_index },
-   {   817, VertexAttrib4ubvNV_remap_index },
-   { 21604, VertexAttribPointerNV_remap_index },
-   {  2306, VertexAttribs1dvNV_remap_index },
-   { 26137, VertexAttribs1fvNV_remap_index },
-   { 33003, VertexAttribs1svNV_remap_index },
-   { 10315, VertexAttribs2dvNV_remap_index },
-   { 25274, VertexAttribs2fvNV_remap_index },
-   { 17560, VertexAttribs2svNV_remap_index },
-   {  5276, VertexAttribs3dvNV_remap_index },
-   {  2186, VertexAttribs3fvNV_remap_index },
-   { 29922, VertexAttribs3svNV_remap_index },
-   { 26821, VertexAttribs4dvNV_remap_index },
-   {  5348, VertexAttribs4fvNV_remap_index },
-   { 32790, VertexAttribs4svNV_remap_index },
-   { 29670, VertexAttribs4ubvNV_remap_index },
-   { 26923, GetTexBumpParameterfvATI_remap_index },
-   { 33044, GetTexBumpParameterivATI_remap_index },
-   { 18542, TexBumpParameterfvATI_remap_index },
-   { 20556, TexBumpParameterivATI_remap_index },
-   { 15589, AlphaFragmentOp1ATI_remap_index },
-   { 25555, AlphaFragmentOp2ATI_remap_index },
-   { 24628, AlphaFragmentOp3ATI_remap_index },
-   { 29849, BeginFragmentShaderATI_remap_index },
-   { 31217, BindFragmentShaderATI_remap_index },
-   { 23723, ColorFragmentOp1ATI_remap_index },
-   {  4332, ColorFragmentOp2ATI_remap_index },
-   { 31519, ColorFragmentOp3ATI_remap_index },
-   {  5514, DeleteFragmentShaderATI_remap_index },
-   { 33227, EndFragmentShaderATI_remap_index },
-   { 32473, GenFragmentShadersATI_remap_index },
-   { 25428, PassTexCoordATI_remap_index },
-   {  6930, SampleMapATI_remap_index },
-   { 27034, SetFragmentShaderConstantATI_remap_index },
-   {   402, PointParameteriNV_remap_index },
-   { 14184, PointParameterivNV_remap_index },
-   { 28784, ActiveStencilFaceEXT_remap_index },
-   { 27480, BindVertexArrayAPPLE_remap_index },
-   {  2776, DeleteVertexArraysAPPLE_remap_index },
-   { 18001, GenVertexArraysAPPLE_remap_index },
-   { 23369, IsVertexArrayAPPLE_remap_index },
-   {   858, GetProgramNamedParameterdvNV_remap_index },
-   {  3601, GetProgramNamedParameterfvNV_remap_index },
-   { 26954, ProgramNamedParameter4dNV_remap_index },
-   { 14543, ProgramNamedParameter4dvNV_remap_index },
-   {  8869, ProgramNamedParameter4fNV_remap_index },
-   { 11740, ProgramNamedParameter4fvNV_remap_index },
-   { 16899, PrimitiveRestartIndexNV_remap_index },
-   { 30707, PrimitiveRestartNV_remap_index },
-   { 24299, DepthBoundsEXT_remap_index },
-   {  1198, BlendEquationSeparateEXT_remap_index },
-   { 14744, BindFramebufferEXT_remap_index },
-   { 25648, BindRenderbufferEXT_remap_index },
-   {  9633, CheckFramebufferStatusEXT_remap_index },
-   { 22620, DeleteFramebuffersEXT_remap_index },
-   { 31776, DeleteRenderbuffersEXT_remap_index },
-   { 13531, FramebufferRenderbufferEXT_remap_index },
-   { 13720, FramebufferTexture1DEXT_remap_index },
-   { 11534, FramebufferTexture2DEXT_remap_index },
-   { 11154, FramebufferTexture3DEXT_remap_index },
-   { 23235, GenFramebuffersEXT_remap_index },
-   { 17425, GenRenderbuffersEXT_remap_index },
-   {  6666, GenerateMipmapEXT_remap_index },
-   { 21697, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 32379, GetRenderbufferParameterivEXT_remap_index },
-   { 20436, IsFramebufferEXT_remap_index },
-   { 33126, IsRenderbufferEXT_remap_index },
-   {  8144, RenderbufferStorageEXT_remap_index },
-   {   734, BlitFramebufferEXT_remap_index },
-   { 14329, BufferParameteriAPPLE_remap_index },
-   { 19288, FlushMappedBufferRangeAPPLE_remap_index },
-   {  1854, BindFragDataLocationEXT_remap_index },
-   { 24412, GetFragDataLocationEXT_remap_index },
-   { 10593, GetUniformuivEXT_remap_index },
-   {  2972, GetVertexAttribIivEXT_remap_index },
-   { 27991, GetVertexAttribIuivEXT_remap_index },
-   { 12020, Uniform1uiEXT_remap_index },
-   { 27905, Uniform1uivEXT_remap_index },
-   { 22218, Uniform2uiEXT_remap_index },
-   {  4296, Uniform2uivEXT_remap_index },
-   { 29224, Uniform3uiEXT_remap_index },
-   { 14690, Uniform3uivEXT_remap_index },
-   {  3525, Uniform4uiEXT_remap_index },
-   {  8645, Uniform4uivEXT_remap_index },
-   { 18389, VertexAttribI1iEXT_remap_index },
-   {  1004, VertexAttribI1ivEXT_remap_index },
-   {  2555, VertexAttribI1uiEXT_remap_index },
-   { 12801, VertexAttribI1uivEXT_remap_index },
+   {  2690, UniformMatrix4fvARB_remap_index },
+   { 25391, UseProgramObjectARB_remap_index },
+   { 14890, ValidateProgramARB_remap_index },
+   { 21393, BindAttribLocationARB_remap_index },
+   {  4940, GetActiveAttribARB_remap_index },
+   { 16576, GetAttribLocationARB_remap_index },
+   { 29447, DrawBuffersARB_remap_index },
+   { 29310, ClampColorARB_remap_index },
+   { 17974, DrawArraysInstancedARB_remap_index },
+   {  6457, DrawElementsInstancedARB_remap_index },
+   { 13176, RenderbufferStorageMultisample_remap_index },
+   { 13647, FramebufferTextureARB_remap_index },
+   { 25817, FramebufferTextureFaceARB_remap_index },
+   { 24198, ProgramParameteriARB_remap_index },
+   { 23514, VertexAttribDivisorARB_remap_index },
+   { 19304, FlushMappedBufferRange_remap_index },
+   { 27863, MapBufferRange_remap_index },
+   { 27770, TexBufferARB_remap_index },
+   { 16420, BindVertexArray_remap_index },
+   { 14713, GenVertexArrays_remap_index },
+   { 30243, CopyBufferSubData_remap_index },
+   { 31173, ClientWaitSync_remap_index },
+   {  2609, DeleteSync_remap_index },
+   {  7174, FenceSync_remap_index },
+   { 15261, GetInteger64v_remap_index },
+   { 22655, GetSynciv_remap_index },
+   { 29386, IsSync_remap_index },
+   {  9371, WaitSync_remap_index },
+   {  3797, DrawElementsBaseVertex_remap_index },
+   { 30578, DrawRangeElementsBaseVertex_remap_index },
+   { 26430, MultiDrawElementsBaseVertex_remap_index },
+   { 16642, BlendEquationSeparateiARB_remap_index },
+   { 17818, BlendEquationiARB_remap_index },
+   { 12615, BlendFuncSeparateiARB_remap_index },
+   {  9796, BlendFunciARB_remap_index },
+   {  5091, BindTransformFeedback_remap_index },
+   {  3232, DeleteTransformFeedbacks_remap_index },
+   {  6429, DrawTransformFeedback_remap_index },
+   {  9590, GenTransformFeedbacks_remap_index },
+   { 28279, IsTransformFeedback_remap_index },
+   { 26010, PauseTransformFeedback_remap_index },
+   {  5528, ResumeTransformFeedback_remap_index },
+   { 21713, ClearDepthf_remap_index },
+   {  6733, DepthRangef_remap_index },
+   { 14525, GetShaderPrecisionFormat_remap_index },
+   {  9976, ReleaseShaderCompiler_remap_index },
+   { 10919, ShaderBinary_remap_index },
+   {  5396, PolygonOffsetEXT_remap_index },
+   { 23277, GetPixelTexGenParameterfvSGIS_remap_index },
+   {  4417, GetPixelTexGenParameterivSGIS_remap_index },
+   { 23010, PixelTexGenParameterfSGIS_remap_index },
+   {   624, PixelTexGenParameterfvSGIS_remap_index },
+   { 12684, PixelTexGenParameteriSGIS_remap_index },
+   { 13821, PixelTexGenParameterivSGIS_remap_index },
+   { 18302, SampleMaskSGIS_remap_index },
+   { 19986, SamplePatternSGIS_remap_index },
+   { 26359, ColorPointerEXT_remap_index },
+   { 17612, EdgeFlagPointerEXT_remap_index },
+   {  6050, IndexPointerEXT_remap_index },
+   {  6130, NormalPointerEXT_remap_index },
+   { 15855, TexCoordPointerEXT_remap_index },
+   {  6963, VertexPointerEXT_remap_index },
+   {  3599, PointParameterfEXT_remap_index },
+   {  7814, PointParameterfvEXT_remap_index },
+   { 32049, LockArraysEXT_remap_index },
+   { 14954, UnlockArraysEXT_remap_index },
+   {  1267, SecondaryColor3bEXT_remap_index },
+   {  7973, SecondaryColor3bvEXT_remap_index },
+   { 10429, SecondaryColor3dEXT_remap_index },
+   { 25587, SecondaryColor3dvEXT_remap_index },
+   { 28145, SecondaryColor3fEXT_remap_index },
+   { 18339, SecondaryColor3fvEXT_remap_index },
+   {   470, SecondaryColor3iEXT_remap_index },
+   { 16165, SecondaryColor3ivEXT_remap_index },
+   { 10064, SecondaryColor3sEXT_remap_index },
+   { 30837, SecondaryColor3svEXT_remap_index },
+   { 27262, SecondaryColor3ubEXT_remap_index },
+   { 21284, SecondaryColor3ubvEXT_remap_index },
+   { 12926, SecondaryColor3uiEXT_remap_index },
+   { 22897, SecondaryColor3uivEXT_remap_index },
+   { 25867, SecondaryColor3usEXT_remap_index },
+   { 12999, SecondaryColor3usvEXT_remap_index },
+   { 11788, SecondaryColorPointerEXT_remap_index },
+   { 25681, MultiDrawArraysEXT_remap_index },
+   { 20974, MultiDrawElementsEXT_remap_index },
+   { 21169, FogCoordPointerEXT_remap_index },
+   {  4566, FogCoorddEXT_remap_index },
+   { 31450, FogCoorddvEXT_remap_index },
+   {  4683, FogCoordfEXT_remap_index },
+   { 27185, FogCoordfvEXT_remap_index },
+   { 19208, PixelTexGenSGIX_remap_index },
+   { 27790, BlendFuncSeparateEXT_remap_index },
+   {  6875, FlushVertexArrayRangeNV_remap_index },
+   {  5345, VertexArrayRangeNV_remap_index },
+   { 28210, CombinerInputNV_remap_index },
+   {  2116, CombinerOutputNV_remap_index },
+   { 30990, CombinerParameterfNV_remap_index },
+   {  5219, CombinerParameterfvNV_remap_index },
+   { 22379, CombinerParameteriNV_remap_index },
+   { 32465, CombinerParameterivNV_remap_index },
+   {  7251, FinalCombinerInputNV_remap_index },
+   {  9817, GetCombinerInputParameterfvNV_remap_index },
+   { 32302, GetCombinerInputParameterivNV_remap_index },
+   { 13922, GetCombinerOutputParameterfvNV_remap_index },
+   { 13750, GetCombinerOutputParameterivNV_remap_index },
+   {  6637, GetFinalCombinerInputParameterfvNV_remap_index },
+   { 24830, GetFinalCombinerInputParameterivNV_remap_index },
+   { 12593, ResizeBuffersMESA_remap_index },
+   { 11114, WindowPos2dMESA_remap_index },
+   {  1060, WindowPos2dvMESA_remap_index },
+   { 33293, WindowPos2fMESA_remap_index },
+   {  7918, WindowPos2fvMESA_remap_index },
+   { 18249, WindowPos2iMESA_remap_index },
+   { 20459, WindowPos2ivMESA_remap_index },
+   { 21073, WindowPos2sMESA_remap_index },
+   {  5748, WindowPos2svMESA_remap_index },
+   {  7743, WindowPos3dMESA_remap_index },
+   { 14068, WindowPos3dvMESA_remap_index },
+   {   516, WindowPos3fMESA_remap_index },
+   { 15015, WindowPos3fvMESA_remap_index },
+   { 24091, WindowPos3iMESA_remap_index },
+   { 30188, WindowPos3ivMESA_remap_index },
+   { 18903, WindowPos3sMESA_remap_index },
+   { 31706, WindowPos3svMESA_remap_index },
+   { 11065, WindowPos4dMESA_remap_index },
+   { 17066, WindowPos4dvMESA_remap_index },
+   { 14027, WindowPos4fMESA_remap_index },
+   { 30744, WindowPos4fvMESA_remap_index },
+   { 30341, WindowPos4iMESA_remap_index },
+   { 12396, WindowPos4ivMESA_remap_index },
+   { 19087, WindowPos4sMESA_remap_index },
+   {  3183, WindowPos4svMESA_remap_index },
+   { 13789, MultiModeDrawArraysIBM_remap_index },
+   { 28985, MultiModeDrawElementsIBM_remap_index },
+   { 12200, DeleteFencesNV_remap_index },
+   { 28057, FinishFenceNV_remap_index },
+   {  3721, GenFencesNV_remap_index },
+   { 17046, GetFenceivNV_remap_index },
+   {  8210, IsFenceNV_remap_index },
+   { 13677, SetFenceNV_remap_index },
+   {  4178, TestFenceNV_remap_index },
+   { 31677, AreProgramsResidentNV_remap_index },
+   { 31032, BindProgramNV_remap_index },
+   { 25950, DeleteProgramsNV_remap_index },
+   { 21502, ExecuteProgramNV_remap_index },
+   { 33186, GenProgramsNV_remap_index },
+   { 23382, GetProgramParameterdvNV_remap_index },
+   { 10491, GetProgramParameterfvNV_remap_index },
+   { 26333, GetProgramStringNV_remap_index },
+   { 24468, GetProgramivNV_remap_index },
+   { 23645, GetTrackMatrixivNV_remap_index },
+   { 26127, GetVertexAttribPointervNV_remap_index },
+   { 24763, GetVertexAttribdvNV_remap_index },
+   {  9266, GetVertexAttribfvNV_remap_index },
+   { 18510, GetVertexAttribivNV_remap_index },
+   { 19334, IsProgramNV_remap_index },
+   {  9349, LoadProgramNV_remap_index },
+   { 27886, ProgramParameters4dvNV_remap_index },
+   { 24398, ProgramParameters4fvNV_remap_index },
+   { 20763, RequestResidentProgramsNV_remap_index },
+   { 22357, TrackMatrixNV_remap_index },
+   { 32279, VertexAttrib1dNV_remap_index },
+   { 13588, VertexAttrib1dvNV_remap_index },
+   { 28491, VertexAttrib1fNV_remap_index },
+   {  2415, VertexAttrib1fvNV_remap_index },
+   { 30801, VertexAttrib1sNV_remap_index },
+   { 15088, VertexAttrib1svNV_remap_index },
+   {  4845, VertexAttrib2dNV_remap_index },
+   { 13481, VertexAttrib2dvNV_remap_index },
+   { 20218, VertexAttrib2fNV_remap_index },
+   { 13047, VertexAttrib2fvNV_remap_index },
+   {  5960, VertexAttrib2sNV_remap_index },
+   { 18957, VertexAttrib2svNV_remap_index },
+   { 11262, VertexAttrib3dNV_remap_index },
+   { 31927, VertexAttrib3dvNV_remap_index },
+   { 10303, VertexAttrib3fNV_remap_index },
+   { 24790, VertexAttrib3fvNV_remap_index },
+   { 22200, VertexAttrib3sNV_remap_index },
+   { 23672, VertexAttrib3svNV_remap_index },
+   { 28959, VertexAttrib4dNV_remap_index },
+   { 33223, VertexAttrib4dvNV_remap_index },
+   {  4467, VertexAttrib4fNV_remap_index },
+   {  9399, VertexAttrib4fvNV_remap_index },
+   { 26809, VertexAttrib4sNV_remap_index },
+   {  1409, VertexAttrib4svNV_remap_index },
+   {  5003, VertexAttrib4ubNV_remap_index },
+   {   778, VertexAttrib4ubvNV_remap_index },
+   { 21682, VertexAttribPointerNV_remap_index },
+   {  2267, VertexAttribs1dvNV_remap_index },
+   { 26215, VertexAttribs1fvNV_remap_index },
+   { 33023, VertexAttribs1svNV_remap_index },
+   { 10328, VertexAttribs2dvNV_remap_index },
+   { 25352, VertexAttribs2fvNV_remap_index },
+   { 17638, VertexAttribs2svNV_remap_index },
+   {  5247, VertexAttribs3dvNV_remap_index },
+   {  2147, VertexAttribs3fvNV_remap_index },
+   { 29936, VertexAttribs3svNV_remap_index },
+   { 26899, VertexAttribs4dvNV_remap_index },
+   {  5319, VertexAttribs4fvNV_remap_index },
+   { 32810, VertexAttribs4svNV_remap_index },
+   { 29684, VertexAttribs4ubvNV_remap_index },
+   { 26969, GetTexBumpParameterfvATI_remap_index },
+   { 33064, GetTexBumpParameterivATI_remap_index },
+   { 18620, TexBumpParameterfvATI_remap_index },
+   { 20634, TexBumpParameterivATI_remap_index },
+   { 15634, AlphaFragmentOp1ATI_remap_index },
+   { 25633, AlphaFragmentOp2ATI_remap_index },
+   { 24706, AlphaFragmentOp3ATI_remap_index },
+   { 29863, BeginFragmentShaderATI_remap_index },
+   { 31231, BindFragmentShaderATI_remap_index },
+   { 23801, ColorFragmentOp1ATI_remap_index },
+   {  4345, ColorFragmentOp2ATI_remap_index },
+   { 31572, ColorFragmentOp3ATI_remap_index },
+   {  5485, DeleteFragmentShaderATI_remap_index },
+   { 33247, EndFragmentShaderATI_remap_index },
+   { 32493, GenFragmentShadersATI_remap_index },
+   { 25506, PassTexCoordATI_remap_index },
+   {  6943, SampleMapATI_remap_index },
+   { 27080, SetFragmentShaderConstantATI_remap_index },
+   {   363, PointParameteriNV_remap_index },
+   { 14229, PointParameterivNV_remap_index },
+   { 28798, ActiveStencilFaceEXT_remap_index },
+   { 27526, BindVertexArrayAPPLE_remap_index },
+   {  2737, DeleteVertexArraysAPPLE_remap_index },
+   { 18079, GenVertexArraysAPPLE_remap_index },
+   { 23447, IsVertexArrayAPPLE_remap_index },
+   {   819, GetProgramNamedParameterdvNV_remap_index },
+   {  3562, GetProgramNamedParameterfvNV_remap_index },
+   { 27000, ProgramNamedParameter4dNV_remap_index },
+   { 14588, ProgramNamedParameter4dvNV_remap_index },
+   {  8882, ProgramNamedParameter4fNV_remap_index },
+   { 11753, ProgramNamedParameter4fvNV_remap_index },
+   { 16977, PrimitiveRestartIndexNV_remap_index },
+   { 30721, PrimitiveRestartNV_remap_index },
+   { 24377, DepthBoundsEXT_remap_index },
+   {  1159, BlendEquationSeparateEXT_remap_index },
+   { 14789, BindFramebufferEXT_remap_index },
+   { 25726, BindRenderbufferEXT_remap_index },
+   {  9646, CheckFramebufferStatusEXT_remap_index },
+   { 22698, DeleteFramebuffersEXT_remap_index },
+   { 31829, DeleteRenderbuffersEXT_remap_index },
+   { 13505, FramebufferRenderbufferEXT_remap_index },
+   { 13694, FramebufferTexture1DEXT_remap_index },
+   { 11547, FramebufferTexture2DEXT_remap_index },
+   { 11167, FramebufferTexture3DEXT_remap_index },
+   { 23313, GenFramebuffersEXT_remap_index },
+   { 17503, GenRenderbuffersEXT_remap_index },
+   {  6679, GenerateMipmapEXT_remap_index },
+   { 21775, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 32399, GetRenderbufferParameterivEXT_remap_index },
+   { 20514, IsFramebufferEXT_remap_index },
+   { 33146, IsRenderbufferEXT_remap_index },
+   {  8157, RenderbufferStorageEXT_remap_index },
+   {   695, BlitFramebufferEXT_remap_index },
+   { 14374, BufferParameteriAPPLE_remap_index },
+   { 19366, FlushMappedBufferRangeAPPLE_remap_index },
+   {  1815, BindFragDataLocationEXT_remap_index },
+   { 24490, GetFragDataLocationEXT_remap_index },
+   { 10606, GetUniformuivEXT_remap_index },
+   {  2933, GetVertexAttribIivEXT_remap_index },
+   {  4195, GetVertexAttribIuivEXT_remap_index },
+   { 12033, Uniform1uiEXT_remap_index },
+   { 27971, Uniform1uivEXT_remap_index },
+   { 22296, Uniform2uiEXT_remap_index },
+   {  4309, Uniform2uivEXT_remap_index },
+   { 29238, Uniform3uiEXT_remap_index },
+   { 14735, Uniform3uivEXT_remap_index },
+   {  3486, Uniform4uiEXT_remap_index },
+   {  8658, Uniform4uivEXT_remap_index },
+   { 18467, VertexAttribI1iEXT_remap_index },
+   {   965, VertexAttribI1ivEXT_remap_index },
+   {  2516, VertexAttribI1uiEXT_remap_index },
+   { 12775, VertexAttribI1uivEXT_remap_index },
    {    81, VertexAttribI2iEXT_remap_index },
-   { 23835, VertexAttribI2ivEXT_remap_index },
-   {  5302, VertexAttribI2uiEXT_remap_index },
-   {  4715, VertexAttribI2uivEXT_remap_index },
-   { 26523, VertexAttribI3iEXT_remap_index },
-   { 30519, VertexAttribI3ivEXT_remap_index },
-   {  3379, VertexAttribI3uiEXT_remap_index },
-   { 30415, VertexAttribI3uivEXT_remap_index },
-   { 21948, VertexAttribI4bvEXT_remap_index },
-   { 14622, VertexAttribI4iEXT_remap_index },
-   { 32045, VertexAttribI4ivEXT_remap_index },
-   { 13434, VertexAttribI4svEXT_remap_index },
-   { 16484, VertexAttribI4ubvEXT_remap_index },
-   { 16183, VertexAttribI4uiEXT_remap_index },
-   {  5448, VertexAttribI4uivEXT_remap_index },
-   { 11317, VertexAttribI4usvEXT_remap_index },
-   { 18486, VertexAttribIPointerEXT_remap_index },
-   {  3066, FramebufferTextureLayerEXT_remap_index },
-   {  5172, ColorMaskIndexedEXT_remap_index },
-   { 18903, DisableIndexedEXT_remap_index },
-   { 26568, EnableIndexedEXT_remap_index },
-   { 21652, GetBooleanIndexedvEXT_remap_index },
-   { 10928, GetIntegerIndexedvEXT_remap_index },
-   { 22696, IsEnabledIndexedEXT_remap_index },
-   { 22596, ClearColorIiEXT_remap_index },
-   {  3475, ClearColorIuiEXT_remap_index },
-   {  9843, GetTexParameterIivEXT_remap_index },
-   {  5895, GetTexParameterIuivEXT_remap_index },
-   {  3022, TexParameterIivEXT_remap_index },
-   { 26390, TexParameterIuivEXT_remap_index },
-   {  4583, BeginConditionalRenderNV_remap_index },
-   { 25378, EndConditionalRenderNV_remap_index },
-   {  9280, BeginTransformFeedbackEXT_remap_index },
-   { 18938, BindBufferBaseEXT_remap_index },
-   { 18797, BindBufferOffsetEXT_remap_index },
-   { 12247, BindBufferRangeEXT_remap_index },
-   { 14244, EndTransformFeedbackEXT_remap_index },
-   { 10791, GetTransformFeedbackVaryingEXT_remap_index },
-   { 20741, TransformFeedbackVaryingsEXT_remap_index },
-   { 29571, ProvokingVertexEXT_remap_index },
-   { 10739, GetTexParameterPointervAPPLE_remap_index },
-   {  5034, TextureRangeAPPLE_remap_index },
-   { 11606, GetObjectParameterivAPPLE_remap_index },
-   { 19863, ObjectPurgeableAPPLE_remap_index },
-   {  5689, ObjectUnpurgeableAPPLE_remap_index },
-   { 17247, ActiveProgramEXT_remap_index },
-   { 17218, CreateShaderProgramEXT_remap_index },
-   { 28569, UseShaderProgramEXT_remap_index },
-   { 16463, TextureBarrierNV_remap_index },
-   { 28810, StencilFuncSeparateATI_remap_index },
-   { 18090, ProgramEnvParameters4fvEXT_remap_index },
-   { 17112, ProgramLocalParameters4fvEXT_remap_index },
-   { 14112, GetQueryObjecti64vEXT_remap_index },
-   { 10341, GetQueryObjectui64vEXT_remap_index },
-   { 23792, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 12126, EGLImageTargetTexture2DOES_remap_index },
+   { 23913, VertexAttribI2ivEXT_remap_index },
+   {  5273, VertexAttribI2uiEXT_remap_index },
+   {  4728, VertexAttribI2uivEXT_remap_index },
+   { 26601, VertexAttribI3iEXT_remap_index },
+   { 30533, VertexAttribI3ivEXT_remap_index },
+   {  3340, VertexAttribI3uiEXT_remap_index },
+   { 30429, VertexAttribI3uivEXT_remap_index },
+   { 22026, VertexAttribI4bvEXT_remap_index },
+   { 14667, VertexAttribI4iEXT_remap_index },
+   { 32098, VertexAttribI4ivEXT_remap_index },
+   { 13408, VertexAttribI4svEXT_remap_index },
+   { 16529, VertexAttribI4ubvEXT_remap_index },
+   { 16228, VertexAttribI4uiEXT_remap_index },
+   {  5419, VertexAttribI4uivEXT_remap_index },
+   { 11330, VertexAttribI4usvEXT_remap_index },
+   { 18564, VertexAttribIPointerEXT_remap_index },
+   {  3027, FramebufferTextureLayerEXT_remap_index },
+   {  5660, ColorMaskIndexedEXT_remap_index },
+   { 18981, DisableIndexedEXT_remap_index },
+   { 26646, EnableIndexedEXT_remap_index },
+   { 21730, GetBooleanIndexedvEXT_remap_index },
+   { 10941, GetIntegerIndexedvEXT_remap_index },
+   { 22774, IsEnabledIndexedEXT_remap_index },
+   { 22674, ClearColorIiEXT_remap_index },
+   {  3436, ClearColorIuiEXT_remap_index },
+   {  9856, GetTexParameterIivEXT_remap_index },
+   {  5908, GetTexParameterIuivEXT_remap_index },
+   {  2983, TexParameterIivEXT_remap_index },
+   { 26468, TexParameterIuivEXT_remap_index },
+   {  4596, BeginConditionalRenderNV_remap_index },
+   { 25456, EndConditionalRenderNV_remap_index },
+   {  9293, BeginTransformFeedbackEXT_remap_index },
+   { 19016, BindBufferBaseEXT_remap_index },
+   { 18875, BindBufferOffsetEXT_remap_index },
+   { 12221, BindBufferRangeEXT_remap_index },
+   { 14289, EndTransformFeedbackEXT_remap_index },
+   { 10804, GetTransformFeedbackVaryingEXT_remap_index },
+   { 20819, TransformFeedbackVaryingsEXT_remap_index },
+   { 29585, ProvokingVertexEXT_remap_index },
+   { 10752, GetTexParameterPointervAPPLE_remap_index },
+   {  5047, TextureRangeAPPLE_remap_index },
+   { 11619, GetObjectParameterivAPPLE_remap_index },
+   { 19941, ObjectPurgeableAPPLE_remap_index },
+   {  5702, ObjectUnpurgeableAPPLE_remap_index },
+   { 17325, ActiveProgramEXT_remap_index },
+   { 17296, CreateShaderProgramEXT_remap_index },
+   { 28583, UseShaderProgramEXT_remap_index },
+   { 16508, TextureBarrierNV_remap_index },
+   { 28824, StencilFuncSeparateATI_remap_index },
+   { 18168, ProgramEnvParameters4fvEXT_remap_index },
+   { 17190, ProgramLocalParameters4fvEXT_remap_index },
+   { 14157, GetQueryObjecti64vEXT_remap_index },
+   { 10354, GetQueryObjectui64vEXT_remap_index },
+   { 23870, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 12139, EGLImageTargetTexture2DOES_remap_index },
    {    -1, -1 }
 };
 
 /* these functions are in the ABI, but have alternative names */
 static const struct gl_function_remap MESA_alt_functions[] = {
    /* from GL_EXT_blend_color */
-   {  2694, _gloffset_BlendColor },
+   {  2655, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 11211, _gloffset_BlendEquation },
+   { 11224, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 17010, _gloffset_ColorSubTable },
-   { 31708, _gloffset_CopyColorSubTable },
+   { 17088, _gloffset_ColorSubTable },
+   { 31761, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
-   {   296, _gloffset_ConvolutionFilter1D },
-   {  2493, _gloffset_CopyConvolutionFilter1D },
-   {  4097, _gloffset_GetConvolutionParameteriv },
-   {  8493, _gloffset_ConvolutionFilter2D },
-   {  8695, _gloffset_ConvolutionParameteriv },
-   {  9155, _gloffset_ConvolutionParameterfv },
-   { 20584, _gloffset_GetSeparableFilter },
-   { 24067, _gloffset_SeparableFilter2D },
-   { 24930, _gloffset_ConvolutionParameteri },
-   { 25053, _gloffset_ConvolutionParameterf },
-   { 26757, _gloffset_GetConvolutionParameterfv },
-   { 27646, _gloffset_GetConvolutionFilter },
-   { 30111, _gloffset_CopyConvolutionFilter2D },
+   {   257, _gloffset_ConvolutionFilter1D },
+   {  2454, _gloffset_CopyConvolutionFilter1D },
+   {  4058, _gloffset_GetConvolutionParameteriv },
+   {  8506, _gloffset_ConvolutionFilter2D },
+   {  8708, _gloffset_ConvolutionParameteriv },
+   {  9168, _gloffset_ConvolutionParameterfv },
+   { 20662, _gloffset_GetSeparableFilter },
+   { 24145, _gloffset_SeparableFilter2D },
+   { 25008, _gloffset_ConvolutionParameteri },
+   { 25131, _gloffset_ConvolutionParameterf },
+   { 26835, _gloffset_GetConvolutionParameterfv },
+   { 27692, _gloffset_GetConvolutionFilter },
+   { 30125, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 15103, _gloffset_CopyTexSubImage3D },
-   { 16697, _gloffset_CopyTexImage2D },
-   { 24538, _gloffset_CopyTexImage1D },
-   { 27327, _gloffset_CopyTexSubImage2D },
-   { 29749, _gloffset_CopyTexSubImage1D },
+   { 15148, _gloffset_CopyTexSubImage3D },
+   { 16775, _gloffset_CopyTexImage2D },
+   { 24616, _gloffset_CopyTexImage1D },
+   { 27373, _gloffset_CopyTexSubImage2D },
+   { 29763, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
-   {  9492, _gloffset_DrawRangeElements },
+   {  9505, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
-   {   895, _gloffset_Histogram },
-   {  3561, _gloffset_ResetHistogram },
-   {  9989, _gloffset_GetMinmax },
-   { 15437, _gloffset_GetHistogramParameterfv },
-   { 24463, _gloffset_GetMinmaxParameteriv },
-   { 26647, _gloffset_ResetMinmax },
-   { 27543, _gloffset_GetHistogramParameteriv },
-   { 28744, _gloffset_GetHistogram },
-   { 31333, _gloffset_Minmax },
-   { 32873, _gloffset_GetMinmaxParameterfv },
+   {   856, _gloffset_Histogram },
+   {  3522, _gloffset_ResetHistogram },
+   { 10002, _gloffset_GetMinmax },
+   { 15482, _gloffset_GetHistogramParameterfv },
+   { 24541, _gloffset_GetMinmaxParameteriv },
+   { 26725, _gloffset_ResetMinmax },
+   { 27589, _gloffset_GetHistogramParameteriv },
+   { 28758, _gloffset_GetHistogram },
+   { 31347, _gloffset_Minmax },
+   { 32893, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
-   {  8355, _gloffset_ColorTable },
-   { 15283, _gloffset_GetColorTable },
-   { 22982, _gloffset_GetColorTableParameterfv },
-   { 25109, _gloffset_GetColorTableParameteriv },
+   {  8368, _gloffset_ColorTable },
+   { 15328, _gloffset_GetColorTable },
+   { 23060, _gloffset_GetColorTableParameterfv },
+   { 25187, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
-   {  7076, _gloffset_TexSubImage1D },
-   { 10666, _gloffset_TexSubImage2D },
+   {  7089, _gloffset_TexSubImage1D },
+   { 10679, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
-   {  1813, _gloffset_TexImage3D },
-   { 22751, _gloffset_TexSubImage3D },
+   {  1774, _gloffset_TexImage3D },
+   { 22829, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
-   {  3329, _gloffset_PrioritizeTextures },
-   {  7525, _gloffset_AreTexturesResident },
-   { 13638, _gloffset_GenTextures },
-   { 15769, _gloffset_DeleteTextures },
-   { 19569, _gloffset_IsTexture },
-   { 29814, _gloffset_BindTexture },
+   {  3290, _gloffset_PrioritizeTextures },
+   {  7538, _gloffset_AreTexturesResident },
+   { 13612, _gloffset_GenTextures },
+   { 15814, _gloffset_DeleteTextures },
+   { 19647, _gloffset_IsTexture },
+   { 29828, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 24239, _gloffset_ArrayElement },
-   { 30921, _gloffset_GetPointerv },
-   { 32500, _gloffset_DrawArrays },
+   { 24317, _gloffset_ArrayElement },
+   { 30935, _gloffset_GetPointerv },
+   { 32520, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
-   {  7643, _gloffset_ColorTableParameteriv },
-   {  8355, _gloffset_ColorTable },
-   { 15283, _gloffset_GetColorTable },
-   { 15393, _gloffset_CopyColorTable },
-   { 19430, _gloffset_ColorTableParameterfv },
-   { 22982, _gloffset_GetColorTableParameterfv },
-   { 25109, _gloffset_GetColorTableParameteriv },
+   {  7656, _gloffset_ColorTableParameteriv },
+   {  8368, _gloffset_ColorTable },
+   { 15328, _gloffset_GetColorTable },
+   { 15438, _gloffset_CopyColorTable },
+   { 19508, _gloffset_ColorTableParameterfv },
+   { 23060, _gloffset_GetColorTableParameterfv },
+   { 25187, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
-   {   464, _gloffset_MultiTexCoord3sARB },
-   {   696, _gloffset_ActiveTextureARB },
-   {  4234, _gloffset_MultiTexCoord1fvARB },
-   {  6142, _gloffset_MultiTexCoord3dARB },
-   {  6187, _gloffset_MultiTexCoord2iARB },
-   {  6311, _gloffset_MultiTexCoord2svARB },
-   {  8311, _gloffset_MultiTexCoord2fARB },
-   { 10371, _gloffset_MultiTexCoord3fvARB },
-   { 10973, _gloffset_MultiTexCoord4sARB },
-   { 11654, _gloffset_MultiTexCoord2dvARB },
-   { 12069, _gloffset_MultiTexCoord1svARB },
-   { 12480, _gloffset_MultiTexCoord3svARB },
-   { 12541, _gloffset_MultiTexCoord4iARB },
-   { 13342, _gloffset_MultiTexCoord3iARB },
-   { 14141, _gloffset_MultiTexCoord1dARB },
-   { 14358, _gloffset_MultiTexCoord3dvARB },
-   { 15637, _gloffset_MultiTexCoord3ivARB },
-   { 15682, _gloffset_MultiTexCoord2sARB },
-   { 17067, _gloffset_MultiTexCoord4ivARB },
-   { 19080, _gloffset_ClientActiveTextureARB },
-   { 21380, _gloffset_MultiTexCoord2dARB },
-   { 21817, _gloffset_MultiTexCoord4dvARB },
-   { 22173, _gloffset_MultiTexCoord4fvARB },
-   { 23123, _gloffset_MultiTexCoord3fARB },
-   { 25693, _gloffset_MultiTexCoord4dARB },
-   { 25959, _gloffset_MultiTexCoord1sARB },
-   { 26163, _gloffset_MultiTexCoord1dvARB },
-   { 27171, _gloffset_MultiTexCoord1ivARB },
-   { 27264, _gloffset_MultiTexCoord2ivARB },
-   { 27603, _gloffset_MultiTexCoord1iARB },
-   { 29019, _gloffset_MultiTexCoord4svARB },
-   { 29613, _gloffset_MultiTexCoord1fARB },
-   { 29876, _gloffset_MultiTexCoord4fARB },
-   { 32334, _gloffset_MultiTexCoord2fvARB },
+   {   425, _gloffset_MultiTexCoord3sARB },
+   {   657, _gloffset_ActiveTextureARB },
+   {  4247, _gloffset_MultiTexCoord1fvARB },
+   {  6155, _gloffset_MultiTexCoord3dARB },
+   {  6200, _gloffset_MultiTexCoord2iARB },
+   {  6324, _gloffset_MultiTexCoord2svARB },
+   {  8324, _gloffset_MultiTexCoord2fARB },
+   { 10384, _gloffset_MultiTexCoord3fvARB },
+   { 10986, _gloffset_MultiTexCoord4sARB },
+   { 11667, _gloffset_MultiTexCoord2dvARB },
+   { 12082, _gloffset_MultiTexCoord1svARB },
+   { 12454, _gloffset_MultiTexCoord3svARB },
+   { 12515, _gloffset_MultiTexCoord4iARB },
+   { 13316, _gloffset_MultiTexCoord3iARB },
+   { 14186, _gloffset_MultiTexCoord1dARB },
+   { 14403, _gloffset_MultiTexCoord3dvARB },
+   { 15682, _gloffset_MultiTexCoord3ivARB },
+   { 15727, _gloffset_MultiTexCoord2sARB },
+   { 17145, _gloffset_MultiTexCoord4ivARB },
+   { 19158, _gloffset_ClientActiveTextureARB },
+   { 21458, _gloffset_MultiTexCoord2dARB },
+   { 21895, _gloffset_MultiTexCoord4dvARB },
+   { 22251, _gloffset_MultiTexCoord4fvARB },
+   { 23201, _gloffset_MultiTexCoord3fARB },
+   { 25771, _gloffset_MultiTexCoord4dARB },
+   { 26037, _gloffset_MultiTexCoord1sARB },
+   { 26241, _gloffset_MultiTexCoord1dvARB },
+   { 27217, _gloffset_MultiTexCoord1ivARB },
+   { 27310, _gloffset_MultiTexCoord2ivARB },
+   { 27649, _gloffset_MultiTexCoord1iARB },
+   { 29033, _gloffset_MultiTexCoord4svARB },
+   { 29627, _gloffset_MultiTexCoord1fARB },
+   { 29890, _gloffset_MultiTexCoord4fARB },
+   { 32354, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 
@@ -5389,7 +5394,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[] = {
-   {  9213, -1 }, /* TbufferMask3DFX */
+   {  9226, -1 }, /* TbufferMask3DFX */
    {    -1, -1 }
 };
 #endif
@@ -5481,7 +5486,7 @@ static const struct gl_function_remap GL_ARB_framebuffer_object_functions[] = {
 #if defined(need_GL_ARB_geometry_shader4)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_ARB_geometry_shader4_functions[] = {
-   { 12444, -1 }, /* FramebufferTextureLayer */
+   { 12418, -1 }, /* FramebufferTextureLayer */
    {    -1, -1 }
 };
 #endif
@@ -5502,11 +5507,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[] = {
-   {  3812, -1 }, /* MatrixIndexusvARB */
-   { 13163, -1 }, /* MatrixIndexuivARB */
-   { 14513, -1 }, /* MatrixIndexPointerARB */
-   { 19818, -1 }, /* CurrentPaletteMatrixARB */
-   { 22867, -1 }, /* MatrixIndexubvARB */
+   {  3773, -1 }, /* MatrixIndexusvARB */
+   { 13137, -1 }, /* MatrixIndexuivARB */
+   { 14558, -1 }, /* MatrixIndexPointerARB */
+   { 19896, -1 }, /* CurrentPaletteMatrixARB */
+   { 22945, -1 }, /* MatrixIndexubvARB */
    {    -1, -1 }
 };
 #endif
@@ -5553,6 +5558,13 @@ static const struct gl_function_remap GL_ARB_sync_functions[] = {
 };
 #endif
 
+#if defined(need_GL_ARB_texture_buffer_object)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_ARB_texture_buffer_object_functions[] = {
+   {    -1, -1 }
+};
+#endif
+
 #if defined(need_GL_ARB_texture_compression)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_ARB_texture_compression_functions[] = {
@@ -5583,16 +5595,16 @@ static const struct gl_function_remap GL_ARB_vertex_array_object_functions[] = {
 
 #if defined(need_GL_ARB_vertex_blend)
 static const struct gl_function_remap GL_ARB_vertex_blend_functions[] = {
-   {  2435, -1 }, /* WeightubvARB */
-   {  6554, -1 }, /* WeightivARB */
-   { 11076, -1 }, /* WeightPointerARB */
-   { 13898, -1 }, /* WeightfvARB */
-   { 17586, -1 }, /* WeightbvARB */
-   { 21048, -1 }, /* WeightusvARB */
-   { 23993, -1 }, /* VertexBlendARB */
-   { 29697, -1 }, /* WeightsvARB */
-   { 31758, -1 }, /* WeightdvARB */
-   { 32534, -1 }, /* WeightuivARB */
+   {  2396, -1 }, /* WeightubvARB */
+   {  6567, -1 }, /* WeightivARB */
+   { 11089, -1 }, /* WeightPointerARB */
+   { 13904, -1 }, /* WeightfvARB */
+   { 17664, -1 }, /* WeightbvARB */
+   { 21126, -1 }, /* WeightusvARB */
+   { 24071, -1 }, /* VertexBlendARB */
+   { 29711, -1 }, /* WeightsvARB */
+   { 31811, -1 }, /* WeightdvARB */
+   { 32554, -1 }, /* WeightuivARB */
    {    -1, -1 }
 };
 #endif
@@ -5662,7 +5674,7 @@ static const struct gl_function_remap GL_ATI_separate_stencil_functions[] = {
 
 #if defined(need_GL_EXT_blend_color)
 static const struct gl_function_remap GL_EXT_blend_color_functions[] = {
-   {  2694, _gloffset_BlendColor },
+   {  2655, _gloffset_BlendColor },
    {    -1, -1 }
 };
 #endif
@@ -5683,15 +5695,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[] = {
-   { 11211, _gloffset_BlendEquation },
+   { 11224, _gloffset_BlendEquation },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_color_subtable)
 static const struct gl_function_remap GL_EXT_color_subtable_functions[] = {
-   { 17010, _gloffset_ColorSubTable },
-   { 31708, _gloffset_CopyColorSubTable },
+   { 17088, _gloffset_ColorSubTable },
+   { 31761, _gloffset_CopyColorSubTable },
    {    -1, -1 }
 };
 #endif
@@ -5705,66 +5717,66 @@ static const struct gl_function_remap GL_EXT_compiled_vertex_array_functions[] =
 
 #if defined(need_GL_EXT_convolution)
 static const struct gl_function_remap GL_EXT_convolution_functions[] = {
-   {   296, _gloffset_ConvolutionFilter1D },
-   {  2493, _gloffset_CopyConvolutionFilter1D },
-   {  4097, _gloffset_GetConvolutionParameteriv },
-   {  8493, _gloffset_ConvolutionFilter2D },
-   {  8695, _gloffset_ConvolutionParameteriv },
-   {  9155, _gloffset_ConvolutionParameterfv },
-   { 20584, _gloffset_GetSeparableFilter },
-   { 24067, _gloffset_SeparableFilter2D },
-   { 24930, _gloffset_ConvolutionParameteri },
-   { 25053, _gloffset_ConvolutionParameterf },
-   { 26757, _gloffset_GetConvolutionParameterfv },
-   { 27646, _gloffset_GetConvolutionFilter },
-   { 30111, _gloffset_CopyConvolutionFilter2D },
+   {   257, _gloffset_ConvolutionFilter1D },
+   {  2454, _gloffset_CopyConvolutionFilter1D },
+   {  4058, _gloffset_GetConvolutionParameteriv },
+   {  8506, _gloffset_ConvolutionFilter2D },
+   {  8708, _gloffset_ConvolutionParameteriv },
+   {  9168, _gloffset_ConvolutionParameterfv },
+   { 20662, _gloffset_GetSeparableFilter },
+   { 24145, _gloffset_SeparableFilter2D },
+   { 25008, _gloffset_ConvolutionParameteri },
+   { 25131, _gloffset_ConvolutionParameterf },
+   { 26835, _gloffset_GetConvolutionParameterfv },
+   { 27692, _gloffset_GetConvolutionFilter },
+   { 30125, _gloffset_CopyConvolutionFilter2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_coordinate_frame)
 static const struct gl_function_remap GL_EXT_coordinate_frame_functions[] = {
-   { 10510, -1 }, /* TangentPointerEXT */
-   { 12599, -1 }, /* Binormal3ivEXT */
-   { 13295, -1 }, /* Tangent3sEXT */
-   { 14578, -1 }, /* Tangent3fvEXT */
-   { 18778, -1 }, /* Tangent3dvEXT */
-   { 19516, -1 }, /* Binormal3bvEXT */
-   { 20637, -1 }, /* Binormal3dEXT */
-   { 22799, -1 }, /* Tangent3fEXT */
-   { 25002, -1 }, /* Binormal3sEXT */
-   { 25470, -1 }, /* Tangent3ivEXT */
-   { 25489, -1 }, /* Tangent3dEXT */
-   { 26436, -1 }, /* Binormal3svEXT */
-   { 27069, -1 }, /* Binormal3fEXT */
-   { 27957, -1 }, /* Binormal3dvEXT */
-   { 29276, -1 }, /* Tangent3iEXT */
-   { 30396, -1 }, /* Tangent3bvEXT */
-   { 30956, -1 }, /* Tangent3bEXT */
-   { 31481, -1 }, /* Binormal3fvEXT */
-   { 32233, -1 }, /* BinormalPointerEXT */
-   { 32638, -1 }, /* Tangent3svEXT */
-   { 33075, -1 }, /* Binormal3bEXT */
-   { 33252, -1 }, /* Binormal3iEXT */
+   { 10523, -1 }, /* TangentPointerEXT */
+   { 12573, -1 }, /* Binormal3ivEXT */
+   { 13269, -1 }, /* Tangent3sEXT */
+   { 14623, -1 }, /* Tangent3fvEXT */
+   { 18856, -1 }, /* Tangent3dvEXT */
+   { 19594, -1 }, /* Binormal3bvEXT */
+   { 20715, -1 }, /* Binormal3dEXT */
+   { 22877, -1 }, /* Tangent3fEXT */
+   { 25080, -1 }, /* Binormal3sEXT */
+   { 25548, -1 }, /* Tangent3ivEXT */
+   { 25567, -1 }, /* Tangent3dEXT */
+   { 26514, -1 }, /* Binormal3svEXT */
+   { 27115, -1 }, /* Binormal3fEXT */
+   { 28023, -1 }, /* Binormal3dvEXT */
+   { 29290, -1 }, /* Tangent3iEXT */
+   { 30410, -1 }, /* Tangent3bvEXT */
+   { 30970, -1 }, /* Tangent3bEXT */
+   { 31534, -1 }, /* Binormal3fvEXT */
+   { 32253, -1 }, /* BinormalPointerEXT */
+   { 32658, -1 }, /* Tangent3svEXT */
+   { 33095, -1 }, /* Binormal3bEXT */
+   { 33272, -1 }, /* Binormal3iEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_copy_texture)
 static const struct gl_function_remap GL_EXT_copy_texture_functions[] = {
-   { 15103, _gloffset_CopyTexSubImage3D },
-   { 16697, _gloffset_CopyTexImage2D },
-   { 24538, _gloffset_CopyTexImage1D },
-   { 27327, _gloffset_CopyTexSubImage2D },
-   { 29749, _gloffset_CopyTexSubImage1D },
+   { 15148, _gloffset_CopyTexSubImage3D },
+   { 16775, _gloffset_CopyTexImage2D },
+   { 24616, _gloffset_CopyTexImage1D },
+   { 27373, _gloffset_CopyTexSubImage2D },
+   { 29763, _gloffset_CopyTexSubImage1D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_cull_vertex)
 static const struct gl_function_remap GL_EXT_cull_vertex_functions[] = {
-   {  8844, -1 }, /* CullParameterdvEXT */
-   { 11699, -1 }, /* CullParameterfvEXT */
+   {  8857, -1 }, /* CullParameterdvEXT */
+   { 11712, -1 }, /* CullParameterfvEXT */
    {    -1, -1 }
 };
 #endif
@@ -5792,7 +5804,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[] = {
-   {  9492, _gloffset_DrawRangeElements },
+   {  9505, _gloffset_DrawRangeElements },
    {    -1, -1 }
 };
 #endif
@@ -5841,39 +5853,39 @@ 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[] = {
-   {   895, _gloffset_Histogram },
-   {  3561, _gloffset_ResetHistogram },
-   {  9989, _gloffset_GetMinmax },
-   { 15437, _gloffset_GetHistogramParameterfv },
-   { 24463, _gloffset_GetMinmaxParameteriv },
-   { 26647, _gloffset_ResetMinmax },
-   { 27543, _gloffset_GetHistogramParameteriv },
-   { 28744, _gloffset_GetHistogram },
-   { 31333, _gloffset_Minmax },
-   { 32873, _gloffset_GetMinmaxParameterfv },
+   {   856, _gloffset_Histogram },
+   {  3522, _gloffset_ResetHistogram },
+   { 10002, _gloffset_GetMinmax },
+   { 15482, _gloffset_GetHistogramParameterfv },
+   { 24541, _gloffset_GetMinmaxParameteriv },
+   { 26725, _gloffset_ResetMinmax },
+   { 27589, _gloffset_GetHistogramParameteriv },
+   { 28758, _gloffset_GetHistogram },
+   { 31347, _gloffset_Minmax },
+   { 32893, _gloffset_GetMinmaxParameterfv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_func)
 static const struct gl_function_remap GL_EXT_index_func_functions[] = {
-   { 11485, -1 }, /* IndexFuncEXT */
+   { 11498, -1 }, /* IndexFuncEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_material)
 static const struct gl_function_remap GL_EXT_index_material_functions[] = {
-   { 21135, -1 }, /* IndexMaterialEXT */
+   { 21213, -1 }, /* IndexMaterialEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_light_texture)
 static const struct gl_function_remap GL_EXT_light_texture_functions[] = {
-   { 26456, -1 }, /* ApplyTextureEXT */
-   { 26601, -1 }, /* TextureMaterialEXT */
-   { 26626, -1 }, /* TextureLightEXT */
+   { 26534, -1 }, /* ApplyTextureEXT */
+   { 26679, -1 }, /* TextureMaterialEXT */
+   { 26704, -1 }, /* TextureLightEXT */
    {    -1, -1 }
 };
 #endif
@@ -5894,20 +5906,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[] = {
-   {  8355, _gloffset_ColorTable },
-   { 15283, _gloffset_GetColorTable },
-   { 22982, _gloffset_GetColorTableParameterfv },
-   { 25109, _gloffset_GetColorTableParameteriv },
+   {  8368, _gloffset_ColorTable },
+   { 15328, _gloffset_GetColorTable },
+   { 23060, _gloffset_GetColorTableParameterfv },
+   { 25187, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_pixel_transform)
 static const struct gl_function_remap GL_EXT_pixel_transform_functions[] = {
-   { 21782, -1 }, /* PixelTransformParameterfEXT */
-   { 21862, -1 }, /* PixelTransformParameteriEXT */
-   { 30671, -1 }, /* PixelTransformParameterfvEXT */
-   { 32197, -1 }, /* PixelTransformParameterivEXT */
+   { 21860, -1 }, /* PixelTransformParameterfEXT */
+   { 21940, -1 }, /* PixelTransformParameteriEXT */
+   { 30685, -1 }, /* PixelTransformParameterfvEXT */
+   { 32217, -1 }, /* PixelTransformParameterivEXT */
    {    -1, -1 }
 };
 #endif
@@ -5956,16 +5968,16 @@ static const struct gl_function_remap GL_EXT_stencil_two_side_functions[] = {
 
 #if defined(need_GL_EXT_subtexture)
 static const struct gl_function_remap GL_EXT_subtexture_functions[] = {
-   {  7076, _gloffset_TexSubImage1D },
-   { 10666, _gloffset_TexSubImage2D },
+   {  7089, _gloffset_TexSubImage1D },
+   { 10679, _gloffset_TexSubImage2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_texture3D)
 static const struct gl_function_remap GL_EXT_texture3D_functions[] = {
-   {  1813, _gloffset_TexImage3D },
-   { 22751, _gloffset_TexSubImage3D },
+   {  1774, _gloffset_TexImage3D },
+   { 22829, _gloffset_TexSubImage3D },
    {    -1, -1 }
 };
 #endif
@@ -5986,19 +5998,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[] = {
-   {  3329, _gloffset_PrioritizeTextures },
-   {  7525, _gloffset_AreTexturesResident },
-   { 13638, _gloffset_GenTextures },
-   { 15769, _gloffset_DeleteTextures },
-   { 19569, _gloffset_IsTexture },
-   { 29814, _gloffset_BindTexture },
+   {  3290, _gloffset_PrioritizeTextures },
+   {  7538, _gloffset_AreTexturesResident },
+   { 13612, _gloffset_GenTextures },
+   { 15814, _gloffset_DeleteTextures },
+   { 19647, _gloffset_IsTexture },
+   { 29828, _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[] = {
-   { 13848, -1 }, /* TextureNormalEXT */
+   { 13854, -1 }, /* TextureNormalEXT */
    {    -1, -1 }
 };
 #endif
@@ -6020,30 +6032,30 @@ static const struct gl_function_remap GL_EXT_transform_feedback_functions[] = {
 #if defined(need_GL_EXT_vertex_array)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_EXT_vertex_array_functions[] = {
-   { 24239, _gloffset_ArrayElement },
-   { 30921, _gloffset_GetPointerv },
-   { 32500, _gloffset_DrawArrays },
+   { 24317, _gloffset_ArrayElement },
+   { 30935, _gloffset_GetPointerv },
+   { 32520, _gloffset_DrawArrays },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_vertex_weighting)
 static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
-   { 19599, -1 }, /* VertexWeightfvEXT */
-   { 27012, -1 }, /* VertexWeightfEXT */
-   { 28713, -1 }, /* VertexWeightPointerEXT */
+   { 19677, -1 }, /* VertexWeightfvEXT */
+   { 27058, -1 }, /* VertexWeightfEXT */
+   { 28727, -1 }, /* VertexWeightPointerEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_HP_image_transform)
 static const struct gl_function_remap GL_HP_image_transform_functions[] = {
-   {  2366, -1 }, /* GetImageTransformParameterfvHP */
-   {  3778, -1 }, /* ImageTransformParameterfHP */
-   { 10204, -1 }, /* ImageTransformParameterfvHP */
-   { 11954, -1 }, /* ImageTransformParameteriHP */
-   { 12334, -1 }, /* GetImageTransformParameterivHP */
-   { 19663, -1 }, /* ImageTransformParameterivHP */
+   {  2327, -1 }, /* GetImageTransformParameterfvHP */
+   {  3739, -1 }, /* ImageTransformParameterfHP */
+   { 10217, -1 }, /* ImageTransformParameterfvHP */
+   { 11967, -1 }, /* ImageTransformParameteriHP */
+   { 12308, -1 }, /* GetImageTransformParameterivHP */
+   { 19741, -1 }, /* ImageTransformParameterivHP */
    {    -1, -1 }
 };
 #endif
@@ -6057,14 +6069,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[] = {
-   {  4366, -1 }, /* SecondaryColorPointerListIBM */
-   {  6008, -1 }, /* NormalPointerListIBM */
-   {  7699, -1 }, /* FogCoordPointerListIBM */
-   {  8006, -1 }, /* VertexPointerListIBM */
-   { 11875, -1 }, /* ColorPointerListIBM */
-   { 13402, -1 }, /* TexCoordPointerListIBM */
-   { 13870, -1 }, /* IndexPointerListIBM */
-   { 32816, -1 }, /* EdgeFlagPointerListIBM */
+   {  4379, -1 }, /* SecondaryColorPointerListIBM */
+   {  6021, -1 }, /* NormalPointerListIBM */
+   {  7712, -1 }, /* FogCoordPointerListIBM */
+   {  8019, -1 }, /* VertexPointerListIBM */
+   { 11888, -1 }, /* ColorPointerListIBM */
+   { 13376, -1 }, /* TexCoordPointerListIBM */
+   { 13876, -1 }, /* IndexPointerListIBM */
+   { 32836, -1 }, /* EdgeFlagPointerListIBM */
    {    -1, -1 }
 };
 #endif
@@ -6078,10 +6090,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[] = {
-   { 12742, -1 }, /* VertexPointervINTEL */
-   { 15530, -1 }, /* ColorPointervINTEL */
-   { 30085, -1 }, /* NormalPointervINTEL */
-   { 30603, -1 }, /* TexCoordPointervINTEL */
+   { 12716, -1 }, /* VertexPointervINTEL */
+   { 15575, -1 }, /* ColorPointervINTEL */
+   { 30099, -1 }, /* NormalPointervINTEL */
+   { 30617, -1 }, /* TexCoordPointervINTEL */
    {    -1, -1 }
 };
 #endif
@@ -6095,10 +6107,10 @@ static const struct gl_function_remap GL_MESA_resize_buffers_functions[] = {
 
 #if defined(need_GL_MESA_shader_debug)
 static const struct gl_function_remap GL_MESA_shader_debug_functions[] = {
-   {  1677, -1 }, /* GetDebugLogLengthMESA */
-   {  3500, -1 }, /* ClearDebugLogMESA */
-   {  4527, -1 }, /* GetDebugLogMESA */
-   { 31114, -1 }, /* CreateDebugObjectMESA */
+   {  1638, -1 }, /* GetDebugLogLengthMESA */
+   {  3461, -1 }, /* ClearDebugLogMESA */
+   {  4540, -1 }, /* GetDebugLogMESA */
+   { 31128, -1 }, /* CreateDebugObjectMESA */
    {    -1, -1 }
 };
 #endif
@@ -6119,15 +6131,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[] = {
-   {  6738, -1 }, /* GetMapAttribParameterivNV */
-   {  8461, -1 }, /* MapControlPointsNV */
-   {  8560, -1 }, /* MapParameterfvNV */
-   { 10649, -1 }, /* EvalMapsNV */
-   { 17184, -1 }, /* GetMapAttribParameterfvNV */
-   { 17401, -1 }, /* MapParameterivNV */
-   { 24853, -1 }, /* GetMapParameterivNV */
-   { 25351, -1 }, /* GetMapParameterfvNV */
-   { 29400, -1 }, /* GetMapControlPointsNV */
+   {  6751, -1 }, /* GetMapAttribParameterivNV */
+   {  8474, -1 }, /* MapControlPointsNV */
+   {  8573, -1 }, /* MapParameterfvNV */
+   { 10662, -1 }, /* EvalMapsNV */
+   { 17262, -1 }, /* GetMapAttribParameterfvNV */
+   { 17479, -1 }, /* MapParameterivNV */
+   { 24931, -1 }, /* GetMapParameterivNV */
+   { 25429, -1 }, /* GetMapParameterfvNV */
+   { 29414, -1 }, /* GetMapControlPointsNV */
    {    -1, -1 }
 };
 #endif
@@ -6169,8 +6181,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[] = {
-   { 15922, -1 }, /* CombinerStageParameterfvNV */
-   { 16318, -1 }, /* GetCombinerStageParameterfvNV */
+   { 15967, -1 }, /* CombinerStageParameterfvNV */
+   { 16363, -1 }, /* GetCombinerStageParameterfvNV */
    {    -1, -1 }
 };
 #endif
@@ -6205,23 +6217,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[] = {
-   {  8681, -1 }, /* HintPGI */
+   {  8694, -1 }, /* HintPGI */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_detail_texture)
 static const struct gl_function_remap GL_SGIS_detail_texture_functions[] = {
-   { 16291, -1 }, /* GetDetailTexFuncSGIS */
-   { 16642, -1 }, /* DetailTexFuncSGIS */
+   { 16336, -1 }, /* GetDetailTexFuncSGIS */
+   { 16720, -1 }, /* DetailTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_fog_function)
 static const struct gl_function_remap GL_SGIS_fog_function_functions[] = {
-   { 27309, -1 }, /* FogFuncSGIS */
-   { 28062, -1 }, /* GetFogFuncSGIS */
+   { 27355, -1 }, /* FogFuncSGIS */
+   { 28076, -1 }, /* GetFogFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -6249,112 +6261,112 @@ static const struct gl_function_remap GL_SGIS_point_parameters_functions[] = {
 
 #if defined(need_GL_SGIS_sharpen_texture)
 static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
-   {  6799, -1 }, /* GetSharpenTexFuncSGIS */
-   { 22147, -1 }, /* SharpenTexFuncSGIS */
+   {  6812, -1 }, /* GetSharpenTexFuncSGIS */
+   { 22225, -1 }, /* SharpenTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture4D)
 static const struct gl_function_remap GL_SGIS_texture4D_functions[] = {
-   {  1049, -1 }, /* TexImage4DSGIS */
-   { 15838, -1 }, /* TexSubImage4DSGIS */
+   {  1010, -1 }, /* TexImage4DSGIS */
+   { 15883, -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[] = {
-   { 15236, -1 }, /* TextureColorMaskSGIS */
+   { 15281, -1 }, /* TextureColorMaskSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_filter4)
 static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {
-   {  6976, -1 }, /* GetTexFilterFuncSGIS */
-   { 16437, -1 }, /* TexFilterFuncSGIS */
+   {  6989, -1 }, /* GetTexFilterFuncSGIS */
+   { 16482, -1 }, /* TexFilterFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_async)
 static const struct gl_function_remap GL_SGIX_async_functions[] = {
-   {  3426, -1 }, /* AsyncMarkerSGIX */
-   {  4506, -1 }, /* FinishAsyncSGIX */
-   {  5495, -1 }, /* PollAsyncSGIX */
-   { 22328, -1 }, /* DeleteAsyncMarkersSGIX */
-   { 22383, -1 }, /* IsAsyncMarkerSGIX */
-   { 32613, -1 }, /* GenAsyncMarkersSGIX */
+   {  3387, -1 }, /* AsyncMarkerSGIX */
+   {  4519, -1 }, /* FinishAsyncSGIX */
+   {  5466, -1 }, /* PollAsyncSGIX */
+   { 22406, -1 }, /* DeleteAsyncMarkersSGIX */
+   { 22461, -1 }, /* IsAsyncMarkerSGIX */
+   { 32633, -1 }, /* GenAsyncMarkersSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_flush_raster)
 static const struct gl_function_remap GL_SGIX_flush_raster_functions[] = {
-   {  7353, -1 }, /* FlushRasterSGIX */
+   {  7366, -1 }, /* FlushRasterSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_fragment_lighting)
 static const struct gl_function_remap GL_SGIX_fragment_lighting_functions[] = {
-   {  2664, -1 }, /* FragmentMaterialfvSGIX */
-   {  5399, -1 }, /* FragmentLightiSGIX */
-   {  8073, -1 }, /* FragmentMaterialfSGIX */
-   {  8234, -1 }, /* GetFragmentLightivSGIX */
-   {  9107, -1 }, /* FragmentLightModeliSGIX */
-   { 10712, -1 }, /* FragmentLightivSGIX */
-   { 11019, -1 }, /* GetFragmentMaterialivSGIX */
-   { 16231, -1 }, /* GetFragmentMaterialfvSGIX */
-   { 19486, -1 }, /* FragmentLightModelfSGIX */
-   { 19786, -1 }, /* FragmentColorMaterialSGIX */
-   { 20203, -1 }, /* FragmentMaterialiSGIX */
-   { 21463, -1 }, /* LightEnviSGIX */
-   { 23074, -1 }, /* FragmentLightModelfvSGIX */
-   { 23409, -1 }, /* FragmentLightfvSGIX */
-   { 28446, -1 }, /* FragmentLightModelivSGIX */
-   { 28595, -1 }, /* FragmentLightfSGIX */
-   { 31451, -1 }, /* GetFragmentLightfvSGIX */
-   { 33096, -1 }, /* FragmentMaterialivSGIX */
+   {  2625, -1 }, /* FragmentMaterialfvSGIX */
+   {  5370, -1 }, /* FragmentLightiSGIX */
+   {  8086, -1 }, /* FragmentMaterialfSGIX */
+   {  8247, -1 }, /* GetFragmentLightivSGIX */
+   {  9120, -1 }, /* FragmentLightModeliSGIX */
+   { 10725, -1 }, /* FragmentLightivSGIX */
+   { 11032, -1 }, /* GetFragmentMaterialivSGIX */
+   { 16276, -1 }, /* GetFragmentMaterialfvSGIX */
+   { 19564, -1 }, /* FragmentLightModelfSGIX */
+   { 19864, -1 }, /* FragmentColorMaterialSGIX */
+   { 20281, -1 }, /* FragmentMaterialiSGIX */
+   { 21541, -1 }, /* LightEnviSGIX */
+   { 23152, -1 }, /* FragmentLightModelfvSGIX */
+   { 23487, -1 }, /* FragmentLightfvSGIX */
+   { 28460, -1 }, /* FragmentLightModelivSGIX */
+   { 28609, -1 }, /* FragmentLightfSGIX */
+   { 31504, -1 }, /* GetFragmentLightfvSGIX */
+   { 33116, -1 }, /* FragmentMaterialivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_framezoom)
 static const struct gl_function_remap GL_SGIX_framezoom_functions[] = {
-   { 22406, -1 }, /* FrameZoomSGIX */
+   { 22484, -1 }, /* FrameZoomSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_igloo_interface)
 static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
-   { 28903, -1 }, /* IglooInterfaceSGIX */
+   { 28917, -1 }, /* IglooInterfaceSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_instruments)
 static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
-   {  2844, -1 }, /* ReadInstrumentsSGIX */
-   {  6572, -1 }, /* PollInstrumentsSGIX */
-   { 10570, -1 }, /* GetInstrumentsSGIX */
-   { 13000, -1 }, /* StartInstrumentsSGIX */
-   { 15956, -1 }, /* StopInstrumentsSGIX */
-   { 17823, -1 }, /* InstrumentsBufferSGIX */
+   {  2805, -1 }, /* ReadInstrumentsSGIX */
+   {  6585, -1 }, /* PollInstrumentsSGIX */
+   { 10583, -1 }, /* GetInstrumentsSGIX */
+   { 12974, -1 }, /* StartInstrumentsSGIX */
+   { 16001, -1 }, /* StopInstrumentsSGIX */
+   { 17901, -1 }, /* InstrumentsBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_list_priority)
 static const struct gl_function_remap GL_SGIX_list_priority_functions[] = {
-   {  1280, -1 }, /* ListParameterfSGIX */
-   {  3128, -1 }, /* GetListParameterfvSGIX */
-   { 17714, -1 }, /* ListParameteriSGIX */
-   { 18728, -1 }, /* ListParameterfvSGIX */
-   { 20869, -1 }, /* ListParameterivSGIX */
-   { 32657, -1 }, /* GetListParameterivSGIX */
+   {  1241, -1 }, /* ListParameterfSGIX */
+   {  3089, -1 }, /* GetListParameterfvSGIX */
+   { 17792, -1 }, /* ListParameteriSGIX */
+   { 18806, -1 }, /* ListParameterfvSGIX */
+   { 20947, -1 }, /* ListParameterivSGIX */
+   { 32677, -1 }, /* GetListParameterivSGIX */
    {    -1, -1 }
 };
 #endif
@@ -6368,134 +6380,134 @@ static const struct gl_function_remap GL_SGIX_pixel_texture_functions[] = {
 
 #if defined(need_GL_SGIX_polynomial_ffd)
 static const struct gl_function_remap GL_SGIX_polynomial_ffd_functions[] = {
-   {  3724, -1 }, /* LoadIdentityDeformationMapSGIX */
-   { 12208, -1 }, /* DeformationMap3dSGIX */
-   { 16056, -1 }, /* DeformSGIX */
-   { 24351, -1 }, /* DeformationMap3fSGIX */
+   {  3685, -1 }, /* LoadIdentityDeformationMapSGIX */
+   { 16101, -1 }, /* DeformSGIX */
+   { 24429, -1 }, /* DeformationMap3fSGIX */
+   { 31392, -1 }, /* DeformationMap3dSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_reference_plane)
 static const struct gl_function_remap GL_SGIX_reference_plane_functions[] = {
-   { 14787, -1 }, /* ReferencePlaneSGIX */
+   { 14832, -1 }, /* ReferencePlaneSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_sprite)
 static const struct gl_function_remap GL_SGIX_sprite_functions[] = {
-   {  9605, -1 }, /* SpriteParameterfvSGIX */
-   { 20658, -1 }, /* SpriteParameteriSGIX */
-   { 26681, -1 }, /* SpriteParameterfSGIX */
-   { 29543, -1 }, /* SpriteParameterivSGIX */
+   {  9618, -1 }, /* SpriteParameterfvSGIX */
+   { 20736, -1 }, /* SpriteParameteriSGIX */
+   { 26759, -1 }, /* SpriteParameterfSGIX */
+   { 29557, -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[] = {
-   { 20717, -1 }, /* TagSampleBufferSGIX */
+   { 20795, -1 }, /* TagSampleBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGI_color_table)
 static const struct gl_function_remap GL_SGI_color_table_functions[] = {
-   {  7643, _gloffset_ColorTableParameteriv },
-   {  8355, _gloffset_ColorTable },
-   { 15283, _gloffset_GetColorTable },
-   { 15393, _gloffset_CopyColorTable },
-   { 19430, _gloffset_ColorTableParameterfv },
-   { 22982, _gloffset_GetColorTableParameterfv },
-   { 25109, _gloffset_GetColorTableParameteriv },
+   {  7656, _gloffset_ColorTableParameteriv },
+   {  8368, _gloffset_ColorTable },
+   { 15328, _gloffset_GetColorTable },
+   { 15438, _gloffset_CopyColorTable },
+   { 19508, _gloffset_ColorTableParameterfv },
+   { 23060, _gloffset_GetColorTableParameterfv },
+   { 25187, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUNX_constant_data)
 static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
-   { 31429, -1 }, /* FinishTextureSUNX */
+   { 31482, -1 }, /* FinishTextureSUNX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_global_alpha)
 static const struct gl_function_remap GL_SUN_global_alpha_functions[] = {
-   {  3447, -1 }, /* GlobalAlphaFactorubSUN */
-   {  4805, -1 }, /* GlobalAlphaFactoriSUN */
-   {  6597, -1 }, /* GlobalAlphaFactordSUN */
-   {  9689, -1 }, /* GlobalAlphaFactoruiSUN */
-   { 10161, -1 }, /* GlobalAlphaFactorbSUN */
-   { 13315, -1 }, /* GlobalAlphaFactorfSUN */
-   { 13479, -1 }, /* GlobalAlphaFactorusSUN */
-   { 22669, -1 }, /* GlobalAlphaFactorsSUN */
+   {  3408, -1 }, /* GlobalAlphaFactorubSUN */
+   {  4818, -1 }, /* GlobalAlphaFactoriSUN */
+   {  6610, -1 }, /* GlobalAlphaFactordSUN */
+   {  9702, -1 }, /* GlobalAlphaFactoruiSUN */
+   { 10174, -1 }, /* GlobalAlphaFactorbSUN */
+   { 13289, -1 }, /* GlobalAlphaFactorfSUN */
+   { 13453, -1 }, /* GlobalAlphaFactorusSUN */
+   { 22747, -1 }, /* GlobalAlphaFactorsSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_mesh_array)
 static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
-   { 29334, -1 }, /* DrawMeshArraysSUN */
+   { 29348, -1 }, /* DrawMeshArraysSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_triangle_list)
 static const struct gl_function_remap GL_SUN_triangle_list_functions[] = {
-   {  4480, -1 }, /* ReplacementCodeubSUN */
-   {  6356, -1 }, /* ReplacementCodeubvSUN */
-   { 19151, -1 }, /* ReplacementCodeusvSUN */
-   { 19339, -1 }, /* ReplacementCodePointerSUN */
-   { 21527, -1 }, /* ReplacementCodeuiSUN */
-   { 22357, -1 }, /* ReplacementCodeusSUN */
-   { 30000, -1 }, /* ReplacementCodeuivSUN */
+   {  4493, -1 }, /* ReplacementCodeubSUN */
+   {  6369, -1 }, /* ReplacementCodeubvSUN */
+   { 19229, -1 }, /* ReplacementCodeusvSUN */
+   { 19417, -1 }, /* ReplacementCodePointerSUN */
+   { 21605, -1 }, /* ReplacementCodeuiSUN */
+   { 22435, -1 }, /* ReplacementCodeusSUN */
+   { 30014, -1 }, /* ReplacementCodeuivSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_vertex)
 static const struct gl_function_remap GL_SUN_vertex_functions[] = {
-   {  1154, -1 }, /* ReplacementCodeuiColor3fVertex3fvSUN */
-   {  1352, -1 }, /* TexCoord4fColor4fNormal3fVertex4fvSUN */
-   {  1578, -1 }, /* TexCoord2fColor4ubVertex3fvSUN */
-   {  1908, -1 }, /* ReplacementCodeuiVertex3fvSUN */
-   {  2042, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fvSUN */
-   {  2600, -1 }, /* ReplacementCodeuiNormal3fVertex3fSUN */
-   {  2913, -1 }, /* Color4ubVertex3fvSUN */
-   {  4639, -1 }, /* Color4ubVertex3fSUN */
-   {  4762, -1 }, /* TexCoord2fVertex3fSUN */
-   {  5106, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
-   {  5599, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
-   {  6251, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
-   {  7031, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
-   {  7390, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
-   {  8102, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
-   {  8906, -1 }, /* Color3fVertex3fSUN */
-   { 10097, -1 }, /* Color3fVertex3fvSUN */
-   { 10535, -1 }, /* Color4fNormal3fVertex3fvSUN */
-   { 11364, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 12863, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
-   { 14403, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
-   { 14929, -1 }, /* TexCoord2fColor3fVertex3fSUN */
-   { 15981, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
-   { 16396, -1 }, /* Color4ubVertex2fvSUN */
-   { 16667, -1 }, /* Normal3fVertex3fSUN */
-   { 17764, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
-   { 18125, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 18980, -1 }, /* TexCoord2fVertex3fvSUN */
-   { 19756, -1 }, /* Color4ubVertex2fSUN */
-   { 19994, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
-   { 21993, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
-   { 22425, -1 }, /* Normal3fVertex3fvSUN */
-   { 22891, -1 }, /* Color4fNormal3fVertex3fSUN */
-   { 23900, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
-   { 26002, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
-   { 27425, -1 }, /* TexCoord4fVertex4fSUN */
-   { 27851, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
-   { 28290, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
-   { 28417, -1 }, /* TexCoord4fVertex4fvSUN */
-   { 29151, -1 }, /* ReplacementCodeuiVertex3fSUN */
+   {  1115, -1 }, /* ReplacementCodeuiColor3fVertex3fvSUN */
+   {  1313, -1 }, /* TexCoord4fColor4fNormal3fVertex4fvSUN */
+   {  1539, -1 }, /* TexCoord2fColor4ubVertex3fvSUN */
+   {  1869, -1 }, /* ReplacementCodeuiVertex3fvSUN */
+   {  2003, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fvSUN */
+   {  2561, -1 }, /* ReplacementCodeuiNormal3fVertex3fSUN */
+   {  2874, -1 }, /* Color4ubVertex3fvSUN */
+   {  4652, -1 }, /* Color4ubVertex3fSUN */
+   {  4775, -1 }, /* TexCoord2fVertex3fSUN */
+   {  5119, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
+   {  5570, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
+   {  6264, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
+   {  7044, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
+   {  7403, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
+   {  8115, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
+   {  8919, -1 }, /* Color3fVertex3fSUN */
+   { 10110, -1 }, /* Color3fVertex3fvSUN */
+   { 10548, -1 }, /* Color4fNormal3fVertex3fvSUN */
+   { 11377, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 12837, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
+   { 14448, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
+   { 14974, -1 }, /* TexCoord2fColor3fVertex3fSUN */
+   { 16026, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
+   { 16441, -1 }, /* Color4ubVertex2fvSUN */
+   { 16745, -1 }, /* Normal3fVertex3fSUN */
+   { 17842, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
+   { 18203, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 19058, -1 }, /* TexCoord2fVertex3fvSUN */
+   { 19834, -1 }, /* Color4ubVertex2fSUN */
+   { 20072, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
+   { 22071, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
+   { 22503, -1 }, /* Normal3fVertex3fvSUN */
+   { 22969, -1 }, /* Color4fNormal3fVertex3fSUN */
+   { 23978, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
+   { 26080, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
+   { 27471, -1 }, /* TexCoord4fVertex4fSUN */
+   { 27917, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
+   { 28304, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
+   { 28431, -1 }, /* TexCoord4fVertex4fvSUN */
+   { 29165, -1 }, /* ReplacementCodeuiVertex3fSUN */
    {    -1, -1 }
 };
 #endif
@@ -6503,40 +6515,40 @@ static const struct gl_function_remap GL_SUN_vertex_functions[] = {
 #if defined(need_GL_VERSION_1_3)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_VERSION_1_3_functions[] = {
-   {   464, _gloffset_MultiTexCoord3sARB },
-   {   696, _gloffset_ActiveTextureARB },
-   {  4234, _gloffset_MultiTexCoord1fvARB },
-   {  6142, _gloffset_MultiTexCoord3dARB },
-   {  6187, _gloffset_MultiTexCoord2iARB },
-   {  6311, _gloffset_MultiTexCoord2svARB },
-   {  8311, _gloffset_MultiTexCoord2fARB },
-   { 10371, _gloffset_MultiTexCoord3fvARB },
-   { 10973, _gloffset_MultiTexCoord4sARB },
-   { 11654, _gloffset_MultiTexCoord2dvARB },
-   { 12069, _gloffset_MultiTexCoord1svARB },
-   { 12480, _gloffset_MultiTexCoord3svARB },
-   { 12541, _gloffset_MultiTexCoord4iARB },
-   { 13342, _gloffset_MultiTexCoord3iARB },
-   { 14141, _gloffset_MultiTexCoord1dARB },
-   { 14358, _gloffset_MultiTexCoord3dvARB },
-   { 15637, _gloffset_MultiTexCoord3ivARB },
-   { 15682, _gloffset_MultiTexCoord2sARB },
-   { 17067, _gloffset_MultiTexCoord4ivARB },
-   { 19080, _gloffset_ClientActiveTextureARB },
-   { 21380, _gloffset_MultiTexCoord2dARB },
-   { 21817, _gloffset_MultiTexCoord4dvARB },
-   { 22173, _gloffset_MultiTexCoord4fvARB },
-   { 23123, _gloffset_MultiTexCoord3fARB },
-   { 25693, _gloffset_MultiTexCoord4dARB },
-   { 25959, _gloffset_MultiTexCoord1sARB },
-   { 26163, _gloffset_MultiTexCoord1dvARB },
-   { 27171, _gloffset_MultiTexCoord1ivARB },
-   { 27264, _gloffset_MultiTexCoord2ivARB },
-   { 27603, _gloffset_MultiTexCoord1iARB },
-   { 29019, _gloffset_MultiTexCoord4svARB },
-   { 29613, _gloffset_MultiTexCoord1fARB },
-   { 29876, _gloffset_MultiTexCoord4fARB },
-   { 32334, _gloffset_MultiTexCoord2fvARB },
+   {   425, _gloffset_MultiTexCoord3sARB },
+   {   657, _gloffset_ActiveTextureARB },
+   {  4247, _gloffset_MultiTexCoord1fvARB },
+   {  6155, _gloffset_MultiTexCoord3dARB },
+   {  6200, _gloffset_MultiTexCoord2iARB },
+   {  6324, _gloffset_MultiTexCoord2svARB },
+   {  8324, _gloffset_MultiTexCoord2fARB },
+   { 10384, _gloffset_MultiTexCoord3fvARB },
+   { 10986, _gloffset_MultiTexCoord4sARB },
+   { 11667, _gloffset_MultiTexCoord2dvARB },
+   { 12082, _gloffset_MultiTexCoord1svARB },
+   { 12454, _gloffset_MultiTexCoord3svARB },
+   { 12515, _gloffset_MultiTexCoord4iARB },
+   { 13316, _gloffset_MultiTexCoord3iARB },
+   { 14186, _gloffset_MultiTexCoord1dARB },
+   { 14403, _gloffset_MultiTexCoord3dvARB },
+   { 15682, _gloffset_MultiTexCoord3ivARB },
+   { 15727, _gloffset_MultiTexCoord2sARB },
+   { 17145, _gloffset_MultiTexCoord4ivARB },
+   { 19158, _gloffset_ClientActiveTextureARB },
+   { 21458, _gloffset_MultiTexCoord2dARB },
+   { 21895, _gloffset_MultiTexCoord4dvARB },
+   { 22251, _gloffset_MultiTexCoord4fvARB },
+   { 23201, _gloffset_MultiTexCoord3fARB },
+   { 25771, _gloffset_MultiTexCoord4dARB },
+   { 26037, _gloffset_MultiTexCoord1sARB },
+   { 26241, _gloffset_MultiTexCoord1dvARB },
+   { 27217, _gloffset_MultiTexCoord1ivARB },
+   { 27310, _gloffset_MultiTexCoord2ivARB },
+   { 27649, _gloffset_MultiTexCoord1iARB },
+   { 29033, _gloffset_MultiTexCoord4svARB },
+   { 29627, _gloffset_MultiTexCoord1fARB },
+   { 29890, _gloffset_MultiTexCoord4fARB },
+   { 32354, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 #endif
diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c
index 3609577b7..066e8b427 100644
--- a/mesalib/src/mesa/main/shaderapi.c
+++ b/mesalib/src/mesa/main/shaderapi.c
@@ -1029,6 +1029,7 @@ static GLboolean
 validate_samplers(const struct gl_program *prog, char *errMsg)
 {
    static const char *targetName[] = {
+      "TEXTURE_BUFFER",
       "TEXTURE_2D_ARRAY",
       "TEXTURE_1D_ARRAY",
       "TEXTURE_CUBE",
diff --git a/mesalib/src/mesa/main/shared.c b/mesalib/src/mesa/main/shared.c
index 9a2b90c8e..22b3bbdd4 100644
--- a/mesalib/src/mesa/main/shared.c
+++ b/mesalib/src/mesa/main/shared.c
@@ -98,6 +98,7 @@ _mesa_alloc_shared_state(struct gl_context *ctx)
    for (i = 0; i < NUM_TEXTURE_TARGETS; i++) {
       /* NOTE: the order of these enums matches the TEXTURE_x_INDEX values */
       static const GLenum targets[NUM_TEXTURE_TARGETS] = {
+         GL_TEXTURE_BUFFER,
          GL_TEXTURE_2D_ARRAY_EXT,
          GL_TEXTURE_1D_ARRAY_EXT,
          GL_TEXTURE_CUBE_MAP,
@@ -106,6 +107,7 @@ _mesa_alloc_shared_state(struct gl_context *ctx)
          GL_TEXTURE_2D,
          GL_TEXTURE_1D
       };
+      assert(Elements(targets) == NUM_TEXTURE_TARGETS);
       shared->DefaultTex[i] = ctx->Driver.NewTextureObject(ctx, 0, targets[i]);
    }
 
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 037cce5c2..a2df4e36e 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -681,8 +681,10 @@ _mesa_delete_texture_image(struct gl_context *ctx,
 GLboolean
 _mesa_is_proxy_texture(GLenum target)
 {
-   /* NUM_TEXTURE_TARGETS should match number of terms below */
-   assert(NUM_TEXTURE_TARGETS == 7);
+   /* NUM_TEXTURE_TARGETS should match number of terms below,
+    * except there's no proxy for GL_TEXTURE_BUFFER.
+    */
+   assert(NUM_TEXTURE_TARGETS == 8);
 
    return (target == GL_PROXY_TEXTURE_1D ||
            target == GL_PROXY_TEXTURE_2D ||
@@ -794,6 +796,9 @@ _mesa_select_tex_object(struct gl_context *ctx,
          return arrayTex ? texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX] : NULL;
       case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
          return arrayTex ? ctx->Texture.ProxyTex[TEXTURE_2D_ARRAY_INDEX] : NULL;
+      case GL_TEXTURE_BUFFER:
+         return ctx->Extensions.ARB_texture_buffer_object
+            ? texUnit->CurrentTex[TEXTURE_BUFFER_INDEX] : NULL;
       default:
          _mesa_problem(NULL, "bad target in _mesa_select_tex_object()");
          return NULL;
@@ -981,6 +986,8 @@ _mesa_max_texture_levels(struct gl_context *ctx, GLenum target)
       return (ctx->Extensions.MESA_texture_array ||
               ctx->Extensions.EXT_texture_array)
          ? ctx->Const.MaxTextureLevels : 0;
+   case GL_TEXTURE_BUFFER:
+      /* fall-through */
    default:
       return 0; /* bad target */
    }
@@ -1017,6 +1024,8 @@ _mesa_get_texture_dimensions(GLenum target)
    case GL_TEXTURE_2D_ARRAY:
    case GL_PROXY_TEXTURE_2D_ARRAY:
       return 3;
+   case GL_TEXTURE_BUFFER:
+      /* fall-through */
    default:
       _mesa_problem(NULL, "invalid target 0x%x in get_texture_dimensions()",
                     target);
@@ -2251,7 +2260,7 @@ check_rtt_cb(GLuint key, void *data, void *userData)
              att->Texture == texObj &&
              att->TextureLevel == level &&
              att->CubeMapFace == face) {
-            ASSERT(att->Texture->Image[att->CubeMapFace][att->TextureLevel]);
+            ASSERT(_mesa_get_attachment_teximage(att));
             /* Tell driver about the new renderbuffer texture */
             ctx->Driver.RenderTexture(ctx, ctx->DrawBuffer, att);
             /* Mark fb status as indeterminate to force re-validation */
@@ -3551,3 +3560,272 @@ _mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
    compressed_tex_sub_image(3, target, level, xoffset, yoffset, zoffset,
                             width, height, depth, format, imageSize, data);
 }
+
+
+/**
+ * Helper for glTexBuffer().  Check if internalFormat is legal.  If so,
+ * return the basic data type and number of components for the format.
+ * \param return  GL_TRUE if internalFormat is legal, GL_FALSE otherwise
+ */
+static GLboolean
+get_sized_format_info(const struct gl_context *ctx, GLenum internalFormat,
+                      GLenum *datatype, GLuint *components)
+{
+   switch (internalFormat) {
+   case GL_ALPHA8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *components = 1;
+      break;
+   case GL_ALPHA16:
+      *datatype = GL_UNSIGNED_SHORT;
+      *components = 1;
+      break;
+   case GL_ALPHA16F_ARB:
+      *datatype = GL_HALF_FLOAT;
+      *components = 1;
+      break;
+   case GL_ALPHA32F_ARB:
+      *datatype = GL_FLOAT;
+      *components = 1;
+      break;
+   case GL_ALPHA8I_EXT:
+      *datatype = GL_BYTE;
+      *components = 1;
+      break;
+   case GL_ALPHA16I_EXT:
+      *datatype = GL_SHORT;
+      *components = 1;
+      break;
+   case GL_ALPHA32I_EXT:
+      *datatype = GL_INT;
+      *components = 1;
+      break;
+   case GL_ALPHA8UI_EXT:
+      *datatype = GL_UNSIGNED_BYTE;
+      *components = 1;
+      break;
+   case GL_ALPHA16UI_EXT:
+      *datatype = GL_UNSIGNED_SHORT;
+      *components = 1;
+      break;
+   case GL_ALPHA32UI_EXT:
+      *datatype = GL_UNSIGNED_INT;
+      *components = 1;
+      break;
+   case GL_LUMINANCE8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *components = 1;
+      break;
+   case GL_LUMINANCE16:
+      *datatype = GL_UNSIGNED_SHORT;
+      *components = 1;
+      break;
+   case GL_LUMINANCE16F_ARB:
+      *datatype = GL_HALF_FLOAT;
+      *components = 1;
+      break;
+   case GL_LUMINANCE32F_ARB:
+      *datatype = GL_FLOAT;
+      *components = 1;
+      break;
+   case GL_LUMINANCE8I_EXT:
+      *datatype = GL_BYTE;
+      *components = 1;
+      break;
+   case GL_LUMINANCE16I_EXT:
+      *datatype = GL_SHORT;
+      *components = 1;
+      break;
+   case GL_LUMINANCE32I_EXT:
+      *datatype = GL_INT;
+      *components = 1;
+      break;
+   case GL_LUMINANCE8UI_EXT:
+      *datatype = GL_UNSIGNED_BYTE;
+      *components = 1;
+      break;
+   case GL_LUMINANCE16UI_EXT:
+      *datatype = GL_UNSIGNED_SHORT;
+      *components = 1;
+      break;
+   case GL_LUMINANCE32UI_EXT:
+      *datatype = GL_UNSIGNED_INT;
+      *components = 1;
+      break;
+   case GL_LUMINANCE8_ALPHA8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *components = 2;
+      break;
+   case GL_LUMINANCE16_ALPHA16:
+      *datatype = GL_UNSIGNED_SHORT;
+      *components = 2;
+      break;
+   case GL_LUMINANCE_ALPHA16F_ARB:
+      *datatype = GL_HALF_FLOAT;
+      *components = 2;
+      break;
+   case GL_LUMINANCE_ALPHA32F_ARB:
+      *datatype = GL_FLOAT;
+      *components = 2;
+      break;
+   case GL_LUMINANCE_ALPHA8I_EXT:
+      *datatype = GL_BYTE;
+      *components = 2;
+      break;
+   case GL_LUMINANCE_ALPHA16I_EXT:
+      *datatype = GL_SHORT;
+      *components = 2;
+      break;
+   case GL_LUMINANCE_ALPHA32I_EXT:
+      *datatype = GL_INT;
+      *components = 2;
+      break;
+   case GL_LUMINANCE_ALPHA8UI_EXT:
+      *datatype = GL_UNSIGNED_BYTE;
+      *components = 2;
+      break;
+   case GL_LUMINANCE_ALPHA16UI_EXT:
+      *datatype = GL_UNSIGNED_SHORT;
+      *components = 2;
+      break;
+   case GL_LUMINANCE_ALPHA32UI_EXT:
+      *datatype = GL_UNSIGNED_INT;
+      *components = 2;
+      break;
+   case GL_INTENSITY8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *components = 1;
+      break;
+   case GL_INTENSITY16:
+      *datatype = GL_UNSIGNED_SHORT;
+      *components = 1;
+      break;
+   case GL_INTENSITY16F_ARB:
+      *datatype = GL_HALF_FLOAT;
+      *components = 1;
+      break;
+   case GL_INTENSITY32F_ARB:
+      *datatype = GL_FLOAT;
+      *components = 1;
+      break;
+   case GL_INTENSITY8I_EXT:
+      *datatype = GL_BYTE;
+      *components = 1;
+      break;
+   case GL_INTENSITY16I_EXT:
+      *datatype = GL_SHORT;
+      *components = 1;
+      break;
+   case GL_INTENSITY32I_EXT:
+      *datatype = GL_INT;
+      *components = 1;
+      break;
+   case GL_INTENSITY8UI_EXT:
+      *datatype = GL_UNSIGNED_BYTE;
+      *components = 1;
+      break;
+   case GL_INTENSITY16UI_EXT:
+      *datatype = GL_UNSIGNED_SHORT;
+      *components = 1;
+      break;
+   case GL_INTENSITY32UI_EXT:
+      *datatype = GL_UNSIGNED_INT;
+      *components = 1;
+      break;
+   case GL_RGBA8:
+      *datatype = GL_UNSIGNED_BYTE;
+      *components = 4;
+      break;
+   case GL_RGBA16:
+      *datatype = GL_UNSIGNED_SHORT;
+      *components = 4;
+      break;
+   case GL_RGBA16F_ARB:
+      *datatype = GL_HALF_FLOAT;
+      *components = 4;
+      break;
+   case GL_RGBA32F_ARB:
+      *datatype = GL_FLOAT;
+      *components = 4;
+      break;
+   case GL_RGBA8I_EXT:
+      *datatype = GL_BYTE;
+      *components = 4;
+      break;
+   case GL_RGBA16I_EXT:
+      *datatype = GL_SHORT;
+      *components = 4;
+      break;
+   case GL_RGBA32I_EXT:
+      *datatype = GL_INT;
+      *components = 4;
+      break;
+   case GL_RGBA8UI_EXT:
+      *datatype = GL_UNSIGNED_BYTE;
+      *components = 4;
+      break;
+   case GL_RGBA16UI_EXT:
+      *datatype = GL_UNSIGNED_SHORT;
+      *components = 4;
+      break;
+   case GL_RGBA32UI_EXT:
+      *datatype = GL_UNSIGNED_INT;
+      *components = 4;
+      break;
+   default:
+      return GL_FALSE;
+   }
+
+   if (*datatype == GL_FLOAT && !ctx->Extensions.ARB_texture_float)
+      return GL_FALSE;
+
+   if (*datatype == GL_HALF_FLOAT && !ctx->Extensions.ARB_half_float_pixel)
+      return GL_FALSE;
+
+   return GL_TRUE;
+}
+
+
+/** GL_ARB_texture_buffer_object */
+void GLAPIENTRY
+_mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
+{
+   struct gl_texture_object *texObj;
+   struct gl_buffer_object *bufObj;
+   GLenum dataType;
+   GLuint comps;
+
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   if (!ctx->Extensions.ARB_texture_buffer_object) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBuffer");
+      return;
+   }
+
+   if (target != GL_TEXTURE_BUFFER_ARB) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexBuffer(target)");
+      return;
+   }
+
+   if (!get_sized_format_info(ctx, internalFormat, &dataType, &comps)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glTexBuffer(internalFormat 0x%x)",
+                  internalFormat);
+      return;
+   }
+
+   bufObj = _mesa_lookup_bufferobj(ctx, buffer);
+   if (buffer && !bufObj) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glTexBuffer(buffer %u)", buffer);
+      return;
+   }
+
+   texObj = _mesa_get_current_tex_object(ctx, target);
+
+   _mesa_lock_texture(ctx, texObj);
+   {
+      _mesa_reference_buffer_object(ctx, &texObj->BufferObject, bufObj);
+      texObj->BufferObjectFormat = internalFormat;
+   }
+   _mesa_unlock_texture(ctx, texObj);
+}
diff --git a/mesalib/src/mesa/main/teximage.h b/mesalib/src/mesa/main/teximage.h
index 6ee78c461..b59961eaf 100644
--- a/mesalib/src/mesa/main/teximage.h
+++ b/mesalib/src/mesa/main/teximage.h
@@ -59,7 +59,8 @@ _mesa_new_texture_image( struct gl_context *ctx );
 
 
 extern void
-_mesa_delete_texture_image( struct gl_context *ctx, struct gl_texture_image *teximage );
+_mesa_delete_texture_image( struct gl_context *ctx,
+                            struct gl_texture_image *teximage );
 
 extern void
 _mesa_free_texture_image_data( struct gl_context *ctx, 
@@ -82,7 +83,8 @@ _mesa_choose_texture_format(struct gl_context *ctx,
 
 
 extern void
-_mesa_clear_texture_image(struct gl_context *ctx, struct gl_texture_image *texImage);
+_mesa_clear_texture_image(struct gl_context *ctx,
+                          struct gl_texture_image *texImage);
 
 
 extern void
@@ -92,7 +94,8 @@ _mesa_set_tex_image(struct gl_texture_object *tObj,
 
 
 extern struct gl_texture_object *
-_mesa_select_tex_object(struct gl_context *ctx, const struct gl_texture_unit *texUnit,
+_mesa_select_tex_object(struct gl_context *ctx,
+                        const struct gl_texture_unit *texUnit,
                         GLenum target);
 
 extern struct gl_texture_object *
@@ -100,7 +103,8 @@ _mesa_get_current_tex_object(struct gl_context *ctx, GLenum target);
 
 
 extern struct gl_texture_image *
-_mesa_select_tex_image(struct gl_context *ctx, const struct gl_texture_object *texObj,
+_mesa_select_tex_image(struct gl_context *ctx,
+                       const struct gl_texture_object *texObj,
                        GLenum target, GLint level);
 
 
@@ -271,6 +275,11 @@ _mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
                                  GLsizei height, GLsizei depth, GLenum format,
                                  GLsizei imageSize, const GLvoid *data);
 
+
+extern void GLAPIENTRY
+_mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer);
+
+
 /*@}*/
 
 #endif
diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index fa45cfb17..e08842ff6 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -29,6 +29,7 @@
 
 
 #include "mfeatures.h"
+#include "bufferobj.h"
 #include "colortab.h"
 #include "context.h"
 #include "enums.h"
@@ -105,7 +106,8 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj,
           target == GL_TEXTURE_CUBE_MAP_ARB ||
           target == GL_TEXTURE_RECTANGLE_NV ||
           target == GL_TEXTURE_1D_ARRAY_EXT ||
-          target == GL_TEXTURE_2D_ARRAY_EXT);
+          target == GL_TEXTURE_2D_ARRAY_EXT ||
+          target == GL_TEXTURE_BUFFER);
 
    memset(obj, 0, sizeof(*obj));
    /* init the non-zero fields */
@@ -204,6 +206,8 @@ _mesa_delete_texture_object(struct gl_context *ctx,
       }
    }
 
+   _mesa_reference_buffer_object(ctx, &texObj->BufferObject, NULL);
+
    /* destroy the mutex -- it may have allocated memory (eg on bsd) */
    _glthread_DESTROY_MUTEX(texObj->Mutex);
 
@@ -299,6 +303,7 @@ valid_texture_object(const struct gl_texture_object *tex)
    case GL_TEXTURE_RECTANGLE_NV:
    case GL_TEXTURE_1D_ARRAY_EXT:
    case GL_TEXTURE_2D_ARRAY_EXT:
+   case GL_TEXTURE_BUFFER:
       return GL_TRUE;
    case 0x99:
       _mesa_problem(NULL, "invalid reference to a deleted texture object");
@@ -989,6 +994,8 @@ target_enum_to_index(GLenum target)
       return TEXTURE_1D_ARRAY_INDEX;
    case GL_TEXTURE_2D_ARRAY_EXT:
       return TEXTURE_2D_ARRAY_INDEX;
+   case GL_TEXTURE_BUFFER_ARB:
+      return TEXTURE_BUFFER_INDEX;
    default:
       return -1;
    }
diff --git a/mesalib/src/mesa/main/texobj.h b/mesalib/src/mesa/main/texobj.h
index 09c738fda..0bad63867 100644
--- a/mesalib/src/mesa/main/texobj.h
+++ b/mesalib/src/mesa/main/texobj.h
@@ -52,14 +52,16 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj,
                                  GLuint name, GLenum target );
 
 extern void
-_mesa_delete_texture_object( struct gl_context *ctx, struct gl_texture_object *obj );
+_mesa_delete_texture_object( struct gl_context *ctx,
+                             struct gl_texture_object *obj );
 
 extern void
 _mesa_copy_texture_object( struct gl_texture_object *dest,
                            const struct gl_texture_object *src );
 
 extern void
-_mesa_clear_texture_object(struct gl_context *ctx, struct gl_texture_object *obj);
+_mesa_clear_texture_object(struct gl_context *ctx,
+                           struct gl_texture_object *obj);
 
 extern void
 _mesa_reference_texobj(struct gl_texture_object **ptr,
diff --git a/mesalib/src/mesa/main/texrender.c b/mesalib/src/mesa/main/texrender.c
index 1546f1962..2766bd6c5 100644
--- a/mesalib/src/mesa/main/texrender.c
+++ b/mesalib/src/mesa/main/texrender.c
@@ -1,6 +1,7 @@
 
 #include "context.h"
 #include "colormac.h"
+#include "fbobject.h"
 #include "macros.h"
 #include "texfetch.h"
 #include "teximage.h"
@@ -525,7 +526,7 @@ wrap_texture(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
  * update the internal format info, etc.
  */
 static void
-update_wrapper(struct gl_context *ctx, const struct gl_renderbuffer_attachment *att)
+update_wrapper(struct gl_context *ctx, struct gl_renderbuffer_attachment *att)
 {
    struct texture_renderbuffer *trb
       = (struct texture_renderbuffer *) att->Renderbuffer;
@@ -533,7 +534,7 @@ update_wrapper(struct gl_context *ctx, const struct gl_renderbuffer_attachment *
    (void) ctx;
    ASSERT(trb);
 
-   trb->TexImage = att->Texture->Image[att->CubeMapFace][att->TextureLevel];
+   trb->TexImage = _mesa_get_attachment_teximage(att);
    ASSERT(trb->TexImage);
 
    trb->Store = _mesa_get_texel_store_func(trb->TexImage->TexFormat);
diff --git a/mesalib/src/mesa/main/texstate.c b/mesalib/src/mesa/main/texstate.c
index 40282eabf..35ab1ad4e 100644
--- a/mesalib/src/mesa/main/texstate.c
+++ b/mesalib/src/mesa/main/texstate.c
@@ -30,6 +30,7 @@
 
 #include "glheader.h"
 #include "mfeatures.h"
+#include "bufferobj.h"
 #include "colormac.h"
 #include "colortab.h"
 #include "context.h"
@@ -692,7 +693,8 @@ alloc_proxy_textures( struct gl_context *ctx )
       GL_TEXTURE_CUBE_MAP_ARB,
       GL_TEXTURE_RECTANGLE_NV,
       GL_TEXTURE_1D_ARRAY_EXT,
-      GL_TEXTURE_2D_ARRAY_EXT
+      GL_TEXTURE_2D_ARRAY_EXT,
+      GL_TEXTURE_BUFFER
    };
    GLint tgt;
 
@@ -793,6 +795,10 @@ _mesa_init_texture(struct gl_context *ctx)
    if (!alloc_proxy_textures( ctx ))
       return GL_FALSE;
 
+   /* GL_ARB_texture_buffer_object */
+   _mesa_reference_buffer_object(ctx, &ctx->Texture.BufferObject,
+                                 ctx->Shared->NullBufferObj);
+
    return GL_TRUE;
 }
 
@@ -818,6 +824,9 @@ _mesa_free_texture_data(struct gl_context *ctx)
    /* Free proxy texture objects */
    for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++)
       ctx->Driver.DeleteTexture(ctx, ctx->Texture.ProxyTex[tgt]);
+
+   /* GL_ARB_texture_buffer_object */
+   _mesa_reference_buffer_object(ctx, &ctx->Texture.BufferObject, NULL);
 }
 
 
diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c
index 2162ce516..3f0a79d39 100644
--- a/mesalib/src/mesa/main/texstore.c
+++ b/mesalib/src/mesa/main/texstore.c
@@ -3182,7 +3182,7 @@ _mesa_texstore_signed_rgbx8888(TEXSTORE_PARAMS)
                dst[3] = FLOAT_TO_BYTE_TEX(srcRow[RCOMP]);
                dst[2] = FLOAT_TO_BYTE_TEX(srcRow[GCOMP]);
                dst[1] = FLOAT_TO_BYTE_TEX(srcRow[BCOMP]);
-               dst[0] = 0xff;
+               dst[0] = 127;
                srcRow += 3;
                dst += 4;
             }
diff --git a/mesalib/src/mesa/main/version.c b/mesalib/src/mesa/main/version.c
index 175f9714e..6dbdb3ac6 100644
--- a/mesalib/src/mesa/main/version.c
+++ b/mesalib/src/mesa/main/version.c
@@ -25,6 +25,7 @@
 #include "imports.h"
 #include "mtypes.h"
 #include "version.h"
+#include "git_sha1.h"
 
 
 
@@ -185,7 +186,11 @@ compute_version(struct gl_context *ctx)
    ctx->VersionString = (char *) malloc(max);
    if (ctx->VersionString) {
       _mesa_snprintf(ctx->VersionString, max,
-		     "%u.%u Mesa " MESA_VERSION_STRING,
+		     "%u.%u Mesa " MESA_VERSION_STRING
+#ifdef MESA_GIT_SHA1
+		     " (" MESA_GIT_SHA1 ")"
+#endif
+		     ,
 		     ctx->VersionMajor, ctx->VersionMinor);
    }
 }
diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp
index dc5b5353b..59deb66d0 100644
--- a/mesalib/src/mesa/program/ir_to_mesa.cpp
+++ b/mesalib/src/mesa/program/ir_to_mesa.cpp
@@ -56,16 +56,20 @@ extern "C" {
 #include "program/sampler.h"
 }
 
+class src_reg;
+class dst_reg;
+
 static int swizzle_for_size(int size);
 
 /**
  * This struct is a corresponding struct to Mesa prog_src_register, with
  * wider fields.
  */
-typedef struct ir_to_mesa_src_reg {
-   ir_to_mesa_src_reg(int file, int index, const glsl_type *type)
+class src_reg {
+public:
+   src_reg(gl_register_file file, int index, const glsl_type *type)
    {
-      this->file = (gl_register_file) file;
+      this->file = file;
       this->index = index;
       if (type && (type->is_scalar() || type->is_vector() || type->is_matrix()))
 	 this->swizzle = swizzle_for_size(type->vector_elements);
@@ -75,7 +79,7 @@ typedef struct ir_to_mesa_src_reg {
       this->reladdr = NULL;
    }
 
-   ir_to_mesa_src_reg()
+   src_reg()
    {
       this->file = PROGRAM_UNDEFINED;
       this->index = 0;
@@ -84,24 +88,63 @@ typedef struct ir_to_mesa_src_reg {
       this->reladdr = NULL;
    }
 
+   explicit src_reg(dst_reg reg);
+
    gl_register_file file; /**< PROGRAM_* from Mesa */
    int index; /**< temporary index, VERT_ATTRIB_*, FRAG_ATTRIB_*, etc. */
    GLuint swizzle; /**< SWIZZLE_XYZWONEZERO swizzles from Mesa. */
    int negate; /**< NEGATE_XYZW mask from mesa */
    /** Register index should be offset by the integer in this reg. */
-   ir_to_mesa_src_reg *reladdr;
-} ir_to_mesa_src_reg;
+   src_reg *reladdr;
+};
 
-typedef struct ir_to_mesa_dst_reg {
-   int file; /**< PROGRAM_* from Mesa */
+class dst_reg {
+public:
+   dst_reg(gl_register_file file, int writemask)
+   {
+      this->file = file;
+      this->index = 0;
+      this->writemask = writemask;
+      this->cond_mask = COND_TR;
+      this->reladdr = NULL;
+   }
+
+   dst_reg()
+   {
+      this->file = PROGRAM_UNDEFINED;
+      this->index = 0;
+      this->writemask = 0;
+      this->cond_mask = COND_TR;
+      this->reladdr = NULL;
+   }
+
+   explicit dst_reg(src_reg reg);
+
+   gl_register_file file; /**< PROGRAM_* from Mesa */
    int index; /**< temporary index, VERT_ATTRIB_*, FRAG_ATTRIB_*, etc. */
    int writemask; /**< Bitfield of WRITEMASK_[XYZW] */
    GLuint cond_mask:4;
    /** Register index should be offset by the integer in this reg. */
-   ir_to_mesa_src_reg *reladdr;
-} ir_to_mesa_dst_reg;
+   src_reg *reladdr;
+};
 
-extern ir_to_mesa_src_reg ir_to_mesa_undef;
+src_reg::src_reg(dst_reg reg)
+{
+   this->file = reg.file;
+   this->index = reg.index;
+   this->swizzle = SWIZZLE_XYZW;
+   this->negate = 0;
+   this->reladdr = NULL;
+}
+
+dst_reg::dst_reg(src_reg reg)
+{
+   this->file = reg.file;
+   this->index = reg.index;
+   this->writemask = WRITEMASK_XYZW;
+   this->cond_mask = COND_TR;
+   this->reladdr = reg.reladdr;
+}
 
 class ir_to_mesa_instruction : public exec_node {
 public:
@@ -118,8 +161,8 @@ public:
    }
 
    enum prog_opcode op;
-   ir_to_mesa_dst_reg dst_reg;
-   ir_to_mesa_src_reg src_reg[3];
+   dst_reg dst;
+   src_reg src[3];
    /** Pointer to the ir source this tree came from for debugging */
    ir_instruction *ir;
    GLboolean cond_update;
@@ -174,7 +217,7 @@ public:
    int inst;
 
    /** Storage for the return value. */
-   ir_to_mesa_src_reg return_reg;
+   src_reg return_reg;
 };
 
 class ir_to_mesa_visitor : public ir_visitor {
@@ -195,11 +238,10 @@ public:
 
    function_entry *get_function_signature(ir_function_signature *sig);
 
-   ir_to_mesa_src_reg get_temp(const glsl_type *type);
-   void reladdr_to_temp(ir_instruction *ir,
-			ir_to_mesa_src_reg *reg, int *num_reladdr);
+   src_reg get_temp(const glsl_type *type);
+   void reladdr_to_temp(ir_instruction *ir, src_reg *reg, int *num_reladdr);
 
-   struct ir_to_mesa_src_reg src_reg_for_float(float val);
+   src_reg src_reg_for_float(float val);
 
    /**
     * \name Visit methods
@@ -228,7 +270,7 @@ public:
    virtual void visit(ir_if *);
    /*@}*/
 
-   struct ir_to_mesa_src_reg result;
+   src_reg result;
 
    /** List of variable_storage */
    exec_list variables;
@@ -240,52 +282,35 @@ public:
    /** List of ir_to_mesa_instruction */
    exec_list instructions;
 
-   ir_to_mesa_instruction *ir_to_mesa_emit_op0(ir_instruction *ir,
-					       enum prog_opcode op);
+   ir_to_mesa_instruction *emit(ir_instruction *ir, enum prog_opcode op);
 
-   ir_to_mesa_instruction *ir_to_mesa_emit_op1(ir_instruction *ir,
-					       enum prog_opcode op,
-					       ir_to_mesa_dst_reg dst,
-					       ir_to_mesa_src_reg src0);
+   ir_to_mesa_instruction *emit(ir_instruction *ir, enum prog_opcode op,
+			        dst_reg dst, src_reg src0);
 
-   ir_to_mesa_instruction *ir_to_mesa_emit_op2(ir_instruction *ir,
-					       enum prog_opcode op,
-					       ir_to_mesa_dst_reg dst,
-					       ir_to_mesa_src_reg src0,
-					       ir_to_mesa_src_reg src1);
+   ir_to_mesa_instruction *emit(ir_instruction *ir, enum prog_opcode op,
+			        dst_reg dst, src_reg src0, src_reg src1);
 
-   ir_to_mesa_instruction *ir_to_mesa_emit_op3(ir_instruction *ir,
-					       enum prog_opcode op,
-					       ir_to_mesa_dst_reg dst,
-					       ir_to_mesa_src_reg src0,
-					       ir_to_mesa_src_reg src1,
-					       ir_to_mesa_src_reg src2);
+   ir_to_mesa_instruction *emit(ir_instruction *ir, enum prog_opcode op,
+			        dst_reg dst,
+			        src_reg src0, src_reg src1, src_reg src2);
 
    /**
     * Emit the correct dot-product instruction for the type of arguments
-    *
-    * \sa ir_to_mesa_emit_op2
     */
-   void ir_to_mesa_emit_dp(ir_instruction *ir,
-			   ir_to_mesa_dst_reg dst,
-			   ir_to_mesa_src_reg src0,
-			   ir_to_mesa_src_reg src1,
-			   unsigned elements);
-
-   void ir_to_mesa_emit_scalar_op1(ir_instruction *ir,
-				   enum prog_opcode op,
-				   ir_to_mesa_dst_reg dst,
-				   ir_to_mesa_src_reg src0);
-
-   void ir_to_mesa_emit_scalar_op2(ir_instruction *ir,
-				   enum prog_opcode op,
-				   ir_to_mesa_dst_reg dst,
-				   ir_to_mesa_src_reg src0,
-				   ir_to_mesa_src_reg src1);
+   void emit_dp(ir_instruction *ir,
+	        dst_reg dst,
+	        src_reg src0,
+	        src_reg src1,
+	        unsigned elements);
+
+   void emit_scalar(ir_instruction *ir, enum prog_opcode op,
+		    dst_reg dst, src_reg src0);
+
+   void emit_scalar(ir_instruction *ir, enum prog_opcode op,
+		    dst_reg dst, src_reg src0, src_reg src1);
 
    void emit_scs(ir_instruction *ir, enum prog_opcode op,
-		 ir_to_mesa_dst_reg dst,
-		 const ir_to_mesa_src_reg &src);
+		 dst_reg dst, const src_reg &src);
 
    GLboolean try_emit_mad(ir_expression *ir,
 			  int mul_operand);
@@ -300,15 +325,11 @@ public:
    void *mem_ctx;
 };
 
-ir_to_mesa_src_reg ir_to_mesa_undef = ir_to_mesa_src_reg(PROGRAM_UNDEFINED, 0, NULL);
+src_reg undef_src = src_reg(PROGRAM_UNDEFINED, 0, NULL);
 
-ir_to_mesa_dst_reg ir_to_mesa_undef_dst = {
-   PROGRAM_UNDEFINED, 0, SWIZZLE_NOOP, COND_TR, NULL,
-};
+dst_reg undef_dst = dst_reg(PROGRAM_UNDEFINED, SWIZZLE_NOOP);
 
-ir_to_mesa_dst_reg ir_to_mesa_address_reg = {
-   PROGRAM_ADDRESS, 0, WRITEMASK_X, COND_TR, NULL
-};
+dst_reg address_reg = dst_reg(PROGRAM_ADDRESS, WRITEMASK_X);
 
 static void
 fail_link(struct gl_shader_program *prog, const char *fmt, ...) PRINTFLIKE(2, 3);
@@ -339,12 +360,9 @@ swizzle_for_size(int size)
 }
 
 ir_to_mesa_instruction *
-ir_to_mesa_visitor::ir_to_mesa_emit_op3(ir_instruction *ir,
-					enum prog_opcode op,
-					ir_to_mesa_dst_reg dst,
-					ir_to_mesa_src_reg src0,
-					ir_to_mesa_src_reg src1,
-					ir_to_mesa_src_reg src2)
+ir_to_mesa_visitor::emit(ir_instruction *ir, enum prog_opcode op,
+			 dst_reg dst,
+			 src_reg src0, src_reg src1, src_reg src2)
 {
    ir_to_mesa_instruction *inst = new(mem_ctx) ir_to_mesa_instruction();
    int num_reladdr = 0;
@@ -363,18 +381,16 @@ ir_to_mesa_visitor::ir_to_mesa_emit_op3(ir_instruction *ir,
    reladdr_to_temp(ir, &src0, &num_reladdr);
 
    if (dst.reladdr) {
-      ir_to_mesa_emit_op1(ir, OPCODE_ARL, ir_to_mesa_address_reg,
-                          *dst.reladdr);
-
+      emit(ir, OPCODE_ARL, address_reg, *dst.reladdr);
       num_reladdr--;
    }
    assert(num_reladdr == 0);
 
    inst->op = op;
-   inst->dst_reg = dst;
-   inst->src_reg[0] = src0;
-   inst->src_reg[1] = src1;
-   inst->src_reg[2] = src2;
+   inst->dst = dst;
+   inst->src[0] = src0;
+   inst->src[1] = src1;
+   inst->src[2] = src2;
    inst->ir = ir;
 
    inst->function = NULL;
@@ -386,69 +402,36 @@ ir_to_mesa_visitor::ir_to_mesa_emit_op3(ir_instruction *ir,
 
 
 ir_to_mesa_instruction *
-ir_to_mesa_visitor::ir_to_mesa_emit_op2(ir_instruction *ir,
-					enum prog_opcode op,
-					ir_to_mesa_dst_reg dst,
-					ir_to_mesa_src_reg src0,
-					ir_to_mesa_src_reg src1)
+ir_to_mesa_visitor::emit(ir_instruction *ir, enum prog_opcode op,
+			 dst_reg dst, src_reg src0, src_reg src1)
 {
-   return ir_to_mesa_emit_op3(ir, op, dst, src0, src1, ir_to_mesa_undef);
+   return emit(ir, op, dst, src0, src1, undef_src);
 }
 
 ir_to_mesa_instruction *
-ir_to_mesa_visitor::ir_to_mesa_emit_op1(ir_instruction *ir,
-					enum prog_opcode op,
-					ir_to_mesa_dst_reg dst,
-					ir_to_mesa_src_reg src0)
+ir_to_mesa_visitor::emit(ir_instruction *ir, enum prog_opcode op,
+			 dst_reg dst, src_reg src0)
 {
    assert(dst.writemask != 0);
-   return ir_to_mesa_emit_op3(ir, op, dst,
-			      src0, ir_to_mesa_undef, ir_to_mesa_undef);
+   return emit(ir, op, dst, src0, undef_src, undef_src);
 }
 
 ir_to_mesa_instruction *
-ir_to_mesa_visitor::ir_to_mesa_emit_op0(ir_instruction *ir,
-					enum prog_opcode op)
+ir_to_mesa_visitor::emit(ir_instruction *ir, enum prog_opcode op)
 {
-   return ir_to_mesa_emit_op3(ir, op, ir_to_mesa_undef_dst,
-			      ir_to_mesa_undef,
-			      ir_to_mesa_undef,
-			      ir_to_mesa_undef);
+   return emit(ir, op, undef_dst, undef_src, undef_src, undef_src);
 }
 
 void
-ir_to_mesa_visitor::ir_to_mesa_emit_dp(ir_instruction *ir,
-				       ir_to_mesa_dst_reg dst,
-				       ir_to_mesa_src_reg src0,
-				       ir_to_mesa_src_reg src1,
-				       unsigned elements)
+ir_to_mesa_visitor::emit_dp(ir_instruction *ir,
+			    dst_reg dst, src_reg src0, src_reg src1,
+			    unsigned elements)
 {
    static const gl_inst_opcode dot_opcodes[] = {
       OPCODE_DP2, OPCODE_DP3, OPCODE_DP4
    };
 
-   ir_to_mesa_emit_op3(ir, dot_opcodes[elements - 2],
-		       dst, src0, src1, ir_to_mesa_undef);
-}
-
-inline ir_to_mesa_dst_reg
-ir_to_mesa_dst_reg_from_src(ir_to_mesa_src_reg reg)
-{
-   ir_to_mesa_dst_reg dst_reg;
-
-   dst_reg.file = reg.file;
-   dst_reg.index = reg.index;
-   dst_reg.writemask = WRITEMASK_XYZW;
-   dst_reg.cond_mask = COND_TR;
-   dst_reg.reladdr = reg.reladdr;
-
-   return dst_reg;
-}
-
-inline ir_to_mesa_src_reg
-ir_to_mesa_src_reg_from_dst(ir_to_mesa_dst_reg reg)
-{
-   return ir_to_mesa_src_reg(reg.file, reg.index, NULL);
+   emit(ir, dot_opcodes[elements - 2], dst, src0, src1);
 }
 
 /**
@@ -460,11 +443,9 @@ ir_to_mesa_src_reg_from_dst(ir_to_mesa_dst_reg reg)
  * to produce dest channels.
  */
 void
-ir_to_mesa_visitor::ir_to_mesa_emit_scalar_op2(ir_instruction *ir,
-					       enum prog_opcode op,
-					       ir_to_mesa_dst_reg dst,
-					       ir_to_mesa_src_reg orig_src0,
-					       ir_to_mesa_src_reg orig_src1)
+ir_to_mesa_visitor::emit_scalar(ir_instruction *ir, enum prog_opcode op,
+			        dst_reg dst,
+				src_reg orig_src0, src_reg orig_src1)
 {
    int i, j;
    int done_mask = ~dst.writemask;
@@ -476,8 +457,8 @@ ir_to_mesa_visitor::ir_to_mesa_emit_scalar_op2(ir_instruction *ir,
    for (i = 0; i < 4; i++) {
       GLuint this_mask = (1 << i);
       ir_to_mesa_instruction *inst;
-      ir_to_mesa_src_reg src0 = orig_src0;
-      ir_to_mesa_src_reg src1 = orig_src1;
+      src_reg src0 = orig_src0;
+      src_reg src1 = orig_src1;
 
       if (done_mask & this_mask)
 	 continue;
@@ -500,26 +481,21 @@ ir_to_mesa_visitor::ir_to_mesa_emit_scalar_op2(ir_instruction *ir,
       src1.swizzle = MAKE_SWIZZLE4(src1_swiz, src1_swiz,
 				  src1_swiz, src1_swiz);
 
-      inst = ir_to_mesa_emit_op2(ir, op,
-				 dst,
-				 src0,
-				 src1);
-      inst->dst_reg.writemask = this_mask;
+      inst = emit(ir, op, dst, src0, src1);
+      inst->dst.writemask = this_mask;
       done_mask |= this_mask;
    }
 }
 
 void
-ir_to_mesa_visitor::ir_to_mesa_emit_scalar_op1(ir_instruction *ir,
-					       enum prog_opcode op,
-					       ir_to_mesa_dst_reg dst,
-					       ir_to_mesa_src_reg src0)
+ir_to_mesa_visitor::emit_scalar(ir_instruction *ir, enum prog_opcode op,
+			        dst_reg dst, src_reg src0)
 {
-   ir_to_mesa_src_reg undef = ir_to_mesa_undef;
+   src_reg undef = undef_src;
 
    undef.swizzle = SWIZZLE_XXXX;
 
-   ir_to_mesa_emit_scalar_op2(ir, op, dst, src0, undef);
+   emit_scalar(ir, op, dst, src0, undef);
 }
 
 /**
@@ -538,20 +514,20 @@ ir_to_mesa_visitor::ir_to_mesa_emit_scalar_op1(ir_instruction *ir,
  */
 void
 ir_to_mesa_visitor::emit_scs(ir_instruction *ir, enum prog_opcode op,
-			     ir_to_mesa_dst_reg dst,
-			     const ir_to_mesa_src_reg &src)
+			     dst_reg dst,
+			     const src_reg &src)
 {
    /* Vertex programs cannot use the SCS opcode.
     */
    if (this->prog->Target == GL_VERTEX_PROGRAM_ARB) {
-      ir_to_mesa_emit_scalar_op1(ir, op, dst, src);
+      emit_scalar(ir, op, dst, src);
       return;
    }
 
    const unsigned component = (op == OPCODE_SIN) ? 0 : 1;
    const unsigned scs_mask = (1U << component);
    int done_mask = ~dst.writemask;
-   ir_to_mesa_src_reg tmp;
+   src_reg tmp;
 
    assert(op == OPCODE_SIN || op == OPCODE_COS);
 
@@ -564,7 +540,7 @@ ir_to_mesa_visitor::emit_scs(ir_instruction *ir, enum prog_opcode op,
 
    for (unsigned i = 0; i < 4; i++) {
       unsigned this_mask = (1U << i);
-      ir_to_mesa_src_reg src0 = src;
+      src_reg src0 = src;
 
       if ((done_mask & this_mask) != 0)
 	 continue;
@@ -592,41 +568,40 @@ ir_to_mesa_visitor::emit_scs(ir_instruction *ir, enum prog_opcode op,
 
       if (this_mask != scs_mask) {
 	 ir_to_mesa_instruction *inst;
-	 ir_to_mesa_dst_reg tmp_dst = ir_to_mesa_dst_reg_from_src(tmp);
+	 dst_reg tmp_dst = dst_reg(tmp);
 
 	 /* Emit the SCS instruction.
 	  */
-	 inst = ir_to_mesa_emit_op1(ir, OPCODE_SCS, tmp_dst, src0);
-	 inst->dst_reg.writemask = scs_mask;
+	 inst = emit(ir, OPCODE_SCS, tmp_dst, src0);
+	 inst->dst.writemask = scs_mask;
 
 	 /* Move the result of the SCS instruction to the desired location in
 	  * the destination.
 	  */
 	 tmp.swizzle = MAKE_SWIZZLE4(component, component,
 				     component, component);
-	 inst = ir_to_mesa_emit_op1(ir, OPCODE_SCS, dst, tmp);
-	 inst->dst_reg.writemask = this_mask;
+	 inst = emit(ir, OPCODE_SCS, dst, tmp);
+	 inst->dst.writemask = this_mask;
       } else {
 	 /* Emit the SCS instruction to write directly to the destination.
 	  */
-	 ir_to_mesa_instruction *inst =
-	    ir_to_mesa_emit_op1(ir, OPCODE_SCS, dst, src0);
-	 inst->dst_reg.writemask = scs_mask;
+	 ir_to_mesa_instruction *inst = emit(ir, OPCODE_SCS, dst, src0);
+	 inst->dst.writemask = scs_mask;
       }
 
       done_mask |= this_mask;
    }
 }
 
-struct ir_to_mesa_src_reg
+struct src_reg
 ir_to_mesa_visitor::src_reg_for_float(float val)
 {
-   ir_to_mesa_src_reg src_reg(PROGRAM_CONSTANT, -1, NULL);
+   src_reg src(PROGRAM_CONSTANT, -1, NULL);
 
-   src_reg.index = _mesa_add_unnamed_constant(this->prog->Parameters,
-					      &val, 1, &src_reg.swizzle);
+   src.index = _mesa_add_unnamed_constant(this->prog->Parameters,
+					  &val, 1, &src.swizzle);
 
-   return src_reg;
+   return src;
 }
 
 static int
@@ -676,31 +651,31 @@ type_size(const struct glsl_type *type)
  * storage).  Actual register allocation for the Mesa VM occurs in a
  * pass over the Mesa IR later.
  */
-ir_to_mesa_src_reg
+src_reg
 ir_to_mesa_visitor::get_temp(const glsl_type *type)
 {
-   ir_to_mesa_src_reg src_reg;
+   src_reg src;
    int swizzle[4];
    int i;
 
-   src_reg.file = PROGRAM_TEMPORARY;
-   src_reg.index = next_temp;
-   src_reg.reladdr = NULL;
+   src.file = PROGRAM_TEMPORARY;
+   src.index = next_temp;
+   src.reladdr = NULL;
    next_temp += type_size(type);
 
    if (type->is_array() || type->is_record()) {
-      src_reg.swizzle = SWIZZLE_NOOP;
+      src.swizzle = SWIZZLE_NOOP;
    } else {
       for (i = 0; i < type->vector_elements; i++)
 	 swizzle[i] = i;
       for (; i < 4; i++)
 	 swizzle[i] = type->vector_elements - 1;
-      src_reg.swizzle = MAKE_SWIZZLE4(swizzle[0], swizzle[1],
-				      swizzle[2], swizzle[3]);
+      src.swizzle = MAKE_SWIZZLE4(swizzle[0], swizzle[1],
+				  swizzle[2], swizzle[3]);
    }
-   src_reg.negate = 0;
+   src.negate = 0;
 
-   return src_reg;
+   return src;
 }
 
 variable_storage *
@@ -770,13 +745,13 @@ ir_to_mesa_visitor::visit(ir_variable *ir)
       }
 
       struct variable_storage *storage;
-      ir_to_mesa_dst_reg dst;
+      dst_reg dst;
       if (i == ir->num_state_slots) {
 	 /* We'll set the index later. */
 	 storage = new(mem_ctx) variable_storage(ir, PROGRAM_STATE_VAR, -1);
 	 this->variables.push_tail(storage);
 
-	 dst = ir_to_mesa_undef_dst;
+	 dst = undef_dst;
       } else {
 	 /* The variable_storage constructor allocates slots based on the size
 	  * of the type.  However, this had better match the number of state
@@ -789,9 +764,7 @@ ir_to_mesa_visitor::visit(ir_variable *ir)
 	 this->variables.push_tail(storage);
 	 this->next_temp += type_size(ir->type);
 
-	 dst = ir_to_mesa_dst_reg_from_src(ir_to_mesa_src_reg(PROGRAM_TEMPORARY,
-							      storage->index,
-							      NULL));
+	 dst = dst_reg(src_reg(PROGRAM_TEMPORARY, storage->index, NULL));
       }
 
 
@@ -806,9 +779,9 @@ ir_to_mesa_visitor::visit(ir_variable *ir)
 	       assert(index == storage->index + (int)i);
 	    }
 	 } else {
-	    ir_to_mesa_src_reg src(PROGRAM_STATE_VAR, index, NULL);
+	    src_reg src(PROGRAM_STATE_VAR, index, NULL);
 	    src.swizzle = slots[i].swizzle;
-	    ir_to_mesa_emit_op1(ir, OPCODE_MOV, dst, src);
+	    emit(ir, OPCODE_MOV, dst, src);
 	    /* even a float takes up a whole vec4 reg in a struct/array. */
 	    dst.index++;
 	 }
@@ -841,7 +814,7 @@ ir_to_mesa_visitor::visit(ir_loop *ir)
       delete a;
    }
 
-   ir_to_mesa_emit_op0(NULL, OPCODE_BGNLOOP);
+   emit(NULL, OPCODE_BGNLOOP);
 
    if (ir->to) {
       ir_expression *e =
@@ -874,7 +847,7 @@ ir_to_mesa_visitor::visit(ir_loop *ir)
       delete e;
    }
 
-   ir_to_mesa_emit_op0(NULL, OPCODE_ENDLOOP);
+   emit(NULL, OPCODE_ENDLOOP);
 }
 
 void
@@ -882,10 +855,10 @@ ir_to_mesa_visitor::visit(ir_loop_jump *ir)
 {
    switch (ir->mode) {
    case ir_loop_jump::jump_break:
-      ir_to_mesa_emit_op0(NULL, OPCODE_BRK);
+      emit(NULL, OPCODE_BRK);
       break;
    case ir_loop_jump::jump_continue:
-      ir_to_mesa_emit_op0(NULL, OPCODE_CONT);
+      emit(NULL, OPCODE_CONT);
       break;
    }
 }
@@ -924,7 +897,7 @@ GLboolean
 ir_to_mesa_visitor::try_emit_mad(ir_expression *ir, int mul_operand)
 {
    int nonmul_operand = 1 - mul_operand;
-   ir_to_mesa_src_reg a, b, c;
+   src_reg a, b, c;
 
    ir_expression *expr = ir->operands[mul_operand]->as_expression();
    if (!expr || expr->operation != ir_binop_mul)
@@ -938,8 +911,7 @@ ir_to_mesa_visitor::try_emit_mad(ir_expression *ir, int mul_operand)
    c = this->result;
 
    this->result = get_temp(ir->type);
-   ir_to_mesa_emit_op3(ir, OPCODE_MAD,
-		       ir_to_mesa_dst_reg_from_src(this->result), a, b, c);
+   emit(ir, OPCODE_MAD, dst_reg(this->result), a, b, c);
 
    return true;
 }
@@ -958,13 +930,11 @@ ir_to_mesa_visitor::try_emit_sat(ir_expression *ir)
       return false;
 
    sat_src->accept(this);
-   ir_to_mesa_src_reg src = this->result;
+   src_reg src = this->result;
 
    this->result = get_temp(ir->type);
    ir_to_mesa_instruction *inst;
-   inst = ir_to_mesa_emit_op1(ir, OPCODE_MOV,
-			      ir_to_mesa_dst_reg_from_src(this->result),
-			      src);
+   inst = emit(ir, OPCODE_MOV, dst_reg(this->result), src);
    inst->saturate = true;
 
    return true;
@@ -972,18 +942,17 @@ ir_to_mesa_visitor::try_emit_sat(ir_expression *ir)
 
 void
 ir_to_mesa_visitor::reladdr_to_temp(ir_instruction *ir,
-				    ir_to_mesa_src_reg *reg, int *num_reladdr)
+				    src_reg *reg, int *num_reladdr)
 {
    if (!reg->reladdr)
       return;
 
-   ir_to_mesa_emit_op1(ir, OPCODE_ARL, ir_to_mesa_address_reg, *reg->reladdr);
+   emit(ir, OPCODE_ARL, address_reg, *reg->reladdr);
 
    if (*num_reladdr != 1) {
-      ir_to_mesa_src_reg temp = get_temp(glsl_type::vec4_type);
+      src_reg temp = get_temp(glsl_type::vec4_type);
 
-      ir_to_mesa_emit_op1(ir, OPCODE_MOV,
-			  ir_to_mesa_dst_reg_from_src(temp), *reg);
+      emit(ir, OPCODE_MOV, dst_reg(temp), *reg);
       *reg = temp;
    }
 
@@ -1079,7 +1048,7 @@ ir_to_mesa_visitor::emit_swz(ir_expression *ir)
       exit(1);
    }
 
-   ir_to_mesa_src_reg src;
+   src_reg src;
 
    src = this->result;
    src.swizzle = MAKE_SWIZZLE4(components[0],
@@ -1094,8 +1063,8 @@ ir_to_mesa_visitor::emit_swz(ir_expression *ir)
    /* Storage for our result.  Ideally for an assignment we'd be using the
     * actual storage for the result here, instead.
     */
-   const ir_to_mesa_src_reg result_src = get_temp(ir->type);
-   ir_to_mesa_dst_reg result_dst = ir_to_mesa_dst_reg_from_src(result_src);
+   const src_reg result_src = get_temp(ir->type);
+   dst_reg result_dst = dst_reg(result_src);
 
    /* Limit writes to the channels that will be used by result_src later.
     * This does limit this temp's use as a temporary for multi-instruction
@@ -1103,7 +1072,7 @@ ir_to_mesa_visitor::emit_swz(ir_expression *ir)
     */
    result_dst.writemask = (1 << ir->type->vector_elements) - 1;
 
-   ir_to_mesa_emit_op1(ir, OPCODE_SWZ, result_dst, src);
+   emit(ir, OPCODE_SWZ, result_dst, src);
    this->result = result_src;
 }
 
@@ -1111,9 +1080,9 @@ void
 ir_to_mesa_visitor::visit(ir_expression *ir)
 {
    unsigned int operand;
-   struct ir_to_mesa_src_reg op[Elements(ir->operands)];
-   struct ir_to_mesa_src_reg result_src;
-   struct ir_to_mesa_dst_reg result_dst;
+   src_reg op[Elements(ir->operands)];
+   src_reg result_src;
+   dst_reg result_dst;
 
    /* Quick peephole: Emit OPCODE_MAD(a, b, c) instead of ADD(MUL(a, b), c)
     */
@@ -1161,7 +1130,7 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
     */
    result_src = get_temp(ir->type);
    /* convenience for the emit functions below. */
-   result_dst = ir_to_mesa_dst_reg_from_src(result_src);
+   result_dst = dst_reg(result_src);
    /* Limit writes to the channels that will be used by result_src later.
     * This does limit this temp's use as a temporary for multi-instruction
     * sequences.
@@ -1170,38 +1139,37 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
 
    switch (ir->operation) {
    case ir_unop_logic_not:
-      ir_to_mesa_emit_op2(ir, OPCODE_SEQ, result_dst,
-			  op[0], src_reg_for_float(0.0));
+      emit(ir, OPCODE_SEQ, result_dst, op[0], src_reg_for_float(0.0));
       break;
    case ir_unop_neg:
       op[0].negate = ~op[0].negate;
       result_src = op[0];
       break;
    case ir_unop_abs:
-      ir_to_mesa_emit_op1(ir, OPCODE_ABS, result_dst, op[0]);
+      emit(ir, OPCODE_ABS, result_dst, op[0]);
       break;
    case ir_unop_sign:
-      ir_to_mesa_emit_op1(ir, OPCODE_SSG, result_dst, op[0]);
+      emit(ir, OPCODE_SSG, result_dst, op[0]);
       break;
    case ir_unop_rcp:
-      ir_to_mesa_emit_scalar_op1(ir, OPCODE_RCP, result_dst, op[0]);
+      emit_scalar(ir, OPCODE_RCP, result_dst, op[0]);
       break;
 
    case ir_unop_exp2:
-      ir_to_mesa_emit_scalar_op1(ir, OPCODE_EX2, result_dst, op[0]);
+      emit_scalar(ir, OPCODE_EX2, result_dst, op[0]);
       break;
    case ir_unop_exp:
    case ir_unop_log:
       assert(!"not reached: should be handled by ir_explog_to_explog2");
       break;
    case ir_unop_log2:
-      ir_to_mesa_emit_scalar_op1(ir, OPCODE_LG2, result_dst, op[0]);
+      emit_scalar(ir, OPCODE_LG2, result_dst, op[0]);
       break;
    case ir_unop_sin:
-      ir_to_mesa_emit_scalar_op1(ir, OPCODE_SIN, result_dst, op[0]);
+      emit_scalar(ir, OPCODE_SIN, result_dst, op[0]);
       break;
    case ir_unop_cos:
-      ir_to_mesa_emit_scalar_op1(ir, OPCODE_COS, result_dst, op[0]);
+      emit_scalar(ir, OPCODE_COS, result_dst, op[0]);
       break;
    case ir_unop_sin_reduced:
       emit_scs(ir, OPCODE_SIN, result_dst, op[0]);
@@ -1211,10 +1179,10 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
       break;
 
    case ir_unop_dFdx:
-      ir_to_mesa_emit_op1(ir, OPCODE_DDX, result_dst, op[0]);
+      emit(ir, OPCODE_DDX, result_dst, op[0]);
       break;
    case ir_unop_dFdy:
-      ir_to_mesa_emit_op1(ir, OPCODE_DDY, result_dst, op[0]);
+      emit(ir, OPCODE_DDY, result_dst, op[0]);
       break;
 
    case ir_unop_noise: {
@@ -1223,19 +1191,19 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
 		     + (ir->operands[0]->type->vector_elements) - 1);
       assert((opcode >= OPCODE_NOISE1) && (opcode <= OPCODE_NOISE4));
 
-      ir_to_mesa_emit_op1(ir, opcode, result_dst, op[0]);
+      emit(ir, opcode, result_dst, op[0]);
       break;
    }
 
    case ir_binop_add:
-      ir_to_mesa_emit_op2(ir, OPCODE_ADD, result_dst, op[0], op[1]);
+      emit(ir, OPCODE_ADD, result_dst, op[0], op[1]);
       break;
    case ir_binop_sub:
-      ir_to_mesa_emit_op2(ir, OPCODE_SUB, result_dst, op[0], op[1]);
+      emit(ir, OPCODE_SUB, result_dst, op[0], op[1]);
       break;
 
    case ir_binop_mul:
-      ir_to_mesa_emit_op2(ir, OPCODE_MUL, result_dst, op[0], op[1]);
+      emit(ir, OPCODE_MUL, result_dst, op[0], op[1]);
       break;
    case ir_binop_div:
       assert(!"not reached: should be handled by ir_div_to_mul_rcp");
@@ -1244,100 +1212,88 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
       break;
 
    case ir_binop_less:
-      ir_to_mesa_emit_op2(ir, OPCODE_SLT, result_dst, op[0], op[1]);
+      emit(ir, OPCODE_SLT, result_dst, op[0], op[1]);
       break;
    case ir_binop_greater:
-      ir_to_mesa_emit_op2(ir, OPCODE_SGT, result_dst, op[0], op[1]);
+      emit(ir, OPCODE_SGT, result_dst, op[0], op[1]);
       break;
    case ir_binop_lequal:
-      ir_to_mesa_emit_op2(ir, OPCODE_SLE, result_dst, op[0], op[1]);
+      emit(ir, OPCODE_SLE, result_dst, op[0], op[1]);
       break;
    case ir_binop_gequal:
-      ir_to_mesa_emit_op2(ir, OPCODE_SGE, result_dst, op[0], op[1]);
+      emit(ir, OPCODE_SGE, result_dst, op[0], op[1]);
       break;
    case ir_binop_equal:
-      ir_to_mesa_emit_op2(ir, OPCODE_SEQ, result_dst, op[0], op[1]);
+      emit(ir, OPCODE_SEQ, result_dst, op[0], op[1]);
       break;
    case ir_binop_nequal:
-      ir_to_mesa_emit_op2(ir, OPCODE_SNE, result_dst, op[0], op[1]);
+      emit(ir, OPCODE_SNE, result_dst, op[0], op[1]);
       break;
    case ir_binop_all_equal:
       /* "==" operator producing a scalar boolean. */
       if (ir->operands[0]->type->is_vector() ||
 	  ir->operands[1]->type->is_vector()) {
-	 ir_to_mesa_src_reg temp = get_temp(glsl_type::vec4_type);
-	 ir_to_mesa_emit_op2(ir, OPCODE_SNE,
-			     ir_to_mesa_dst_reg_from_src(temp), op[0], op[1]);
-	 ir_to_mesa_emit_dp(ir, result_dst, temp, temp, vector_elements);
-	 ir_to_mesa_emit_op2(ir, OPCODE_SEQ,
-			     result_dst, result_src, src_reg_for_float(0.0));
+	 src_reg temp = get_temp(glsl_type::vec4_type);
+	 emit(ir, OPCODE_SNE, dst_reg(temp), op[0], op[1]);
+	 emit_dp(ir, result_dst, temp, temp, vector_elements);
+	 emit(ir, OPCODE_SEQ, result_dst, result_src, src_reg_for_float(0.0));
       } else {
-	 ir_to_mesa_emit_op2(ir, OPCODE_SEQ, result_dst, op[0], op[1]);
+	 emit(ir, OPCODE_SEQ, result_dst, op[0], op[1]);
       }
       break;
    case ir_binop_any_nequal:
       /* "!=" operator producing a scalar boolean. */
       if (ir->operands[0]->type->is_vector() ||
 	  ir->operands[1]->type->is_vector()) {
-	 ir_to_mesa_src_reg temp = get_temp(glsl_type::vec4_type);
-	 ir_to_mesa_emit_op2(ir, OPCODE_SNE,
-			     ir_to_mesa_dst_reg_from_src(temp), op[0], op[1]);
-	 ir_to_mesa_emit_dp(ir, result_dst, temp, temp, vector_elements);
-	 ir_to_mesa_emit_op2(ir, OPCODE_SNE,
-			     result_dst, result_src, src_reg_for_float(0.0));
+	 src_reg temp = get_temp(glsl_type::vec4_type);
+	 emit(ir, OPCODE_SNE, dst_reg(temp), op[0], op[1]);
+	 emit_dp(ir, result_dst, temp, temp, vector_elements);
+	 emit(ir, OPCODE_SNE, result_dst, result_src, src_reg_for_float(0.0));
       } else {
-	 ir_to_mesa_emit_op2(ir, OPCODE_SNE, result_dst, op[0], op[1]);
+	 emit(ir, OPCODE_SNE, result_dst, op[0], op[1]);
       }
       break;
 
    case ir_unop_any:
       assert(ir->operands[0]->type->is_vector());
-      ir_to_mesa_emit_dp(ir, result_dst, op[0], op[0],
-			 ir->operands[0]->type->vector_elements);
-      ir_to_mesa_emit_op2(ir, OPCODE_SNE,
-			  result_dst, result_src, src_reg_for_float(0.0));
+      emit_dp(ir, result_dst, op[0], op[0],
+	      ir->operands[0]->type->vector_elements);
+      emit(ir, OPCODE_SNE, result_dst, result_src, src_reg_for_float(0.0));
       break;
 
    case ir_binop_logic_xor:
-      ir_to_mesa_emit_op2(ir, OPCODE_SNE, result_dst, op[0], op[1]);
+      emit(ir, OPCODE_SNE, result_dst, op[0], op[1]);
       break;
 
    case ir_binop_logic_or:
       /* This could be a saturated add and skip the SNE. */
-      ir_to_mesa_emit_op2(ir, OPCODE_ADD,
-			  result_dst,
-			  op[0], op[1]);
-
-      ir_to_mesa_emit_op2(ir, OPCODE_SNE,
-			  result_dst,
-			  result_src, src_reg_for_float(0.0));
+      emit(ir, OPCODE_ADD, result_dst, op[0], op[1]);
+      emit(ir, OPCODE_SNE, result_dst, result_src, src_reg_for_float(0.0));
       break;
 
    case ir_binop_logic_and:
       /* the bool args are stored as float 0.0 or 1.0, so "mul" gives us "and". */
-      ir_to_mesa_emit_op2(ir, OPCODE_MUL,
-			  result_dst,
-			  op[0], op[1]);
+      emit(ir, OPCODE_MUL, result_dst, op[0], op[1]);
       break;
 
    case ir_binop_dot:
       assert(ir->operands[0]->type->is_vector());
       assert(ir->operands[0]->type == ir->operands[1]->type);
-      ir_to_mesa_emit_dp(ir, result_dst, op[0], op[1],
-			 ir->operands[0]->type->vector_elements);
+      emit_dp(ir, result_dst, op[0], op[1],
+	      ir->operands[0]->type->vector_elements);
       break;
 
    case ir_unop_sqrt:
       /* sqrt(x) = x * rsq(x). */
-      ir_to_mesa_emit_scalar_op1(ir, OPCODE_RSQ, result_dst, op[0]);
-      ir_to_mesa_emit_op2(ir, OPCODE_MUL, result_dst, result_src, op[0]);
+      emit_scalar(ir, OPCODE_RSQ, result_dst, op[0]);
+      emit(ir, OPCODE_MUL, result_dst, result_src, op[0]);
       /* For incoming channels <= 0, set the result to 0. */
       op[0].negate = ~op[0].negate;
-      ir_to_mesa_emit_op3(ir, OPCODE_CMP, result_dst,
+      emit(ir, OPCODE_CMP, result_dst,
 			  op[0], result_src, src_reg_for_float(0.0));
       break;
    case ir_unop_rsq:
-      ir_to_mesa_emit_scalar_op1(ir, OPCODE_RSQ, result_dst, op[0]);
+      emit_scalar(ir, OPCODE_RSQ, result_dst, op[0]);
       break;
    case ir_unop_i2f:
    case ir_unop_b2f:
@@ -1346,36 +1302,36 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
       result_src = op[0];
       break;
    case ir_unop_f2i:
-      ir_to_mesa_emit_op1(ir, OPCODE_TRUNC, result_dst, op[0]);
+      emit(ir, OPCODE_TRUNC, result_dst, op[0]);
       break;
    case ir_unop_f2b:
    case ir_unop_i2b:
-      ir_to_mesa_emit_op2(ir, OPCODE_SNE, result_dst,
+      emit(ir, OPCODE_SNE, result_dst,
 			  op[0], src_reg_for_float(0.0));
       break;
    case ir_unop_trunc:
-      ir_to_mesa_emit_op1(ir, OPCODE_TRUNC, result_dst, op[0]);
+      emit(ir, OPCODE_TRUNC, result_dst, op[0]);
       break;
    case ir_unop_ceil:
       op[0].negate = ~op[0].negate;
-      ir_to_mesa_emit_op1(ir, OPCODE_FLR, result_dst, op[0]);
+      emit(ir, OPCODE_FLR, result_dst, op[0]);
       result_src.negate = ~result_src.negate;
       break;
    case ir_unop_floor:
-      ir_to_mesa_emit_op1(ir, OPCODE_FLR, result_dst, op[0]);
+      emit(ir, OPCODE_FLR, result_dst, op[0]);
       break;
    case ir_unop_fract:
-      ir_to_mesa_emit_op1(ir, OPCODE_FRC, result_dst, op[0]);
+      emit(ir, OPCODE_FRC, result_dst, op[0]);
       break;
 
    case ir_binop_min:
-      ir_to_mesa_emit_op2(ir, OPCODE_MIN, result_dst, op[0], op[1]);
+      emit(ir, OPCODE_MIN, result_dst, op[0], op[1]);
       break;
    case ir_binop_max:
-      ir_to_mesa_emit_op2(ir, OPCODE_MAX, result_dst, op[0], op[1]);
+      emit(ir, OPCODE_MAX, result_dst, op[0], op[1]);
       break;
    case ir_binop_pow:
-      ir_to_mesa_emit_scalar_op2(ir, OPCODE_POW, result_dst, op[0], op[1]);
+      emit_scalar(ir, OPCODE_POW, result_dst, op[0], op[1]);
       break;
 
    case ir_unop_bit_not:
@@ -1403,7 +1359,7 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
 void
 ir_to_mesa_visitor::visit(ir_swizzle *ir)
 {
-   ir_to_mesa_src_reg src_reg;
+   src_reg src;
    int i;
    int swizzle[4];
 
@@ -1413,23 +1369,23 @@ ir_to_mesa_visitor::visit(ir_swizzle *ir)
     */
 
    ir->val->accept(this);
-   src_reg = this->result;
-   assert(src_reg.file != PROGRAM_UNDEFINED);
+   src = this->result;
+   assert(src.file != PROGRAM_UNDEFINED);
 
    for (i = 0; i < 4; i++) {
       if (i < ir->type->vector_elements) {
 	 switch (i) {
 	 case 0:
-	    swizzle[i] = GET_SWZ(src_reg.swizzle, ir->mask.x);
+	    swizzle[i] = GET_SWZ(src.swizzle, ir->mask.x);
 	    break;
 	 case 1:
-	    swizzle[i] = GET_SWZ(src_reg.swizzle, ir->mask.y);
+	    swizzle[i] = GET_SWZ(src.swizzle, ir->mask.y);
 	    break;
 	 case 2:
-	    swizzle[i] = GET_SWZ(src_reg.swizzle, ir->mask.z);
+	    swizzle[i] = GET_SWZ(src.swizzle, ir->mask.z);
 	    break;
 	 case 3:
-	    swizzle[i] = GET_SWZ(src_reg.swizzle, ir->mask.w);
+	    swizzle[i] = GET_SWZ(src.swizzle, ir->mask.w);
 	    break;
 	 }
       } else {
@@ -1440,12 +1396,9 @@ ir_to_mesa_visitor::visit(ir_swizzle *ir)
       }
    }
 
-   src_reg.swizzle = MAKE_SWIZZLE4(swizzle[0],
-				   swizzle[1],
-				   swizzle[2],
-				   swizzle[3]);
+   src.swizzle = MAKE_SWIZZLE4(swizzle[0], swizzle[1], swizzle[2], swizzle[3]);
 
-   this->result = src_reg;
+   this->result = src;
 }
 
 void
@@ -1510,54 +1463,53 @@ ir_to_mesa_visitor::visit(ir_dereference_variable *ir)
       }
    }
 
-   this->result = ir_to_mesa_src_reg(entry->file, entry->index, var->type);
+   this->result = src_reg(entry->file, entry->index, var->type);
 }
 
 void
 ir_to_mesa_visitor::visit(ir_dereference_array *ir)
 {
    ir_constant *index;
-   ir_to_mesa_src_reg src_reg;
+   src_reg src;
    int element_size = type_size(ir->type);
 
    index = ir->array_index->constant_expression_value();
 
    ir->array->accept(this);
-   src_reg = this->result;
+   src = this->result;
 
    if (index) {
-      src_reg.index += index->value.i[0] * element_size;
+      src.index += index->value.i[0] * element_size;
    } else {
-      ir_to_mesa_src_reg array_base = this->result;
+      src_reg array_base = this->result;
       /* Variable index array dereference.  It eats the "vec4" of the
        * base of the array and an index that offsets the Mesa register
        * index.
        */
       ir->array_index->accept(this);
 
-      ir_to_mesa_src_reg index_reg;
+      src_reg index_reg;
 
       if (element_size == 1) {
 	 index_reg = this->result;
       } else {
 	 index_reg = get_temp(glsl_type::float_type);
 
-	 ir_to_mesa_emit_op2(ir, OPCODE_MUL,
-			     ir_to_mesa_dst_reg_from_src(index_reg),
-			     this->result, src_reg_for_float(element_size));
+	 emit(ir, OPCODE_MUL, dst_reg(index_reg),
+	      this->result, src_reg_for_float(element_size));
       }
 
-      src_reg.reladdr = ralloc(mem_ctx, ir_to_mesa_src_reg);
-      memcpy(src_reg.reladdr, &index_reg, sizeof(index_reg));
+      src.reladdr = ralloc(mem_ctx, src_reg);
+      memcpy(src.reladdr, &index_reg, sizeof(index_reg));
    }
 
    /* If the type is smaller than a vec4, replicate the last channel out. */
    if (ir->type->is_scalar() || ir->type->is_vector())
-      src_reg.swizzle = swizzle_for_size(ir->type->vector_elements);
+      src.swizzle = swizzle_for_size(ir->type->vector_elements);
    else
-      src_reg.swizzle = SWIZZLE_NOOP;
+      src.swizzle = SWIZZLE_NOOP;
 
-   this->result = src_reg;
+   this->result = src;
 }
 
 void
@@ -1589,7 +1541,7 @@ ir_to_mesa_visitor::visit(ir_dereference_record *ir)
  * instead of potentially using a temporary like we might with the
  * ir_dereference handler.
  */
-static struct ir_to_mesa_dst_reg
+static dst_reg
 get_assignment_lhs(ir_dereference *ir, ir_to_mesa_visitor *v)
 {
    /* The LHS must be a dereference.  If the LHS is a variable indexed array
@@ -1606,7 +1558,7 @@ get_assignment_lhs(ir_dereference *ir, ir_to_mesa_visitor *v)
     * swizzles in it and write swizzles using writemask, though.
     */
    ir->accept(v);
-   return ir_to_mesa_dst_reg_from_src(v->result);
+   return dst_reg(v->result);
 }
 
 /**
@@ -1699,8 +1651,8 @@ ir_to_mesa_visitor::process_move_condition(ir_rvalue *ir)
 void
 ir_to_mesa_visitor::visit(ir_assignment *ir)
 {
-   struct ir_to_mesa_dst_reg l;
-   struct ir_to_mesa_src_reg r;
+   dst_reg l;
+   src_reg r;
    int i;
 
    ir->rhs->accept(this);
@@ -1756,15 +1708,13 @@ ir_to_mesa_visitor::visit(ir_assignment *ir)
 
    if (ir->condition) {
       const bool switch_order = this->process_move_condition(ir->condition);
-      ir_to_mesa_src_reg condition = this->result;
+      src_reg condition = this->result;
 
       for (i = 0; i < type_size(ir->lhs->type); i++) {
 	 if (switch_order) {
-	    ir_to_mesa_emit_op3(ir, OPCODE_CMP, l,
-				condition, ir_to_mesa_src_reg_from_dst(l), r);
+	    emit(ir, OPCODE_CMP, l, condition, src_reg(l), r);
 	 } else {
-	    ir_to_mesa_emit_op3(ir, OPCODE_CMP, l,
-				condition, r, ir_to_mesa_src_reg_from_dst(l));
+	    emit(ir, OPCODE_CMP, l, condition, r, src_reg(l));
 	 }
 
 	 l.index++;
@@ -1772,7 +1722,7 @@ ir_to_mesa_visitor::visit(ir_assignment *ir)
       }
    } else {
       for (i = 0; i < type_size(ir->lhs->type); i++) {
-	 ir_to_mesa_emit_op1(ir, OPCODE_MOV, l, r);
+	 emit(ir, OPCODE_MOV, l, r);
 	 l.index++;
 	 r.index++;
       }
@@ -1783,7 +1733,7 @@ ir_to_mesa_visitor::visit(ir_assignment *ir)
 void
 ir_to_mesa_visitor::visit(ir_constant *ir)
 {
-   ir_to_mesa_src_reg src_reg;
+   src_reg src;
    GLfloat stack_vals[4] = { 0 };
    GLfloat *values = stack_vals;
    unsigned int i;
@@ -1795,8 +1745,8 @@ ir_to_mesa_visitor::visit(ir_constant *ir)
     */
 
    if (ir->type->base_type == GLSL_TYPE_STRUCT) {
-      ir_to_mesa_src_reg temp_base = get_temp(ir->type);
-      ir_to_mesa_dst_reg temp = ir_to_mesa_dst_reg_from_src(temp_base);
+      src_reg temp_base = get_temp(ir->type);
+      dst_reg temp = dst_reg(temp_base);
 
       foreach_iter(exec_list_iterator, iter, ir->components) {
 	 ir_constant *field_value = (ir_constant *)iter.get();
@@ -1805,12 +1755,12 @@ ir_to_mesa_visitor::visit(ir_constant *ir)
 	 assert(size > 0);
 
 	 field_value->accept(this);
-	 src_reg = this->result;
+	 src = this->result;
 
 	 for (i = 0; i < (unsigned int)size; i++) {
-	    ir_to_mesa_emit_op1(ir, OPCODE_MOV, temp, src_reg);
+	    emit(ir, OPCODE_MOV, temp, src);
 
-	    src_reg.index++;
+	    src.index++;
 	    temp.index++;
 	 }
       }
@@ -1819,19 +1769,19 @@ ir_to_mesa_visitor::visit(ir_constant *ir)
    }
 
    if (ir->type->is_array()) {
-      ir_to_mesa_src_reg temp_base = get_temp(ir->type);
-      ir_to_mesa_dst_reg temp = ir_to_mesa_dst_reg_from_src(temp_base);
+      src_reg temp_base = get_temp(ir->type);
+      dst_reg temp = dst_reg(temp_base);
       int size = type_size(ir->type->fields.array);
 
       assert(size > 0);
 
       for (i = 0; i < ir->type->length; i++) {
 	 ir->array_elements[i]->accept(this);
-	 src_reg = this->result;
+	 src = this->result;
 	 for (int j = 0; j < size; j++) {
-	    ir_to_mesa_emit_op1(ir, OPCODE_MOV, temp, src_reg);
+	    emit(ir, OPCODE_MOV, temp, src);
 
-	    src_reg.index++;
+	    src.index++;
 	    temp.index++;
 	 }
       }
@@ -1840,19 +1790,19 @@ ir_to_mesa_visitor::visit(ir_constant *ir)
    }
 
    if (ir->type->is_matrix()) {
-      ir_to_mesa_src_reg mat = get_temp(ir->type);
-      ir_to_mesa_dst_reg mat_column = ir_to_mesa_dst_reg_from_src(mat);
+      src_reg mat = get_temp(ir->type);
+      dst_reg mat_column = dst_reg(mat);
 
       for (i = 0; i < ir->type->matrix_columns; i++) {
 	 assert(ir->type->base_type == GLSL_TYPE_FLOAT);
 	 values = &ir->value.f[i * ir->type->vector_elements];
 
-	 src_reg = ir_to_mesa_src_reg(PROGRAM_CONSTANT, -1, NULL);
-	 src_reg.index = _mesa_add_unnamed_constant(this->prog->Parameters,
+	 src = src_reg(PROGRAM_CONSTANT, -1, NULL);
+	 src.index = _mesa_add_unnamed_constant(this->prog->Parameters,
 						values,
 						ir->type->vector_elements,
-						&src_reg.swizzle);
-	 ir_to_mesa_emit_op1(ir, OPCODE_MOV, mat_column, src_reg);
+						&src.swizzle);
+	 emit(ir, OPCODE_MOV, mat_column, src);
 
 	 mat_column.index++;
       }
@@ -1861,7 +1811,7 @@ ir_to_mesa_visitor::visit(ir_constant *ir)
       return;
    }
 
-   src_reg.file = PROGRAM_CONSTANT;
+   src.file = PROGRAM_CONSTANT;
    switch (ir->type->base_type) {
    case GLSL_TYPE_FLOAT:
       values = &ir->value.f[0];
@@ -1885,7 +1835,7 @@ ir_to_mesa_visitor::visit(ir_constant *ir)
       assert(!"Non-float/uint/int/bool constant");
    }
 
-   this->result = ir_to_mesa_src_reg(PROGRAM_CONSTANT, -1, ir->type);
+   this->result = src_reg(PROGRAM_CONSTANT, -1, ir->type);
    this->result.index = _mesa_add_unnamed_constant(this->prog->Parameters,
 						   values,
 						   ir->type->vector_elements,
@@ -1927,7 +1877,7 @@ ir_to_mesa_visitor::get_function_signature(ir_function_signature *sig)
    if (!sig->return_type->is_void()) {
       entry->return_reg = get_temp(sig->return_type);
    } else {
-      entry->return_reg = ir_to_mesa_undef;
+      entry->return_reg = undef_src;
    }
 
    this->function_signatures.push_tail(entry);
@@ -1954,9 +1904,9 @@ ir_to_mesa_visitor::visit(ir_call *ir)
 	 assert(storage);
 
 	 param_rval->accept(this);
-	 ir_to_mesa_src_reg r = this->result;
+	 src_reg r = this->result;
 
-	 ir_to_mesa_dst_reg l;
+	 dst_reg l;
 	 l.file = storage->file;
 	 l.index = storage->index;
 	 l.reladdr = NULL;
@@ -1964,7 +1914,7 @@ ir_to_mesa_visitor::visit(ir_call *ir)
 	 l.cond_mask = COND_TR;
 
 	 for (i = 0; i < type_size(param->type); i++) {
-	    ir_to_mesa_emit_op1(ir, OPCODE_MOV, l, r);
+	    emit(ir, OPCODE_MOV, l, r);
 	    l.index++;
 	    r.index++;
 	 }
@@ -1975,8 +1925,7 @@ ir_to_mesa_visitor::visit(ir_call *ir)
    assert(!sig_iter.has_next());
 
    /* Emit call instruction */
-   call_inst = ir_to_mesa_emit_op1(ir, OPCODE_CAL,
-				   ir_to_mesa_undef_dst, ir_to_mesa_undef);
+   call_inst = emit(ir, OPCODE_CAL);
    call_inst->function = entry;
 
    /* Process out parameters. */
@@ -1990,7 +1939,7 @@ ir_to_mesa_visitor::visit(ir_call *ir)
 	 variable_storage *storage = find_variable_storage(param);
 	 assert(storage);
 
-	 ir_to_mesa_src_reg r;
+	 src_reg r;
 	 r.file = storage->file;
 	 r.index = storage->index;
 	 r.reladdr = NULL;
@@ -1998,10 +1947,10 @@ ir_to_mesa_visitor::visit(ir_call *ir)
 	 r.negate = 0;
 
 	 param_rval->accept(this);
-	 ir_to_mesa_dst_reg l = ir_to_mesa_dst_reg_from_src(this->result);
+	 dst_reg l = dst_reg(this->result);
 
 	 for (i = 0; i < type_size(param->type); i++) {
-	    ir_to_mesa_emit_op1(ir, OPCODE_MOV, l, r);
+	    emit(ir, OPCODE_MOV, l, r);
 	    l.index++;
 	    r.index++;
 	 }
@@ -2018,8 +1967,8 @@ ir_to_mesa_visitor::visit(ir_call *ir)
 void
 ir_to_mesa_visitor::visit(ir_texture *ir)
 {
-   ir_to_mesa_src_reg result_src, coord, lod_info, projector;
-   ir_to_mesa_dst_reg result_dst, coord_dst;
+   src_reg result_src, coord, lod_info, projector;
+   dst_reg result_dst, coord_dst;
    ir_to_mesa_instruction *inst = NULL;
    prog_opcode opcode = OPCODE_NOP;
 
@@ -2031,9 +1980,8 @@ ir_to_mesa_visitor::visit(ir_texture *ir)
     * handle cleaning up our mess in that case.
     */
    coord = get_temp(glsl_type::vec4_type);
-   coord_dst = ir_to_mesa_dst_reg_from_src(coord);
-   ir_to_mesa_emit_op1(ir, OPCODE_MOV, coord_dst,
-		       this->result);
+   coord_dst = dst_reg(coord);
+   emit(ir, OPCODE_MOV, coord_dst, this->result);
 
    if (ir->projector) {
       ir->projector->accept(this);
@@ -2044,7 +1992,7 @@ ir_to_mesa_visitor::visit(ir_texture *ir)
     * the actual storage for the result here, instead.
     */
    result_src = get_temp(glsl_type::vec4_type);
-   result_dst = ir_to_mesa_dst_reg_from_src(result_src);
+   result_dst = dst_reg(result_src);
 
    switch (ir->op) {
    case ir_tex:
@@ -2070,11 +2018,11 @@ ir_to_mesa_visitor::visit(ir_texture *ir)
       if (opcode == OPCODE_TEX) {
 	 /* Slot the projector in as the last component of the coord. */
 	 coord_dst.writemask = WRITEMASK_W;
-	 ir_to_mesa_emit_op1(ir, OPCODE_MOV, coord_dst, projector);
+	 emit(ir, OPCODE_MOV, coord_dst, projector);
 	 coord_dst.writemask = WRITEMASK_XYZW;
 	 opcode = OPCODE_TXP;
       } else {
-	 ir_to_mesa_src_reg coord_w = coord;
+	 src_reg coord_w = coord;
 	 coord_w.swizzle = SWIZZLE_WWWW;
 
 	 /* For the other TEX opcodes there's no projective version
@@ -2082,34 +2030,58 @@ ir_to_mesa_visitor::visit(ir_texture *ir)
 	  * projective divide now.
 	  */
 	 coord_dst.writemask = WRITEMASK_W;
-	 ir_to_mesa_emit_op1(ir, OPCODE_RCP, coord_dst, projector);
+	 emit(ir, OPCODE_RCP, coord_dst, projector);
+
+	 /* In the case where we have to project the coordinates "by hand,"
+	  * the shadow comparitor value must also be projected.
+	  */
+	 src_reg tmp_src = coord;
+	 if (ir->shadow_comparitor) {
+	    /* Slot the shadow value in as the second to last component of the
+	     * coord.
+	     */
+	    ir->shadow_comparitor->accept(this);
+
+	    tmp_src = get_temp(glsl_type::vec4_type);
+	    dst_reg tmp_dst = dst_reg(tmp_src);
+
+	    tmp_dst.writemask = WRITEMASK_Z;
+	    emit(ir, OPCODE_MOV, tmp_dst, this->result);
+
+	    tmp_dst.writemask = WRITEMASK_XY;
+	    emit(ir, OPCODE_MOV, tmp_dst, coord);
+	 }
 
 	 coord_dst.writemask = WRITEMASK_XYZ;
-	 ir_to_mesa_emit_op2(ir, OPCODE_MUL, coord_dst, coord, coord_w);
+	 emit(ir, OPCODE_MUL, coord_dst, tmp_src, coord_w);
 
 	 coord_dst.writemask = WRITEMASK_XYZW;
 	 coord.swizzle = SWIZZLE_XYZW;
       }
    }
 
-   if (ir->shadow_comparitor) {
+   /* If projection is done and the opcode is not OPCODE_TXP, then the shadow
+    * comparitor was put in the correct place (and projected) by the code,
+    * above, that handles by-hand projection.
+    */
+   if (ir->shadow_comparitor && (!ir->projector || opcode == OPCODE_TXP)) {
       /* Slot the shadow value in as the second to last component of the
        * coord.
        */
       ir->shadow_comparitor->accept(this);
       coord_dst.writemask = WRITEMASK_Z;
-      ir_to_mesa_emit_op1(ir, OPCODE_MOV, coord_dst, this->result);
+      emit(ir, OPCODE_MOV, coord_dst, this->result);
       coord_dst.writemask = WRITEMASK_XYZW;
    }
 
    if (opcode == OPCODE_TXL || opcode == OPCODE_TXB) {
       /* Mesa IR stores lod or lod bias in the last channel of the coords. */
       coord_dst.writemask = WRITEMASK_W;
-      ir_to_mesa_emit_op1(ir, OPCODE_MOV, coord_dst, lod_info);
+      emit(ir, OPCODE_MOV, coord_dst, lod_info);
       coord_dst.writemask = WRITEMASK_XYZW;
    }
 
-   inst = ir_to_mesa_emit_op1(ir, opcode, result_dst, coord);
+   inst = emit(ir, opcode, result_dst, coord);
 
    if (ir->shadow_comparitor)
       inst->tex_shadow = GL_TRUE;
@@ -2152,24 +2124,24 @@ void
 ir_to_mesa_visitor::visit(ir_return *ir)
 {
    if (ir->get_value()) {
-      ir_to_mesa_dst_reg l;
+      dst_reg l;
       int i;
 
       assert(current_function);
 
       ir->get_value()->accept(this);
-      ir_to_mesa_src_reg r = this->result;
+      src_reg r = this->result;
 
-      l = ir_to_mesa_dst_reg_from_src(current_function->return_reg);
+      l = dst_reg(current_function->return_reg);
 
       for (i = 0; i < type_size(current_function->sig->return_type); i++) {
-	 ir_to_mesa_emit_op1(ir, OPCODE_MOV, l, r);
+	 emit(ir, OPCODE_MOV, l, r);
 	 l.index++;
 	 r.index++;
       }
    }
 
-   ir_to_mesa_emit_op0(ir, OPCODE_RET);
+   emit(ir, OPCODE_RET);
 }
 
 void
@@ -2180,9 +2152,9 @@ ir_to_mesa_visitor::visit(ir_discard *ir)
    if (ir->condition) {
       ir->condition->accept(this);
       this->result.negate = ~this->result.negate;
-      ir_to_mesa_emit_op1(ir, OPCODE_KIL, ir_to_mesa_undef_dst, this->result);
+      emit(ir, OPCODE_KIL, undef_dst, this->result);
    } else {
-      ir_to_mesa_emit_op0(ir, OPCODE_KIL_NV);
+      emit(ir, OPCODE_KIL_NV);
    }
 
    fp->UsesKill = GL_TRUE;
@@ -2207,19 +2179,15 @@ ir_to_mesa_visitor::visit(ir_if *ir)
        * have something to set cond_update on.
        */
       if (cond_inst == prev_inst) {
-	 ir_to_mesa_src_reg temp = get_temp(glsl_type::bool_type);
-	 cond_inst = ir_to_mesa_emit_op1(ir->condition, OPCODE_MOV,
-					 ir_to_mesa_dst_reg_from_src(temp),
-					 result);
+	 src_reg temp = get_temp(glsl_type::bool_type);
+	 cond_inst = emit(ir->condition, OPCODE_MOV, dst_reg(temp), result);
       }
       cond_inst->cond_update = GL_TRUE;
 
-      if_inst = ir_to_mesa_emit_op0(ir->condition, OPCODE_IF);
-      if_inst->dst_reg.cond_mask = COND_NE;
+      if_inst = emit(ir->condition, OPCODE_IF);
+      if_inst->dst.cond_mask = COND_NE;
    } else {
-      if_inst = ir_to_mesa_emit_op1(ir->condition,
-				    OPCODE_IF, ir_to_mesa_undef_dst,
-				    this->result);
+      if_inst = emit(ir->condition, OPCODE_IF, undef_dst, this->result);
    }
 
    this->instructions.push_tail(if_inst);
@@ -2227,12 +2195,11 @@ ir_to_mesa_visitor::visit(ir_if *ir)
    visit_exec_list(&ir->then_instructions, this);
 
    if (!ir->else_instructions.is_empty()) {
-      else_inst = ir_to_mesa_emit_op0(ir->condition, OPCODE_ELSE);
+      else_inst = emit(ir->condition, OPCODE_ELSE);
       visit_exec_list(&ir->else_instructions, this);
    }
 
-   if_inst = ir_to_mesa_emit_op1(ir->condition, OPCODE_ENDIF,
-				 ir_to_mesa_undef_dst, ir_to_mesa_undef);
+   if_inst = emit(ir->condition, OPCODE_ENDIF);
 }
 
 ir_to_mesa_visitor::ir_to_mesa_visitor()
@@ -2250,7 +2217,7 @@ ir_to_mesa_visitor::~ir_to_mesa_visitor()
 }
 
 static struct prog_src_register
-mesa_src_reg_from_ir_src_reg(ir_to_mesa_src_reg reg)
+mesa_src_reg_from_ir_src_reg(src_reg reg)
 {
    struct prog_src_register mesa_reg;
 
@@ -2707,17 +2674,17 @@ ir_to_mesa_visitor::copy_propagate(void)
    foreach_iter(exec_list_iterator, iter, this->instructions) {
       ir_to_mesa_instruction *inst = (ir_to_mesa_instruction *)iter.get();
 
-      assert(inst->dst_reg.file != PROGRAM_TEMPORARY
-	     || inst->dst_reg.index < this->next_temp);
+      assert(inst->dst.file != PROGRAM_TEMPORARY
+	     || inst->dst.index < this->next_temp);
 
       /* First, do any copy propagation possible into the src regs. */
       for (int r = 0; r < 3; r++) {
 	 ir_to_mesa_instruction *first = NULL;
 	 bool good = true;
-	 int acp_base = inst->src_reg[r].index * 4;
+	 int acp_base = inst->src[r].index * 4;
 
-	 if (inst->src_reg[r].file != PROGRAM_TEMPORARY ||
-	     inst->src_reg[r].reladdr)
+	 if (inst->src[r].file != PROGRAM_TEMPORARY ||
+	     inst->src[r].reladdr)
 	    continue;
 
 	 /* See if we can find entries in the ACP consisting of MOVs
@@ -2725,7 +2692,7 @@ ir_to_mesa_visitor::copy_propagate(void)
 	  * of this src register reference.
 	  */
 	 for (int i = 0; i < 4; i++) {
-	    int src_chan = GET_SWZ(inst->src_reg[r].swizzle, i);
+	    int src_chan = GET_SWZ(inst->src[r].swizzle, i);
 	    ir_to_mesa_instruction *copy_chan = acp[acp_base + src_chan];
 
 	    if (!copy_chan) {
@@ -2738,8 +2705,8 @@ ir_to_mesa_visitor::copy_propagate(void)
 	    if (!first) {
 	       first = copy_chan;
 	    } else {
-	       if (first->src_reg[0].file != copy_chan->src_reg[0].file ||
-		   first->src_reg[0].index != copy_chan->src_reg[0].index) {
+	       if (first->src[0].file != copy_chan->src[0].file ||
+		   first->src[0].index != copy_chan->src[0].index) {
 		  good = false;
 		  break;
 	       }
@@ -2750,17 +2717,17 @@ ir_to_mesa_visitor::copy_propagate(void)
 	    /* We've now validated that we can copy-propagate to
 	     * replace this src register reference.  Do it.
 	     */
-	    inst->src_reg[r].file = first->src_reg[0].file;
-	    inst->src_reg[r].index = first->src_reg[0].index;
+	    inst->src[r].file = first->src[0].file;
+	    inst->src[r].index = first->src[0].index;
 
 	    int swizzle = 0;
 	    for (int i = 0; i < 4; i++) {
-	       int src_chan = GET_SWZ(inst->src_reg[r].swizzle, i);
+	       int src_chan = GET_SWZ(inst->src[r].swizzle, i);
 	       ir_to_mesa_instruction *copy_inst = acp[acp_base + src_chan];
-	       swizzle |= (GET_SWZ(copy_inst->src_reg[0].swizzle, src_chan) <<
+	       swizzle |= (GET_SWZ(copy_inst->src[0].swizzle, src_chan) <<
 			   (3 * i));
 	    }
-	    inst->src_reg[r].swizzle = swizzle;
+	    inst->src[r].swizzle = swizzle;
 	 }
       }
 
@@ -2797,13 +2764,13 @@ ir_to_mesa_visitor::copy_propagate(void)
 	 /* Continuing the block, clear any written channels from
 	  * the ACP.
 	  */
-	 if (inst->dst_reg.file == PROGRAM_TEMPORARY && inst->dst_reg.reladdr) {
+	 if (inst->dst.file == PROGRAM_TEMPORARY && inst->dst.reladdr) {
 	    /* Any temporary might be written, so no copy propagation
 	     * across this instruction.
 	     */
 	    memset(acp, 0, sizeof(*acp) * this->next_temp * 4);
-	 } else if (inst->dst_reg.file == PROGRAM_OUTPUT &&
-		    inst->dst_reg.reladdr) {
+	 } else if (inst->dst.file == PROGRAM_OUTPUT &&
+		    inst->dst.reladdr) {
 	    /* Any output might be written, so no copy propagation
 	     * from outputs across this instruction.
 	     */
@@ -2812,17 +2779,17 @@ ir_to_mesa_visitor::copy_propagate(void)
 		  if (!acp[4 * r + c])
 		     continue;
 
-		  if (acp[4 * r + c]->src_reg[0].file == PROGRAM_OUTPUT)
+		  if (acp[4 * r + c]->src[0].file == PROGRAM_OUTPUT)
 		     acp[4 * r + c] = NULL;
 	       }
 	    }
-	 } else if (inst->dst_reg.file == PROGRAM_TEMPORARY ||
-		    inst->dst_reg.file == PROGRAM_OUTPUT) {
+	 } else if (inst->dst.file == PROGRAM_TEMPORARY ||
+		    inst->dst.file == PROGRAM_OUTPUT) {
 	    /* Clear where it's used as dst. */
-	    if (inst->dst_reg.file == PROGRAM_TEMPORARY) {
+	    if (inst->dst.file == PROGRAM_TEMPORARY) {
 	       for (int c = 0; c < 4; c++) {
-		  if (inst->dst_reg.writemask & (1 << c)) {
-		     acp[4 * inst->dst_reg.index + c] = NULL;
+		  if (inst->dst.writemask & (1 << c)) {
+		     acp[4 * inst->dst.index + c] = NULL;
 		  }
 	       }
 	    }
@@ -2833,11 +2800,11 @@ ir_to_mesa_visitor::copy_propagate(void)
 		  if (!acp[4 * r + c])
 		     continue;
 
-		  int src_chan = GET_SWZ(acp[4 * r + c]->src_reg[0].swizzle, c);
+		  int src_chan = GET_SWZ(acp[4 * r + c]->src[0].swizzle, c);
 
-		  if (acp[4 * r + c]->src_reg[0].file == inst->dst_reg.file &&
-		      acp[4 * r + c]->src_reg[0].index == inst->dst_reg.index &&
-		      inst->dst_reg.writemask & (1 << src_chan))
+		  if (acp[4 * r + c]->src[0].file == inst->dst.file &&
+		      acp[4 * r + c]->src[0].index == inst->dst.index &&
+		      inst->dst.writemask & (1 << src_chan))
 		  {
 		     acp[4 * r + c] = NULL;
 		  }
@@ -2849,15 +2816,15 @@ ir_to_mesa_visitor::copy_propagate(void)
 
       /* If this is a copy, add it to the ACP. */
       if (inst->op == OPCODE_MOV &&
-	  inst->dst_reg.file == PROGRAM_TEMPORARY &&
-	  !inst->dst_reg.reladdr &&
+	  inst->dst.file == PROGRAM_TEMPORARY &&
+	  !inst->dst.reladdr &&
 	  !inst->saturate &&
-	  !inst->src_reg[0].reladdr &&
-	  !inst->src_reg[0].negate) {
+	  !inst->src[0].reladdr &&
+	  !inst->src[0].negate) {
 	 for (int i = 0; i < 4; i++) {
-	    if (inst->dst_reg.writemask & (1 << i)) {
-	       acp[4 * inst->dst_reg.index + i] = inst;
-	       acp_level[4 * inst->dst_reg.index + i] = level;
+	    if (inst->dst.writemask & (1 << i)) {
+	       acp[4 * inst->dst.index + i] = inst;
+	       acp_level[4 * inst->dst.index + i] = level;
 	    }
 	 }
       }
@@ -2922,7 +2889,7 @@ get_mesa_program(struct gl_context *ctx,
 
    /* Emit Mesa IR for main(). */
    visit_exec_list(shader->ir, &v);
-   v.ir_to_mesa_emit_op0(NULL, OPCODE_END);
+   v.emit(NULL, OPCODE_END);
 
    /* Now emit bodies for any functions that were used. */
    do {
@@ -2934,7 +2901,7 @@ get_mesa_program(struct gl_context *ctx,
 	 if (!entry->bgn_inst) {
 	    v.current_function = entry;
 
-	    entry->bgn_inst = v.ir_to_mesa_emit_op0(NULL, OPCODE_BGNSUB);
+	    entry->bgn_inst = v.emit(NULL, OPCODE_BGNSUB);
 	    entry->bgn_inst->function = entry;
 
 	    visit_exec_list(&entry->sig->body, &v);
@@ -2942,10 +2909,10 @@ get_mesa_program(struct gl_context *ctx,
 	    ir_to_mesa_instruction *last;
 	    last = (ir_to_mesa_instruction *)v.instructions.get_tail();
 	    if (last->op != OPCODE_RET)
-	       v.ir_to_mesa_emit_op0(NULL, OPCODE_RET);
+	       v.emit(NULL, OPCODE_RET);
 
 	    ir_to_mesa_instruction *end;
-	    end = v.ir_to_mesa_emit_op0(NULL, OPCODE_ENDSUB);
+	    end = v.emit(NULL, OPCODE_ENDSUB);
 	    end->function = entry;
 
 	    progress = GL_TRUE;
@@ -2979,14 +2946,14 @@ get_mesa_program(struct gl_context *ctx,
       mesa_inst->CondUpdate = inst->cond_update;
       if (inst->saturate)
 	 mesa_inst->SaturateMode = SATURATE_ZERO_ONE;
-      mesa_inst->DstReg.File = inst->dst_reg.file;
-      mesa_inst->DstReg.Index = inst->dst_reg.index;
-      mesa_inst->DstReg.CondMask = inst->dst_reg.cond_mask;
-      mesa_inst->DstReg.WriteMask = inst->dst_reg.writemask;
-      mesa_inst->DstReg.RelAddr = inst->dst_reg.reladdr != NULL;
-      mesa_inst->SrcReg[0] = mesa_src_reg_from_ir_src_reg(inst->src_reg[0]);
-      mesa_inst->SrcReg[1] = mesa_src_reg_from_ir_src_reg(inst->src_reg[1]);
-      mesa_inst->SrcReg[2] = mesa_src_reg_from_ir_src_reg(inst->src_reg[2]);
+      mesa_inst->DstReg.File = inst->dst.file;
+      mesa_inst->DstReg.Index = inst->dst.index;
+      mesa_inst->DstReg.CondMask = inst->dst.cond_mask;
+      mesa_inst->DstReg.WriteMask = inst->dst.writemask;
+      mesa_inst->DstReg.RelAddr = inst->dst.reladdr != NULL;
+      mesa_inst->SrcReg[0] = mesa_src_reg_from_ir_src_reg(inst->src[0]);
+      mesa_inst->SrcReg[1] = mesa_src_reg_from_ir_src_reg(inst->src[1]);
+      mesa_inst->SrcReg[2] = mesa_src_reg_from_ir_src_reg(inst->src[2]);
       mesa_inst->TexSrcUnit = inst->sampler;
       mesa_inst->TexSrcTarget = inst->tex_target;
       mesa_inst->TexShadow = inst->tex_shadow;
diff --git a/mesalib/src/mesa/program/program.c b/mesalib/src/mesa/program/program.c
index e0bffc7c6..812c0dc50 100644
--- a/mesalib/src/mesa/program/program.c
+++ b/mesalib/src/mesa/program/program.c
@@ -75,10 +75,10 @@ _mesa_init_program(struct gl_context *ctx)
    ASSERT(ctx->Const.FragmentProgram.MaxAddressOffset <= (1 << INST_INDEX_BITS));
 
    /* If this fails, increase prog_instruction::TexSrcUnit size */
-   ASSERT(MAX_TEXTURE_UNITS < (1 << 5));
+   ASSERT(MAX_TEXTURE_UNITS <= (1 << 5));
 
    /* If this fails, increase prog_instruction::TexSrcTarget size */
-   ASSERT(NUM_TEXTURE_TARGETS < (1 << 3));
+   ASSERT(NUM_TEXTURE_TARGETS <= (1 << 3));
 
    ctx->Program.ErrorPos = -1;
    ctx->Program.ErrorString = _mesa_strdup("");
diff --git a/mesalib/src/mesa/state_tracker/st_atom_sampler.c b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
index 17596d4c8..d1ab1ac3e 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_sampler.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
@@ -163,7 +163,8 @@ update_samplers(struct st_context *st)
          if (texobj->Target != GL_TEXTURE_RECTANGLE_ARB)
             sampler->normalized_coords = 1;
 
-         sampler->lod_bias = st->ctx->Texture.Unit[su].LodBias;
+         sampler->lod_bias = st->ctx->Texture.Unit[texUnit].LodBias +
+            texobj->LodBias;
 
          sampler->min_lod = texobj->BaseLevel + texobj->MinLod;
          if (sampler->min_lod < texobj->BaseLevel)
diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
index 757b9d566..0fc743a87 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
@@ -353,7 +353,7 @@ st_render_texture(struct gl_context *ctx,
       return;
 
    /* get pointer to texture image we're rendeing to */
-   texImage = att->Texture->Image[att->CubeMapFace][att->TextureLevel];
+   texImage = _mesa_get_attachment_teximage(att);
 
    /* create new renderbuffer which wraps the texture image */
    rb = st_new_renderbuffer(ctx, 0);
@@ -471,8 +471,7 @@ st_validate_attachment(struct gl_context *ctx,
       return GL_FALSE;
 
    format = stObj->pt->format;
-   texFormat =
-      stObj->base.Image[att->CubeMapFace][att->TextureLevel]->TexFormat;
+   texFormat = _mesa_get_attachment_teximage_const(att)->TexFormat;
 
    /* If the encoding is sRGB and sRGB rendering cannot be enabled,
     * check for linear format support instead.
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
index 1b824c0de..ab0db46df 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -87,6 +87,8 @@ gl_target_to_pipe(GLenum target)
       return PIPE_TEXTURE_1D_ARRAY;
    case GL_TEXTURE_2D_ARRAY_EXT:
       return PIPE_TEXTURE_2D_ARRAY;
+   case GL_TEXTURE_BUFFER:
+      return PIPE_BUFFER;
    default:
       assert(0);
       return 0;
@@ -245,6 +247,7 @@ get_texture_dims(GLenum target)
    switch (target) {
    case GL_TEXTURE_1D:
    case GL_TEXTURE_1D_ARRAY_EXT:
+   case GL_TEXTURE_BUFFER:
       return 1;
    case GL_TEXTURE_2D:
    case GL_TEXTURE_CUBE_MAP_ARB:
diff --git a/mesalib/src/mesa/swrast/s_aatriangle.c b/mesalib/src/mesa/swrast/s_aatriangle.c
index 07667226a..ad068d0c0 100644
--- a/mesalib/src/mesa/swrast/s_aatriangle.c
+++ b/mesalib/src/mesa/swrast/s_aatriangle.c
@@ -215,12 +215,7 @@ compute_coveragef(const GLfloat v0[3], const GLfloat v1[3],
    GLint stop = 4, i;
    GLfloat insideCount = 16.0F;
 
-#ifdef DEBUG
-   {
-      const GLfloat area = dx0 * dy1 - dx1 * dy0;
-      ASSERT(area >= 0.0);
-   }
-#endif
+   ASSERT(dx0 * dy1 - dx1 * dy0 >= 0.0); /* area >= 0.0 */
 
    for (i = 0; i < stop; i++) {
       const GLfloat sx = x + samples[i][0];
author	marha <marha@users.sourceforge.net>	2011-04-06 21:03:59 +0000
committer	marha <marha@users.sourceforge.net>	2011-04-06 21:03:59 +0000
commit	e2b908c356746281aba48128da7dc15a28f5a773 (patch)
tree	5f0a12dfa33c059d8fe09d9a5a792792f44189a6 /mesalib/src/mesa
parent	1fc1b7f67928082b9e922463be25c232d9bcba6a (diff)
parent	704e01fc69ebf6302aa1876906805147248abdaa (diff)
download	vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.gz vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.bz2 vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.zip